mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-07-24 17:31:52 +00:00
Code cleanup and optimisations (#3383)
* cleanup unused css
* remove unused store/reducer blocks
* fix typo in toolbar ("tool-bar")
* toolbar action: break dependency on adf-core
* unified toolbar component
* break dependency on adf toolbar module
* update e2e
* update e2e
* update e2e
* update e2e
* update e2e
* fix search results toolbar spacing
* cleanup unused app state
* cleanup unused code
* fix toolbar divider color
* fix missing buttons in the info drawer
* fix css nesting
* fix search results css
This commit is contained in:
Denys Vuika
GitHub
@@ -1,12 +1,7 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<adf-breadcrumb [root]="title" [folderNode]="node" (navigate)="goBack()"> </adf-breadcrumb>
|
||||
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-content">
|
||||
|
||||
@@ -24,11 +24,10 @@
|
||||
|
||||
import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
import { ContentApiService, PageComponent, PageLayoutComponent, ToolbarActionComponent } from '@alfresco/aca-shared';
|
||||
import { ContentApiService, PageComponent, PageLayoutComponent, ToolbarComponent } from '@alfresco/aca-shared';
|
||||
import { NavigateToPreviousPage, SetSelectedNodesAction } from '@alfresco/aca-shared/store';
|
||||
import { Subject } from 'rxjs';
|
||||
import { BreadcrumbModule, PermissionManagerModule } from '@alfresco/adf-content-services';
|
||||
import { ToolbarModule } from '@alfresco/adf-core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
@@ -45,15 +44,14 @@ import { CommentsTabComponent } from '../info-drawer/comments-tab/comments-tab.c
|
||||
TranslateModule,
|
||||
PermissionManagerModule,
|
||||
BreadcrumbModule,
|
||||
ToolbarModule,
|
||||
MatIconModule,
|
||||
MatTabsModule,
|
||||
MatProgressBarModule,
|
||||
MatButtonModule,
|
||||
MetadataTabComponent,
|
||||
CommentsTabComponent,
|
||||
ToolbarActionComponent,
|
||||
PageLayoutComponent
|
||||
PageLayoutComponent,
|
||||
ToolbarComponent
|
||||
],
|
||||
selector: 'app-details-manager',
|
||||
templateUrl: './details.component.html',
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITLE' | translate }}</h1>
|
||||
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-content">
|
||||
@@ -15,7 +10,6 @@
|
||||
#documentList
|
||||
acaDocumentList
|
||||
acaContextActions
|
||||
[display]="documentDisplayMode$ | async"
|
||||
[node]="$any(list)"
|
||||
[loading]="isLoading"
|
||||
[selectionMode]="'single'"
|
||||
|
||||
@@ -31,10 +31,10 @@ import {
|
||||
InfoDrawerComponent,
|
||||
PageComponent,
|
||||
PageLayoutComponent,
|
||||
ToolbarActionComponent
|
||||
ToolbarComponent
|
||||
} from '@alfresco/aca-shared';
|
||||
import { NavigateLibraryAction } from '@alfresco/aca-shared/store';
|
||||
import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule, UserPreferencesService } from '@alfresco/adf-core';
|
||||
import { DataTableModule, PaginationModule, TemplateModule, UserPreferencesService } from '@alfresco/adf-core';
|
||||
import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { DocumentListModule } from '@alfresco/adf-content-services';
|
||||
@@ -45,7 +45,6 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
standalone: true,
|
||||
imports: [
|
||||
CommonModule,
|
||||
ToolbarModule,
|
||||
DocumentListModule,
|
||||
DocumentListDirective,
|
||||
ContextActionsDirective,
|
||||
@@ -54,9 +53,9 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
ExtensionsModule,
|
||||
PaginationModule,
|
||||
InfoDrawerComponent,
|
||||
ToolbarActionComponent,
|
||||
PageLayoutComponent,
|
||||
TranslateModule
|
||||
TranslateModule,
|
||||
ToolbarComponent
|
||||
],
|
||||
templateUrl: './favorite-libraries.component.html',
|
||||
encapsulation: ViewEncapsulation.None
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.FAVORITES.TITLE' | translate }}</h1>
|
||||
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-content">
|
||||
@@ -15,7 +10,6 @@
|
||||
#documentList
|
||||
acaDocumentList
|
||||
acaContextActions
|
||||
[display]="documentDisplayMode$ | async"
|
||||
[currentFolderId]="'-favorites-'"
|
||||
[selectionMode]="'multiple'"
|
||||
[navigate]="false"
|
||||
|
||||
@@ -29,7 +29,7 @@ import {
|
||||
PageComponent,
|
||||
PageLayoutComponent,
|
||||
PaginationDirective,
|
||||
ToolbarActionComponent
|
||||
ToolbarComponent
|
||||
} from '@alfresco/aca-shared';
|
||||
import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElementEntity, PathInfo } from '@alfresco/js-api';
|
||||
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
|
||||
@@ -37,7 +37,7 @@ import { debounceTime, map } from 'rxjs/operators';
|
||||
import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { DocumentListModule } from '@alfresco/adf-content-services';
|
||||
import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core';
|
||||
import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core';
|
||||
import { DocumentListDirective } from '../../directives/document-list.directive';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
|
||||
@@ -45,7 +45,6 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
standalone: true,
|
||||
imports: [
|
||||
CommonModule,
|
||||
ToolbarModule,
|
||||
DocumentListModule,
|
||||
DocumentListDirective,
|
||||
ContextActionsDirective,
|
||||
@@ -55,9 +54,9 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
PaginationModule,
|
||||
PaginationDirective,
|
||||
InfoDrawerComponent,
|
||||
ToolbarActionComponent,
|
||||
PageLayoutComponent,
|
||||
TranslateModule
|
||||
TranslateModule,
|
||||
ToolbarComponent
|
||||
],
|
||||
templateUrl: './favorites.component.html',
|
||||
encapsulation: ViewEncapsulation.None
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
<aca-page-layout [hasError]="!isValidPath">
|
||||
<div class="aca-page-layout-header">
|
||||
<adf-breadcrumb [root]="title" [folderNode]="node" [maxItems]="isSmallScreen ? 1 : 0" (navigate)="onBreadcrumbNavigate($event)"> </adf-breadcrumb>
|
||||
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-error">
|
||||
@@ -20,7 +15,6 @@
|
||||
#documentList
|
||||
acaDocumentList
|
||||
acaContextActions
|
||||
[display]="documentDisplayMode$ | async"
|
||||
[selectionMode]="'multiple'"
|
||||
[multiselect]="false"
|
||||
[currentFolderId]="node?.id"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { DataTableModule, PaginationModule, ShowHeaderMode, ToolbarModule } from '@alfresco/adf-core';
|
||||
import { DataTableModule, PaginationModule, ShowHeaderMode } from '@alfresco/adf-core';
|
||||
import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
|
||||
import { ActivatedRoute, Params } from '@angular/router';
|
||||
import { MinimalNodeEntity, MinimalNodeEntryEntity, PathElement, PathElementEntity } from '@alfresco/js-api';
|
||||
@@ -35,7 +35,7 @@ import {
|
||||
PageComponent,
|
||||
PageLayoutComponent,
|
||||
PaginationDirective,
|
||||
ToolbarActionComponent
|
||||
ToolbarComponent
|
||||
} from '@alfresco/aca-shared';
|
||||
import { SetCurrentFolderAction, isAdmin, UploadFileVersionAction, showLoaderSelector } from '@alfresco/aca-shared/store';
|
||||
import { debounceTime, takeUntil } from 'rxjs/operators';
|
||||
@@ -52,7 +52,6 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
||||
CommonModule,
|
||||
TranslateModule,
|
||||
BreadcrumbModule,
|
||||
ToolbarModule,
|
||||
GenericErrorComponent,
|
||||
UploadModule,
|
||||
DocumentListModule,
|
||||
@@ -63,9 +62,9 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
||||
PaginationModule,
|
||||
MatProgressSpinnerModule,
|
||||
InfoDrawerComponent,
|
||||
ToolbarActionComponent,
|
||||
PaginationDirective,
|
||||
PageLayoutComponent
|
||||
PageLayoutComponent,
|
||||
ToolbarComponent
|
||||
],
|
||||
templateUrl: './files.component.html',
|
||||
encapsulation: ViewEncapsulation.None
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE' | translate }}</h1>
|
||||
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-content">
|
||||
@@ -15,7 +10,6 @@
|
||||
#documentList
|
||||
acaDocumentList
|
||||
acaContextActions
|
||||
[display]="documentDisplayMode$ | async"
|
||||
[currentFolderId]="'-mysites-'"
|
||||
[selectionMode]="'single'"
|
||||
[navigate]="false"
|
||||
|
||||
@@ -32,12 +32,12 @@ import {
|
||||
PageComponent,
|
||||
PageLayoutComponent,
|
||||
PaginationDirective,
|
||||
ToolbarActionComponent
|
||||
ToolbarComponent
|
||||
} from '@alfresco/aca-shared';
|
||||
import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { DocumentListModule } from '@alfresco/adf-content-services';
|
||||
import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core';
|
||||
import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core';
|
||||
import { DocumentListDirective } from '../../directives/document-list.directive';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
|
||||
@@ -45,7 +45,6 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
standalone: true,
|
||||
imports: [
|
||||
CommonModule,
|
||||
ToolbarModule,
|
||||
DocumentListModule,
|
||||
DocumentListDirective,
|
||||
ContextActionsDirective,
|
||||
@@ -55,9 +54,9 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
PaginationModule,
|
||||
PaginationDirective,
|
||||
InfoDrawerComponent,
|
||||
ToolbarActionComponent,
|
||||
PageLayoutComponent,
|
||||
TranslateModule
|
||||
TranslateModule,
|
||||
ToolbarComponent
|
||||
],
|
||||
templateUrl: './libraries.component.html',
|
||||
encapsulation: ViewEncapsulation.None
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.RECENT.TITLE' | translate }}</h1>
|
||||
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-content">
|
||||
@@ -15,7 +10,6 @@
|
||||
#documentList
|
||||
acaDocumentList
|
||||
acaContextActions
|
||||
[display]="documentDisplayMode$ | async"
|
||||
[currentFolderId]="'-recent-'"
|
||||
[selectionMode]="'multiple'"
|
||||
[navigate]="false"
|
||||
|
||||
@@ -31,12 +31,12 @@ import {
|
||||
PageComponent,
|
||||
PageLayoutComponent,
|
||||
PaginationDirective,
|
||||
ToolbarActionComponent
|
||||
ToolbarComponent
|
||||
} from '@alfresco/aca-shared';
|
||||
import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { DocumentListModule } from '@alfresco/adf-content-services';
|
||||
import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core';
|
||||
import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core';
|
||||
import { DocumentListDirective } from '../../directives/document-list.directive';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
|
||||
@@ -44,7 +44,6 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
standalone: true,
|
||||
imports: [
|
||||
CommonModule,
|
||||
ToolbarModule,
|
||||
DocumentListModule,
|
||||
DocumentListDirective,
|
||||
ContextActionsDirective,
|
||||
@@ -54,9 +53,9 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
PaginationModule,
|
||||
PaginationDirective,
|
||||
InfoDrawerComponent,
|
||||
ToolbarActionComponent,
|
||||
PageLayoutComponent,
|
||||
TranslateModule
|
||||
TranslateModule,
|
||||
ToolbarComponent
|
||||
],
|
||||
templateUrl: './recent-files.component.html',
|
||||
encapsulation: ViewEncapsulation.None
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<aca-search-input></aca-search-input>
|
||||
<div class="adf-toolbar--spacer adf-toolbar-divider"></div>
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<div class="aca-search-toolbar-spacer"></div>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-content">
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
@import '../../../ui/mixins';
|
||||
|
||||
aca-search-results {
|
||||
.aca-search-toolbar-spacer {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.adf-search-results {
|
||||
@include flex-row;
|
||||
|
||||
|
||||
@@ -35,13 +35,13 @@ import {
|
||||
PageComponent,
|
||||
PageLayoutComponent,
|
||||
PaginationDirective,
|
||||
ToolbarActionComponent
|
||||
ToolbarComponent
|
||||
} from '@alfresco/aca-shared';
|
||||
import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { SearchInputComponent } from '../search-input/search-input.component';
|
||||
import { DataTableModule, PaginationModule, ToolbarModule } from '@alfresco/adf-core';
|
||||
import { DataTableModule, PaginationModule } from '@alfresco/adf-core';
|
||||
import { MatProgressBarModule } from '@angular/material/progress-bar';
|
||||
import { DocumentListModule } from '@alfresco/adf-content-services';
|
||||
import { DocumentListDirective } from '../../../directives/document-list.directive';
|
||||
@@ -52,7 +52,6 @@ import { DocumentListDirective } from '../../../directives/document-list.directi
|
||||
CommonModule,
|
||||
TranslateModule,
|
||||
SearchInputComponent,
|
||||
ToolbarModule,
|
||||
MatProgressBarModule,
|
||||
DocumentListModule,
|
||||
DataTableModule,
|
||||
@@ -61,9 +60,9 @@ import { DocumentListDirective } from '../../../directives/document-list.directi
|
||||
InfoDrawerComponent,
|
||||
ContextActionsDirective,
|
||||
DocumentListDirective,
|
||||
ToolbarActionComponent,
|
||||
PaginationDirective,
|
||||
PageLayoutComponent
|
||||
PageLayoutComponent,
|
||||
ToolbarComponent
|
||||
],
|
||||
selector: 'aca-search-results',
|
||||
templateUrl: './search-libraries-results.component.html',
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<aca-search-input></aca-search-input>
|
||||
<div class="adf-toolbar--spacer adf-toolbar-divider"></div>
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<div class="aca-search-toolbar-spacer"></div>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-content">
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
@import '../../../ui/mixins';
|
||||
|
||||
aca-search-results {
|
||||
.aca-search-toolbar-spacer {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.adf-search-results {
|
||||
@include flex-row;
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ import {
|
||||
ShowInfoDrawerPreviewAction,
|
||||
SnackbarErrorAction
|
||||
} from '@alfresco/aca-shared/store';
|
||||
import { DataTableModule, PaginationModule, ToolbarModule, TranslationService, ViewerModule } from '@alfresco/adf-core';
|
||||
import { DataTableModule, PaginationModule, TranslationService, ViewerModule } from '@alfresco/adf-core';
|
||||
import { combineLatest } from 'rxjs';
|
||||
import {
|
||||
ContextActionsDirective,
|
||||
@@ -43,7 +43,7 @@ import {
|
||||
PageComponent,
|
||||
PageLayoutComponent,
|
||||
PaginationDirective,
|
||||
ToolbarActionComponent
|
||||
ToolbarComponent
|
||||
} from '@alfresco/aca-shared';
|
||||
import { SearchSortingDefinition } from '@alfresco/adf-content-services/lib/search/models/search-sorting-definition.interface';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
@@ -66,7 +66,6 @@ import { SearchResultsRowComponent } from '../search-results-row/search-results-
|
||||
CommonModule,
|
||||
TranslateModule,
|
||||
SearchInputComponent,
|
||||
ToolbarModule,
|
||||
MatProgressBarModule,
|
||||
SearchModule,
|
||||
MatDividerModule,
|
||||
@@ -85,8 +84,8 @@ import { SearchResultsRowComponent } from '../search-results-row/search-results-
|
||||
SearchResultsRowComponent,
|
||||
PaginationDirective,
|
||||
ViewerModule,
|
||||
ToolbarActionComponent,
|
||||
PageLayoutComponent
|
||||
PageLayoutComponent,
|
||||
ToolbarComponent
|
||||
],
|
||||
selector: 'aca-search-results',
|
||||
templateUrl: './search-results.component.html',
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.SHARED.TITLE' | translate }}</h1>
|
||||
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-content">
|
||||
@@ -15,7 +10,6 @@
|
||||
#documentList
|
||||
acaDocumentList
|
||||
acaContextActions
|
||||
[display]="documentDisplayMode$ | async"
|
||||
[currentFolderId]="'-sharedlinks-'"
|
||||
[selectionMode]="'multiple'"
|
||||
[sorting]="['modifiedAt', 'desc']"
|
||||
|
||||
@@ -32,12 +32,12 @@ import {
|
||||
PageComponent,
|
||||
PageLayoutComponent,
|
||||
PaginationDirective,
|
||||
ToolbarActionComponent
|
||||
ToolbarComponent
|
||||
} from '@alfresco/aca-shared';
|
||||
import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { DocumentListModule } from '@alfresco/adf-content-services';
|
||||
import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core';
|
||||
import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core';
|
||||
import { DocumentListDirective } from '../../directives/document-list.directive';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
|
||||
@@ -45,7 +45,6 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
standalone: true,
|
||||
imports: [
|
||||
CommonModule,
|
||||
ToolbarModule,
|
||||
DocumentListModule,
|
||||
DocumentListDirective,
|
||||
ContextActionsDirective,
|
||||
@@ -55,9 +54,9 @@ import { TranslateModule } from '@ngx-translate/core';
|
||||
PaginationModule,
|
||||
InfoDrawerComponent,
|
||||
PaginationDirective,
|
||||
ToolbarActionComponent,
|
||||
PageLayoutComponent,
|
||||
TranslateModule
|
||||
TranslateModule,
|
||||
ToolbarComponent
|
||||
],
|
||||
templateUrl: './shared-files.component.html',
|
||||
encapsulation: ViewEncapsulation.None
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
<ng-container *ngIf="sharedLinkId">
|
||||
<adf-alfresco-viewer [allowPrint]="false" [allowDownload]="false" [allowFullScreen]="false" [sharedLinkId]="sharedLinkId" [allowGoBack]="false">
|
||||
<adf-viewer-toolbar-actions>
|
||||
<ng-container *ngFor="let action of viewerToolbarActions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="action"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
<aca-toolbar [items]="viewerToolbarActions"></aca-toolbar>
|
||||
</adf-viewer-toolbar-actions>
|
||||
</adf-alfresco-viewer>
|
||||
</ng-container>
|
||||
|
||||
@@ -31,13 +31,13 @@ import { ActivatedRoute } from '@angular/router';
|
||||
import { Store } from '@ngrx/store';
|
||||
import { forkJoin, from, of, Subject } from 'rxjs';
|
||||
import { catchError, mergeMap, takeUntil } from 'rxjs/operators';
|
||||
import { AppExtensionService, AppService, ToolbarActionComponent } from '@alfresco/aca-shared';
|
||||
import { AppExtensionService, AppService, ToolbarComponent } from '@alfresco/aca-shared';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { AlfrescoViewerModule } from '@alfresco/adf-content-services';
|
||||
|
||||
@Component({
|
||||
standalone: true,
|
||||
imports: [CommonModule, ViewerModule, AlfrescoViewerModule, ToolbarActionComponent],
|
||||
imports: [CommonModule, ViewerModule, AlfrescoViewerModule, ToolbarComponent],
|
||||
selector: 'app-shared-link-view',
|
||||
templateUrl: './shared-link-view.component.html',
|
||||
styleUrls: ['shared-link-view.component.scss'],
|
||||
@@ -87,8 +87,4 @@ export class SharedLinkViewComponent implements OnInit, OnDestroy {
|
||||
this.onDestroy$.next(true);
|
||||
this.onDestroy$.complete();
|
||||
}
|
||||
|
||||
trackByActionId(_: number, action: ContentActionRef) {
|
||||
return action.id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,8 +14,6 @@
|
||||
{{ appName$ | async | translate }}
|
||||
</div>
|
||||
|
||||
<ng-container *ngFor="let actionRef of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="actionRef"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -22,13 +22,13 @@
|
||||
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { Component, EventEmitter, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core';
|
||||
import { Component, EventEmitter, inject, OnDestroy, OnInit, Output, ViewEncapsulation } from '@angular/core';
|
||||
import { Store } from '@ngrx/store';
|
||||
import { Observable, Subject } from 'rxjs';
|
||||
import { Subject } from 'rxjs';
|
||||
import { AppStore, getAppName, getLogoPath } from '@alfresco/aca-shared/store';
|
||||
import { AppConfigService } from '@alfresco/adf-core';
|
||||
import { ContentActionRef } from '@alfresco/adf-extensions';
|
||||
import { AppExtensionService, ToolbarActionComponent } from '@alfresco/aca-shared';
|
||||
import { AppExtensionService, ToolbarComponent } from '@alfresco/aca-shared';
|
||||
import { takeUntil } from 'rxjs/operators';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
@@ -36,7 +36,7 @@ import { RouterModule } from '@angular/router';
|
||||
|
||||
@Component({
|
||||
standalone: true,
|
||||
imports: [CommonModule, TranslateModule, RouterModule, ToolbarActionComponent],
|
||||
imports: [CommonModule, TranslateModule, RouterModule, ToolbarComponent],
|
||||
selector: 'app-sidenav-header',
|
||||
templateUrl: `./sidenav-header.component.html`,
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
@@ -44,21 +44,18 @@ import { RouterModule } from '@angular/router';
|
||||
})
|
||||
export class SidenavHeaderComponent implements OnInit, OnDestroy {
|
||||
private onDestroy$ = new Subject<boolean>();
|
||||
private store = inject<Store<AppStore>>(Store);
|
||||
private appConfigService = inject(AppConfigService);
|
||||
private appExtensions = inject(AppExtensionService);
|
||||
|
||||
appName$: Observable<string>;
|
||||
logo$: Observable<string>;
|
||||
landingPage: string;
|
||||
appName$ = this.store.select(getAppName);
|
||||
logo$ = this.store.select(getLogoPath);
|
||||
landingPage = this.appConfigService.get('landingPage', '/personal-files');
|
||||
actions: Array<ContentActionRef> = [];
|
||||
|
||||
@Output()
|
||||
toggleNavBar = new EventEmitter();
|
||||
|
||||
constructor(public store: Store<AppStore>, private appConfigService: AppConfigService, private appExtensions: AppExtensionService) {
|
||||
this.appName$ = store.select(getAppName);
|
||||
this.logo$ = store.select(getLogoPath);
|
||||
this.landingPage = this.appConfigService.get('landingPage', '/personal-files');
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.appExtensions
|
||||
.getHeaderActions()
|
||||
@@ -72,8 +69,4 @@ export class SidenavHeaderComponent implements OnInit, OnDestroy {
|
||||
this.onDestroy$.next(true);
|
||||
this.onDestroy$.complete();
|
||||
}
|
||||
|
||||
trackByActionId(_: number, action: ContentActionRef) {
|
||||
return action.id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,7 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.TRASHCAN.TITLE' | translate }}</h1>
|
||||
|
||||
<adf-toolbar class="adf-toolbar--inline">
|
||||
<ng-container *ngFor="let entry of actions; trackBy: trackByActionId">
|
||||
<aca-toolbar-action [actionRef]="entry"></aca-toolbar-action>
|
||||
</ng-container>
|
||||
</adf-toolbar>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
<div class="aca-page-layout-content">
|
||||
@@ -15,7 +10,6 @@
|
||||
#documentList
|
||||
acaDocumentList
|
||||
acaContextActions
|
||||
[display]="documentDisplayMode$ | async"
|
||||
[currentFolderId]="'-trashcan-'"
|
||||
[selectionMode]="'multiple'"
|
||||
[multiselect]="false"
|
||||
|
||||
@@ -25,11 +25,11 @@
|
||||
import { getUserProfile } from '@alfresco/aca-shared/store';
|
||||
import { DocumentListPresetRef, ExtensionsModule } from '@alfresco/adf-extensions';
|
||||
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
|
||||
import { ContextActionsDirective, PageComponent, PageLayoutComponent, PaginationDirective, ToolbarActionComponent } from '@alfresco/aca-shared';
|
||||
import { ContextActionsDirective, PageComponent, PageLayoutComponent, PaginationDirective, ToolbarComponent } from '@alfresco/aca-shared';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { DocumentListModule } from '@alfresco/adf-content-services';
|
||||
import { DataTableModule, PaginationModule, TemplateModule, ToolbarModule } from '@alfresco/adf-core';
|
||||
import { DataTableModule, PaginationModule, TemplateModule } from '@alfresco/adf-core';
|
||||
import { DocumentListDirective } from '../../directives/document-list.directive';
|
||||
|
||||
@Component({
|
||||
@@ -37,7 +37,6 @@ import { DocumentListDirective } from '../../directives/document-list.directive'
|
||||
imports: [
|
||||
CommonModule,
|
||||
TranslateModule,
|
||||
ToolbarModule,
|
||||
DocumentListModule,
|
||||
TemplateModule,
|
||||
PaginationModule,
|
||||
@@ -46,8 +45,8 @@ import { DocumentListDirective } from '../../directives/document-list.directive'
|
||||
DocumentListDirective,
|
||||
ContextActionsDirective,
|
||||
PaginationDirective,
|
||||
ToolbarActionComponent,
|
||||
PageLayoutComponent
|
||||
PageLayoutComponent,
|
||||
ToolbarComponent
|
||||
],
|
||||
templateUrl: './trashcan.component.html',
|
||||
encapsulation: ViewEncapsulation.None
|
||||
|
||||
Reference in New Issue
Block a user