This is an automated email from the ASF dual-hosted git repository.
mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 0b17c29 [NO ISSUE][DASHBOARD] Updated dependenices for
asterix-dashboard
0b17c29 is described below
commit 0b17c29f9c47b59e3e18100db42050aa45f56c81
Author: Miles Hong <[email protected]>
AuthorDate: Wed Jan 19 13:59:55 2022 -0500
[NO ISSUE][DASHBOARD] Updated dependenices for asterix-dashboard
-user model changes: no
-storage format changes: no
-interface changes no
Details:
-Fixed windows resizing issue with query naviagator
-Selecting dataverse will no longer delete current query
-Items per page increase
-Query plan navigator moved to left
-Zoom speed on query plan navigator slowed
Change-Id: I60b4a1a93324d613d71d528206d8b5d0ed6d4f4c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/14866
Reviewed-by: Michael Blow <[email protected]>
Tested-by: Michael Blow <[email protected]>
---
.../src/node/src/app/dashboard/query/input.component.scss | 1 +
.../src/node/src/app/dashboard/query/input.component.ts | 2 +-
.../src/node/src/app/dashboard/query/plan-viewer.component.html | 2 +-
.../src/node/src/app/dashboard/query/plan-viewer.component.scss | 1 -
.../src/node/src/app/dashboard/query/tree-view.component.html | 3 ++-
.../src/node/src/app/dashboard/query/tree-view.component.ts | 6 +++++-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.scss
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.scss
index 94311f8..68c12f4 100755
---
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.scss
+++
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.scss
@@ -46,6 +46,7 @@ $query-spacing-unit: 5px;
.options {
display: flex;
flex-flow: row;
+ overflow: auto;
}
.codemirror-container {
diff --git
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.ts
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.ts
index f885edb..cb46a6a 100755
---
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.ts
+++
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/input.component.ts
@@ -538,7 +538,7 @@
this.queryString = '';
this.selected = 'Default';
} else {
- this.queryString = 'USE ' + this.selected + '; \n';
+ this.queryString = 'USE ' + this.selected + '; \n' + this.queryString;
}
this.editor.getDoc().setValue(this.queryString);
this.editor.execCommand('goDocEnd')
diff --git
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-viewer.component.html
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-viewer.component.html
index a131353..4b6ecc5 100644
---
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-viewer.component.html
+++
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-viewer.component.html
@@ -97,7 +97,7 @@ limitations under the License.
[links]="edgesArr"
[nodes]="nodesArr"
[draggingEnabled]="false"
- [zoomSpeed]="0.025"
+ [zoomSpeed]="0.015"
[update$]="update$"
[layoutSettings]="{
orientation: planOrientation,
diff --git
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-viewer.component.scss
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-viewer.component.scss
index 6c40a68..9601675 100644
---
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-viewer.component.scss
+++
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/plan-viewer.component.scss
@@ -36,7 +36,6 @@ limitations under the License.
}
.panel {
- order: 2;
display: flex;
flex-flow: column;
justify-content: stretch;
diff --git
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.html
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.html
index 0fbf6f6..c5754762 100644
---
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.html
+++
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.html
@@ -30,7 +30,8 @@ limitations under the License.
<button *ngIf="isCSV" mat-button class='button export'
(click)='openJSONExportPicker()' matTooltip="Export CSV file to
Computer">EXPORT</button>
<button *ngIf="isCSV == false" mat-button class='button
export' (click)='openJSONExportPicker()' matTooltip="Export JSON/JSONL file to
Computer">EXPORT</button>
</span>
- <mat-paginator *ngIf="this.planVisible === false"
[showFirstLastButtons]="true" [length]='metrics.resultCount'
[pageSize]='pagedefaults.pageSize' [pageSizeOptions]='pageSizeOptions'
(page)='showResults($event, false)'>
+
+ <mat-paginator *ngIf="this.planVisible === false"
[showFirstLastButtons]="true" [length]='metrics.resultCount'
[pageSize]='pageSize' [pageSizeOptions]='pageSizeOptions'
(page)='showResults($event, false)'>
</mat-paginator>
</div>
<div *ngIf='treeVisible' class='navi-data' class='navi-data'>
diff --git
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.ts
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.ts
index 5309991..66a6dd6 100644
---
a/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.ts
+++
b/asterixdb/asterix-dashboard/src/node/src/app/dashboard/query/tree-view.component.ts
@@ -60,7 +60,8 @@ export class TreeViewComponent {
currentRange: any;
/* see 10 records as initial set */
pagedefaults: any = { pageIndex: 0, pageSize:10, lenght: 0};
- pageSizeOptions = [5, 10, 25, 100, 200];
+ pageSize = 10;
+ pageSizeOptions = [5, 10, 25, 100, 200, 300, 400];
viewMode = 'JSON';
showGoTop = false;
showGoBottom = false;
@@ -141,6 +142,9 @@ export class TreeViewComponent {
}
showResults(range, expanded) {
+ // update pagesize
+ this.pageSize = range.pageSize;
+
this.currentRange = range;
this.currentIndex = this.currentRange.pageIndex;
