From 4fbd9f5d620111c21bfaabd55c021f8e7939a302 Mon Sep 17 00:00:00 2001 From: Vito Date: Tue, 21 Nov 2017 17:41:43 +0000 Subject: [PATCH] [ADF-1911] disabled toolbar and drag area on search results page (#2689) * [ADF-1911] disabled toolbar and drag area on search results page * [ADF-1911] removed color added to style --- demo-shell/resources/i18n/en.json | 3 ++- .../app/components/files/files.component.html | 10 ++++++++- .../app/components/files/files.component.scss | 21 +++++++++++++++++++ .../app/components/files/files.component.ts | 18 +++++++++++++++- .../search/search-result.component.html | 1 + 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json index ee6cfa0767..cfddbddc2e 100644 --- a/demo-shell/resources/i18n/en.json +++ b/demo-shell/resources/i18n/en.json @@ -83,7 +83,8 @@ "LOGIN_FOOTER": "Login footer" }, "SEARCH": { - "RESULTS": "Search results" + "RESULTS": "Search results", + "NO_RESULT": "No results found" }, "SOCIAL": { "LIKE":"Like component", diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html index 47e3a7918e..462af0d653 100644 --- a/demo-shell/src/app/components/files/files.component.html +++ b/demo-shell/src/app/components/files/files.component.html @@ -5,6 +5,7 @@
{{errorMessage}}
- + + + +
+
{{ 'SEARCH.NO_RESULT' | translate }}
+
+
+
table > tbody > tr.is-selected > td. } } +.adf-no-result__empty_doc_lib { + width: 565px; + height: 161px; + object-fit: contain; + margin-top: 17px; +} + +.adf-empty_template { + text-align: center; + margin-top: 20px; + margin-bottom: 20px; +} + +.adf-no-result-message{ + height: 32px; + opacity: 0.26; + font-size: 24px; + line-height: 1.33; + letter-spacing: -1px; +} + @media (max-width: $minimumDocumentListWidth) { adf-document-list ::ng-deep adf-datatable { & ::ng-deep .adf-data-table-cell--fileSize { diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts index afeccbd0e2..333c68e0fe 100644 --- a/demo-shell/src/app/components/files/files.component.ts +++ b/demo-shell/src/app/components/files/files.component.ts @@ -96,6 +96,9 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy { @Input() pagination: Pagination; + @Input() + disableDragArea: boolean = false; + @Output() documentListReady: EventEmitter = new EventEmitter(); @@ -177,6 +180,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy { }); } + // this.disableDragArea = false; this.uploadService.fileUploadComplete.asObservable().debounceTime(300).subscribe(value => this.onFileUploadEvent(value)); this.uploadService.fileUploadDeleted.subscribe((value) => this.onFileUploadEvent(value)); this.contentService.folderCreated.subscribe(value => this.onFolderCreated(value)); @@ -194,9 +198,21 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy { ngOnChanges(changes: SimpleChanges) { if (changes.nodeResult && changes.nodeResult.currentValue) { - this.nodeResult = changes.nodeResult.currentValue; + this.nodeResult = changes.nodeResult.currentValue; this.pagination = this.nodeResult.list.pagination; } + if (!this.pagination) { + this.giveDefaultPaginationWhenNotDefined(); + } + } + + giveDefaultPaginationWhenNotDefined() { + this.pagination = { + maxItems: this.preference.paginationSize, + skipCount: 0, + totalItems: 0, + hasMoreItems: false + }; } getCurrentDocumentListNode(): MinimalNodeEntity[] { diff --git a/demo-shell/src/app/components/search/search-result.component.html b/demo-shell/src/app/components/search/search-result.component.html index a36874aa78..4f5d44c62b 100644 --- a/demo-shell/src/app/components/search/search-result.component.html +++ b/demo-shell/src/app/components/search/search-result.component.html @@ -8,6 +8,7 @@