This repository has been archived by the owner on Jan 10, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into update_material
- Loading branch information
Showing
39 changed files
with
177 additions
and
220 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ div:focus { | |
| outline: none; | ||
| } | ||
|
|
||
| .pk-page-canvas { | ||
| explorer-page { | ||
| height: 100%; | ||
| width: 100%; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,41 @@ | ||
| <div class="pk-page-canvas" layout="column" flex> | ||
| <explorer-header></explorer-header> | ||
| <explorer-header layout="column"></explorer-header> | ||
|
|
||
| <div class="pk-page-body" ng-controller="DashboardCtrl as dashboardCtrl" | ||
| layout="row" flex> | ||
| <div class="pk-page-body" ng-controller="DashboardCtrl as dashboardCtrl" | ||
| layout="row" flex> | ||
|
|
||
| <sidebar-tabs></sidebar-tabs> | ||
| <sidebar-tabs class="pk-sidebar-tabs" layout="column"></sidebar-tabs> | ||
|
|
||
| <div class="pk-page-leftwell" id="pk-page-leftwell" layout="column" | ||
| ng-show="dashboardCtrl.tabSvc.selectedTab"> | ||
| <div class="pk-page-leftwell" id="pk-page-leftwell" layout="column" | ||
| ng-show="dashboardCtrl.tabSvc.selectedTab"> | ||
|
|
||
| <sidebar></sidebar> | ||
| <sidebar ng-show="explorerCtrl.sidebarTabService.selectedTab" layout="column" flex></sidebar> | ||
|
|
||
| </div> | ||
|
|
||
| <div resize="right" resize-element-id="pk-page-leftwell" | ||
| ng-show="explorerCtrl.sidebarTabService.selectedTab"> </div> | ||
| </div> | ||
|
|
||
| <div layout="column" flex> | ||
| <div resize="right" resize-element-id="pk-page-leftwell" | ||
| ng-show="explorerCtrl.sidebarTabService.selectedTab"> </div> | ||
|
|
||
| <explorer-toolbar></explorer-toolbar> | ||
| <div layout="column" flex> | ||
|
|
||
| <div class="pk-page-content pk-background" layout="column" flex | ||
| ng-click="dashboardSvc.onDashboardClick($event)"> | ||
| <dashboard ng-model="dashboardCtrl.dashboard.current.model"></dashboard> | ||
| </div> | ||
| <explorer-toolbar></explorer-toolbar> | ||
|
|
||
| <div class="pk-page-content pk-background" layout="column" flex | ||
| ng-click="dashboardSvc.onDashboardClick($event)"> | ||
| <dashboard ng-model="dashboardCtrl.dashboard.current.model"></dashboard> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| <div | ||
| resize="top" resize-element-id="pk-page-footer" | ||
| ng-show="explorerCtrl.explorer.model.code_editor.isOpen"> </div> | ||
| </div> | ||
|
|
||
| <div | ||
| class="pk-page-footer" id="pk-page-footer" layout="column" | ||
| ng-show="explorerCtrl.explorer.model.code_editor.isOpen"> | ||
| <div | ||
| resize="top" resize-element-id="pk-page-footer" | ||
| ng-show="explorerCtrl.explorer.model.code_editor.isOpen"> </div> | ||
|
|
||
| <widget-editor layout="column" flex></widget-editor> | ||
| <div | ||
| class="pk-page-footer" id="pk-page-footer" layout="column" | ||
| ng-show="explorerCtrl.explorer.model.code_editor.isOpen"> | ||
|
|
||
| <widget-editor class="pk-footer-open" layout="column" flex></widget-editor> | ||
|
|
||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| .pk-sidebar-panel { | ||
| sidebar { | ||
| overflow: hidden; | ||
| } | ||
|
|
||
|
|
||
119 changes: 55 additions & 64 deletions
119
client/components/explorer/sidebar/sidebar-directive.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,81 +1,72 @@ | ||
| <div class="pk-sidebar-panel" layout="column" flex | ||
| ng-show="tabSvc.selectedTab"> | ||
|
|
||
| <div class="pk-sidebar-panel-header | ||
| {{ tabSvc.selectedTab.panelTitleClass }}"> | ||
| <div style="float: right"> | ||
| <md-button ng-click="tabSvc.toggleTab(tabSvc.selectedTab)" | ||
| aria-label="close panel"> | ||
| <i class="fa fa-times"></i> | ||
| </md-button> | ||
| </div> | ||
| <div class="pk-sidebar-panel-header-text"> | ||
| {{ tabSvc.selectedTab.title }}</div> | ||
| <div class="pk-sidebar-panel-header" ng-class="tabSvc.selectedTab.panelTitleClass"> | ||
| <div style="float: right"> | ||
| <md-button ng-click="tabSvc.toggleTab(tabSvc.selectedTab)" | ||
| aria-label="close panel"> | ||
| <i class="fa fa-times"></i> | ||
| </md-button> | ||
| </div> | ||
| <div class="pk-sidebar-panel-header-text"> | ||
| {{ tabSvc.selectedTab.title }}</div> | ||
| </div> | ||
|
|
||
| <div class="pk-sidebar-panel-content | ||
| {{ tabSvc.selectedTab.panelClass }}" flex> | ||
|
|
||
| <!-- TODO(joemu): Replace this switch with a data-driven approach. --> | ||
| <div ng-switch="tabSvc.selectedTab.id"> | ||
| <div class="pk-sidebar-panel-content" ng-class="tabSvc.selectedTab.panelClass" | ||
| flex layout="column"> | ||
|
|
||
| <div ng-switch-when="dashboard"> | ||
| <dashboard-config ng-model="dashboardSvc.current.model" /> | ||
| </div> | ||
| <!-- TODO(joemu): Replace this switch with a data-driven approach. --> | ||
| <div ng-switch="tabSvc.selectedTab.id" flex layout="column"> | ||
|
|
||
| <div ng-switch-when="container"> | ||
| <container-config ng-model="dashboardSvc.selectedContainer.model.container" /> | ||
| </div> | ||
| <div ng-switch-when="dashboard"> | ||
| <dashboard-config ng-model="dashboardSvc.current.model" /> | ||
| </div> | ||
|
|
||
| <div ng-switch-when="widget.data"> | ||
| <query-builder-datasource-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
| <div ng-switch-when="container"> | ||
| <container-config ng-model="dashboardSvc.selectedContainer.model.container" /> | ||
| </div> | ||
|
|
||
| <div ng-switch-when="widget.data.filter"> | ||
| <query-builder-filter-config | ||
| ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
| <div ng-switch-when="widget.data"> | ||
| <query-builder-datasource-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
|
|
||
| <div ng-switch-when="widget.data.result"> | ||
| <!-- TODO(joemu): Refactor into a single directive for the panel. --> | ||
| <query-builder-column-config | ||
| ng-model="dashboardSvc.selectedWidget.model"> | ||
| </query-builder-column-config> | ||
| <div class="pk-sidebar-group-title">Result Shape</div> | ||
| <query-result-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
| <div ng-switch-when="widget.data.filter"> | ||
| <query-builder-filter-config | ||
| ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
|
|
||
| <div ng-switch-when="widget.config"> | ||
| <!-- TODO(joemu): Refactor into a single directive for the panel. --> | ||
| <div class="pk-sidebar-group"> | ||
| <widget-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
| <div ng-show="dashboardSvc.selectedWidget.model.type === dashboardSvc.widgetFactorySvc.widgetTypes.CHART"> | ||
| <div class="pk-sidebar-group-title">Datasource</div> | ||
| <query-builder-datasource-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
| </div> | ||
| <div ng-switch-when="widget.data.result"> | ||
| <!-- TODO(joemu): Refactor into a single directive for the panel. --> | ||
| <query-builder-column-config | ||
| ng-model="dashboardSvc.selectedWidget.model"> | ||
| </query-builder-column-config> | ||
| <div class="pk-sidebar-group-title">Result Shape</div> | ||
| <query-result-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
|
|
||
| <div ng-switch-when="widget.chart"> | ||
| <chart-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| <div ng-switch-when="widget.config"> | ||
| <!-- TODO(joemu): Refactor into a single directive for the panel. --> | ||
| <div class="pk-sidebar-group"> | ||
| <widget-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
| <div class="pk-sidebar-group-title">Datasource</div> | ||
| <query-builder-datasource-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
|
|
||
| <div ng-switch-when="widget.columns"> | ||
| <column-style-config ng-model="dashboardSvc.selectedWidget" /> | ||
| </div> | ||
| <div ng-switch-when="widget.chart"> | ||
| <chart-config ng-model="dashboardSvc.selectedWidget.model" /> | ||
| </div> | ||
|
|
||
| <div ng-switch-default>UNSUPPORTED TYPE: {{ tabSvc.selectedTab.id }}</div> | ||
| <div ng-switch-when="widget.columns"> | ||
| <column-style-config ng-model="dashboardSvc.selectedWidget" /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="pk-sidebar-panel-footer | ||
| {{ tabSvc.selectedTab.panelTitleClass}}"> | ||
| <md-button style="float: left" aria-label="previous tab" | ||
| ng-click="tabSvc.selectedTab = tabSvc.getPreviousTab(tabSvc.selectedTab)"> | ||
| previous</md-button> | ||
| <md-button style="float: right" aria-label="next tab" | ||
| ng-click="tabSvc.selectedTab = tabSvc.getNextTab(tabSvc.selectedTab)"> | ||
| next</md-button> | ||
| <div ng-switch-default>UNSUPPORTED TYPE: {{ tabSvc.selectedTab.id }}</div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="pk-sidebar-panel-footer" ng-class="tabSvc.selectedTab.panelTitleClass"> | ||
| <md-button style="float: left" aria-label="previous tab" | ||
| ng-click="tabSvc.selectedTab = tabSvc.getPreviousTab(tabSvc.selectedTab)"> | ||
| previous</md-button> | ||
| <md-button style="float: right" aria-label="next tab" | ||
| ng-click="tabSvc.selectedTab = tabSvc.getNextTab(tabSvc.selectedTab)"> | ||
| next</md-button> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 14 additions & 16 deletions
30
client/components/explorer/sidebar/sidebar-tabs-directive.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,15 @@ | ||
| <div class="pk-sidebar-tabs" layout="column"> | ||
| <div | ||
| class="pk-sidebar-tab {{ tab.tabClass }}" | ||
| ng-repeat="tab in ctrl.tabSvc.tabs" | ||
| ng-click="ctrl.tabClicked(tab)" | ||
| ng-show="ctrl.tabSvc.isTabVisible(tab)" | ||
| ng-class="{'pk-sidebar-tab-selected': ctrl.tabSvc.selectedTab == tab}" | ||
| ng-attr-selected="ctrl.tabSvc.selectedTab == tab"> | ||
| <md-tooltip | ||
| md-delay="0" md-direction="right" md-visible="tab.tooltipVisible" | ||
| md-autohide> | ||
| {{ tab.hint }}</md-tooltip> | ||
| <i class="pk-sidebar-tab-icon {{ tab.iconClass }}"></i> | ||
| <div class="pk-sidebar-tab-label" | ||
| ng-hide="ctrl.tabSvc.selectedTab">{{ tab.title }}</div> | ||
| </div> | ||
| <div | ||
| class="pk-sidebar-tab {{ tab.tabClass }}" | ||
| ng-repeat="tab in ctrl.tabSvc.tabs" | ||
| ng-click="ctrl.tabClicked(tab)" | ||
| ng-show="ctrl.tabSvc.isTabVisible(tab)" | ||
| ng-class="{'pk-sidebar-tab-selected': ctrl.tabSvc.selectedTab == tab}" | ||
| ng-attr-selected="ctrl.tabSvc.selectedTab == tab"> | ||
| <md-tooltip | ||
| md-delay="0" md-direction="right" md-visible="tab.tooltipVisible" | ||
| md-autohide> | ||
| {{ tab.hint }}</md-tooltip> | ||
| <i class="pk-sidebar-tab-icon {{ tab.iconClass }}"></i> | ||
| <div class="pk-sidebar-tab-label" | ||
| ng-hide="ctrl.tabSvc.selectedTab">{{ tab.title }}</div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.