Merge branch 'development' into next-release-3.2.0

lib/content-services/content-node-selector/content-node-selector-panel.component.html

@@ -42,6 +42,7 @@
                 [target]="documentList"
                 [transform]="breadcrumbTransform"
                 [folderNode]="breadcrumbFolderNode"
+                [root]="breadcrumbFolderTitle"
                 data-automation-id="content-node-selector-content-breadcrumb">
             </adf-dropdown-breadcrumb>
         </adf-toolbar-title>

lib/content-services/content-node-selector/content-node-selector-panel.component.ts

@@ -153,6 +153,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit {
     inDialog: boolean = false;
     _chosenNode: Node = null;
     folderIdToShow: string | null = null;
+    breadcrumbFolderTitle: string | null = null;
 
     pagination: PaginationModel = this.DEFAULT_PAGINATION;
 
@@ -234,6 +235,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit {
      */
     siteChanged(chosenSite: SiteEntry): void {
         this.siteId = chosenSite.entry.guid;
+        this.setTitleIfCustomSite(chosenSite);
         this.updateResults();
 
     }
@@ -409,4 +411,12 @@ export class ContentNodeSelectorPanelComponent implements OnInit {
     onNodeSelect(event: any): void {
         this.attemptNodeSelection(event.detail.node.entry);
     }
+
+    setTitleIfCustomSite(site: SiteEntry) {
+        if (this.customResourcesService.isCustomSource(site.entry.guid)) {
+            this.breadcrumbFolderTitle = site.entry.title;
+        } else {
+            this.breadcrumbFolderTitle = null;
+        }
+    }
 }

lib/content-services/content-node-selector/name-location-cell/name-location-cell.component.scss

@@ -2,10 +2,8 @@
     $foreground: map-get($theme, foreground);
 
     .adf-name-location-cell {
+        display: grid;
         &-location {
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
             color: mat-color($foreground, base, 0.5);
             font-size: 12px;
         }

lib/content-services/content-node-selector/name-location-cell/name-location-cell.component.ts

@@ -21,8 +21,8 @@ import { DataRow } from '@alfresco/adf-core';
 @Component({
     selector: 'adf-name-location-cell',
     template: `
-        <div class="adf-name-location-cell-name">{{ name }}</div>
-        <div class="adf-name-location-cell-location" [title]="path">{{ path }}</div>
+        <div class="adf-name-location-cell-name adf-datatable-cell-value">{{ name }}</div>
+        <div class="adf-name-location-cell-location adf-datatable-cell-value" [title]="path">{{ path }}</div>
     `,
     styleUrls: ['./name-location-cell.component.scss'],
     encapsulation: ViewEncapsulation.None,

lib/content-services/permission-manager/components/permission-list/permission-list.component.html

@@ -14,8 +14,8 @@
         <data-columns>
             <data-column [class] = "'adf-key-icon'" key="icon" type="icon" [sortable]="false">
             </data-column>
-            <data-column [class]= "'adf-authorityId-label adf-ellipsis-cell'" title="{{'PERMISSION_MANAGER.PERMISSION_DISPLAY.AUTHORITY_ID' | translate}}" key="authorityId"></data-column>
-            <data-column [class]="'adf-role-label'" title="{{'PERMISSION_MANAGER.PERMISSION_DISPLAY.ROLE' | translate}}" key="name">
+            <data-column [class]= "'adf-authorityId-label adf-ellipsis-cell adf-expand-cell-2'" title="{{'PERMISSION_MANAGER.PERMISSION_DISPLAY.AUTHORITY_ID' | translate}}" key="authorityId"></data-column>
+            <data-column [class]="'adf-ellipsis-cell adf-expand-cell-1'" title="{{'PERMISSION_MANAGER.PERMISSION_DISPLAY.ROLE' | translate}}" key="name">
                 <ng-template let-entry="$implicit">
                     <mat-form-field *ngIf="!entry.row.getValue('isInherited') else show_only_label">
                         <mat-select id="adf-select-role-permission"

lib/content-services/permission-manager/components/permission-list/permission-list.component.scss

@@ -20,10 +20,6 @@
             max-width: 50px;
         }
 
-        &-role-label {
-            max-width: 100px;
-        }
-
         &-ellipsis-cell {
             position: sticky;
             text-overflow: ellipsis;

lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts

@@ -40,7 +40,7 @@ describe('SearchSortingPickerComponent', () => {
                     <any> { 'key': 'description', 'label': 'Description', 'type': 'FIELD', 'field': 'cm:description', 'ascending': true }
                 ],
                 defaults: [
-                    <any> { 'key': 'name', 'type': 'FIELD', 'field': 'cm:name', 'ascending': true }
+                    <any> { 'key': 'name', 'type': 'FIELD', 'field': 'cm:name', 'ascending': false }
                 ]
             },
             categories: [
@@ -64,7 +64,7 @@ describe('SearchSortingPickerComponent', () => {
         component.ngOnInit();
 
         expect(component.value).toEqual('name');
-        expect(component.ascending).toBeTruthy();
+        expect(component.ascending).toBe(false);
     });
 
     it('should update query builder each time selection is changed', () => {

lib/content-services/search/components/search-sorting-picker/search-sorting-picker.component.ts

@@ -39,7 +39,7 @@ export class SearchSortingPickerComponent implements OnInit {
         const primary = this.queryBuilder.getPrimarySorting();
         if (primary) {
             this.value = primary.key;
-            this.ascending = this.getSortingOrder();
+            this.ascending = primary.ascending;
         }
     }