Merge pull request #769 from tolkamps1/EPICSYSTEM-9-document-grid

[EPICSYSTEM-9] Add doc default sort to date and name and remove uncategorized doc tab.
bcgov · Feb 5, 2024 · 6a2b8cf · 6a2b8cf
2 parents 58ed593 + 8934c05
commit 6a2b8cf
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 328 deletions.
diff --git a/src/app/project-notification/documents/project-notification-documents.component.ts b/src/app/project-notification/documents/project-notification-documents.component.ts
@@ -70,7 +70,6 @@ export class ProjectNotificationDocumentsComponent implements OnInit, OnDestroy
 
   public selectedCount = {
     categorized: 0,
-    uncategorized: 0,
     total: 0,
   };
   public currentProject;

diff --git a/src/app/project/project-documents/project-document-resolver.services.ts b/src/app/project/project-documents/project-document-resolver.services.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
-import { Observable, forkJoin } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs';
 
 import 'rxjs/add/operator/switchMap';
 
@@ -28,7 +27,7 @@ export class DocumentsResolver implements Resolve<Observable<object>> {
     const params = this.storageService.state.projectDocumentTableParams || route.params;
     const pageNum = params.pageNum ? params.pageNum : 1;
     const pageSize = params.pageSize ? params.pageSize : 10;
-    const sortBy = params.sortBy ? params.sortBy : '-datePosted';
+    const sortBy = params.sortBy ? params.sortBy : '-datePosted,+displayName';
     const keywords = params.keywords || '';
 
     const milestones: any[] = [];
@@ -77,30 +76,12 @@ export class DocumentsResolver implements Resolve<Observable<object>> {
       ''
     );
 
-    const uncategorizedObs = this.searchService.getSearchResults(
-      keywords,
-      'Document',
-      [
-        { name: 'project', value: projectId },
-        { name: 'categorized', value: false }
-      ],
-      pageNum,
-      pageSize,
-      sortBy,
-      { documentSource: 'PROJECT' },
-      true,
-      this.filterForAPI,
-      ''
-    );
-
-    const join =  forkJoin(categorizedObs, uncategorizedObs).pipe(map(responses => (
+    return categorizedObs.map(res => (
       {
-        categorized: responses[0][0],
-        uncategorized: responses[1][0],
+        categorized: res[0],
       }
-    )));
+    ));
 
-    return join;
   }
 
   paramsToCollectionFilter(params, name, collection, identifyBy) {

diff --git a/src/app/project/project-documents/project-documents.component.html b/src/app/project/project-documents/project-documents.component.html
@@ -298,51 +298,28 @@ <h1>
                 </button>
             </div>
         </div>
+    </form>
 
-        <div class="content-container">
-            <div class="document-tabs mt-3">
-                <ngb-tabset (tabChange)="onTabChange($event)">
-                    <ngb-tab
-                        id="constants.documentTypes.CATEGORIZED"
-                        title="Documents ({{this.tableParams.totalListItemsCategorized}} {{getResultTerm(this.tableParams.totalListItemsCategorized)}} found)"
-                        [disabled]="!categorizedDocumentTableData || !categorizedDocumentTableData.data.length || categorizedDocs.length === 0">
-                        <ng-template ngbTabContent>
-                            <app-table-template *ngIf="!loading && this.tableParams.totalListItemsCategorized != 0 && categorizedDocumentTableData && categorizedDocumentTableData.data.length"
-                                (checkboxChange)='checkChange($event)' [columns]="documentTableColumns" [data]="categorizedDocumentTableData"
-                                (onColumnSort)='setColumnSort(constants.documentTypes.CATEGORIZED, $event)' (onSelectedRow)='updateSelectedRow(constants.documentTypes.CATEGORIZED, $event)'
-                                (onPageNumUpdate)='getPaginatedDocs(constants.documentTypes.CATEGORIZED, $event)' (selectAllClicked)="selectAction('selectAll')">
-                            </app-table-template>
-                        </ng-template>
-                    </ngb-tab>
-
-                    <ngb-tab
-                        id="constants.documentTypes.UNCATEGORIZED"
-                        [disabled]="!uncategorizedDocumentTableData || !uncategorizedDocumentTableData.data.length || uncategorizedDocs.length === 0">
-                        <ng-template ngbTabTitle>
-                            <div class="custom-tab-title">
-                                <span>Uncategorized Documents ({{this.tableParams.totalListItemsUncategorized}} {{getResultTerm(this.tableParams.totalListItemsUncategorized)}} found)</span>
-                                <i
-                                    class="material-icons md-20"
-                                    placement="top"
-                                    ngbTooltip="Documents within this table have not yet been categorized by author, document type, and/or milestone. We are actively processing these documents so they can be searched and filtered – making it easier to find what you’re looking for."
-                                    tooltipClass="custom-tab-title-tooltip"
-                                >help</i>
-                            </div>
-                        </ng-template>
-                        <ng-template ngbTabContent>
-                            <app-table-template *ngIf="!loading && this.tableParams.totalListItemsUncategorized !== 0 && uncategorizedDocumentTableData && uncategorizedDocumentTableData.data.length"
-                                (checkboxChange)='checkChange($event)' [columns]="documentTableColumns" [data]="uncategorizedDocumentTableData"
-                                (onColumnSort)='setColumnSort(constants.documentTypes.UNCATEGORIZED, $event)' (onSelectedRow)='updateSelectedRow(constants.documentTypes.UNCATEGORIZED, $event)'
-                                (onPageNumUpdate)='getPaginatedDocs(constants.documentTypes.UNCATEGORIZED, $event)' (selectAllClicked)="selectAction('selectAll', $event)">
-                            </app-table-template>
-                        </ng-template>
-                    </ngb-tab>
-                </ngb-tabset>
-            </div>
+    <div class="content-container">
+        <div *ngIf="this.tableParams.totalListItemsCategorized > 0">
+            <app-table-template
+                *ngIf="!loading && this.tableParams.totalListItemsCategorized != 0 && categorizedDocumentTableData && categorizedDocumentTableData.data.length"
+                (checkboxChange)='checkChange($event)' [columns]="documentTableColumns"
+                [data]="categorizedDocumentTableData"
+                (onColumnSort)='setColumnSort(constants.documentTypes.CATEGORIZED, $event)'
+                (onSelectedRow)='updateSelectedRow(constants.documentTypes.CATEGORIZED, $event)'
+                (onPageNumUpdate)='getPaginatedDocs(constants.documentTypes.CATEGORIZED, $event)'
+                (selectAllClicked)="selectAction('selectAll')">
+            </app-table-template>
         </div>
-
-        <div>
-            <div class="spinner-container" *ngIf="loading">
-                <div class="spinner-new rotating"></div>
-            </div>
+        <div *ngIf="this.tableParams.totalListItemsCategorized === 0">
+            <p>No Documents found.</p>
+        </div>
+    </div>
+    <div>
+        <div class="spinner-container" *ngIf="loading">
+            <div class="spinner-new rotating"></div>
         </div>
+    </div>
+
+</div>
diff --git a/src/app/project/project-documents/project-documents.component.scss b/src/app/project/project-documents/project-documents.component.scss
@@ -81,10 +81,6 @@ input[type="text"] {
   }
 }
 
-.content-container {
-  margin-top: 50px;
-}
-
 .advanced-search {
   position: relative;