-
-
+
+
diff --git a/src/app/components/search/search-results/search-results.component.spec.ts b/src/app/components/search/search-results/search-results.component.spec.ts
index e7e5c71b9..cca5ed600 100644
--- a/src/app/components/search/search-results/search-results.component.spec.ts
+++ b/src/app/components/search/search-results/search-results.component.spec.ts
@@ -16,7 +16,10 @@ import {
TranslationService
} from '@alfresco/adf-core';
import { Store } from '@ngrx/store';
-import { NavigateToFolder, SnackbarErrorAction } from '../../../store/actions';
+import {
+ NavigateToFolder,
+ SnackbarErrorAction
+} from '@alfresco/aca-shared/store';
import { Pagination } from '@alfresco/js-api';
import { SearchQueryBuilderService } from '@alfresco/adf-content-services';
import { ActivatedRoute } from '@angular/router';
diff --git a/src/app/components/search/search-results/search-results.component.ts b/src/app/components/search/search-results/search-results.component.ts
index 2b419dd44..bef44362f 100644
--- a/src/app/components/search/search-results/search-results.component.ts
+++ b/src/app/components/search/search-results/search-results.component.ts
@@ -32,14 +32,16 @@ import {
} from '@alfresco/adf-content-services';
import { PageComponent } from '../../page.component';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states/app.state';
-import { NavigateToFolder } from '../../../store/actions';
+import {
+ AppStore,
+ NavigateToFolder,
+ SnackbarErrorAction,
+ showFacetFilter
+} from '@alfresco/aca-shared/store';
import { AppExtensionService } from '../../../extensions/extension.service';
import { ContentManagementService } from '../../../services/content-management.service';
import { AppConfigService, TranslationService } from '@alfresco/adf-core';
import { Observable } from 'rxjs';
-import { showFacetFilter } from '../../../store/selectors/app.selectors';
-import { SnackbarErrorAction } from '../../../store/actions';
@Component({
selector: 'aca-search-results',
diff --git a/src/app/components/settings/settings.component.ts b/src/app/components/settings/settings.component.ts
index c0e6f1733..157b03ca9 100644
--- a/src/app/components/settings/settings.component.ts
+++ b/src/app/components/settings/settings.component.ts
@@ -32,15 +32,15 @@ import {
import { Validators, FormGroup, FormBuilder } from '@angular/forms';
import { Observable, BehaviorSubject } from 'rxjs';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states';
+import { MatCheckboxChange } from '@angular/material/checkbox';
import {
- appLanguagePicker,
- selectHeaderColor,
- selectAppName,
- selectUser
-} from '../../store/selectors/app.selectors';
-import { MatCheckboxChange } from '@angular/material';
-import { SetLanguagePickerAction } from '../../store/actions';
+ AppStore,
+ SetLanguagePickerAction,
+ getHeaderColor,
+ getAppName,
+ getUserProfile,
+ getLanguagePickerState
+} from '@alfresco/aca-shared/store';
import { ProfileState } from '@alfresco/adf-extensions';
interface RepositoryConfig {
@@ -72,10 +72,10 @@ export class SettingsComponent implements OnInit {
private storage: StorageService,
private fb: FormBuilder
) {
- this.profile$ = store.select(selectUser);
- this.appName$ = store.select(selectAppName);
- this.languagePicker$ = store.select(appLanguagePicker);
- this.headerColor$ = store.select(selectHeaderColor);
+ this.profile$ = store.select(getUserProfile);
+ this.appName$ = store.select(getAppName);
+ this.languagePicker$ = store.select(getLanguagePickerState);
+ this.headerColor$ = store.select(getHeaderColor);
}
get logo() {
diff --git a/src/app/components/shared-files/shared-files.component.html b/src/app/components/shared-files/shared-files.component.html
index 2d748e83a..98a111432 100644
--- a/src/app/components/shared-files/shared-files.component.html
+++ b/src/app/components/shared-files/shared-files.component.html
@@ -1,5 +1,5 @@
-
-
+
+
@@ -7,9 +7,9 @@
-
+
-
+
-
-
+
+
diff --git a/src/app/components/shared-files/shared-files.component.ts b/src/app/components/shared-files/shared-files.component.ts
index 3229cb401..ba5d3c7a5 100644
--- a/src/app/components/shared-files/shared-files.component.ts
+++ b/src/app/components/shared-files/shared-files.component.ts
@@ -28,7 +28,6 @@ import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
import { ContentManagementService } from '../../services/content-management.service';
import { PageComponent } from '../page.component';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states/app.state';
import { AppExtensionService } from '../../extensions/extension.service';
import { debounceTime } from 'rxjs/operators';
import { UploadService } from '@alfresco/adf-core';
@@ -42,7 +41,7 @@ export class SharedFilesComponent extends PageComponent implements OnInit {
columns: any[] = [];
constructor(
- store: Store
,
+ store: Store,
extensions: AppExtensionService,
content: ContentManagementService,
private uploadService: UploadService,
diff --git a/src/app/components/shared-link-view/shared-link-view.component.spec.ts b/src/app/components/shared-link-view/shared-link-view.component.spec.ts
index 0cb20d044..6b622c51c 100644
--- a/src/app/components/shared-link-view/shared-link-view.component.spec.ts
+++ b/src/app/components/shared-link-view/shared-link-view.component.spec.ts
@@ -36,7 +36,7 @@ import { ActivatedRoute } from '@angular/router';
import { of } from 'rxjs';
import { NO_ERRORS_SCHEMA } from '@angular/core';
import { AlfrescoApiService } from '@alfresco/adf-core';
-import { SetSelectedNodesAction } from '../../store/actions';
+import { SetSelectedNodesAction } from '@alfresco/aca-shared/store';
import { AppExtensionService } from '../../extensions/extension.service';
describe('SharedLinkViewComponent', () => {
diff --git a/src/app/components/shared-link-view/shared-link-view.component.ts b/src/app/components/shared-link-view/shared-link-view.component.ts
index b77aacd9c..f7c4edec1 100644
--- a/src/app/components/shared-link-view/shared-link-view.component.ts
+++ b/src/app/components/shared-link-view/shared-link-view.component.ts
@@ -1,15 +1,42 @@
-import { Component, ViewEncapsulation, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { ContentActionRef } from '@alfresco/adf-extensions';
-import { AppExtensionService } from '../../extensions/extension.service';
-import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states/app.state';
+/*!
+ * @license
+ * Alfresco Example Content Application
+ *
+ * Copyright (C) 2005 - 2019 Alfresco Software Limited
+ *
+ * This file is part of the Alfresco Example Content Application.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * The Alfresco Example Content Application is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ */
+
+import {
+ AppStore,
+ SetSelectedNodesAction,
+ getAppSelection
+} from '@alfresco/aca-shared/store';
import { AlfrescoApiService } from '@alfresco/adf-core';
+import { ContentActionRef } from '@alfresco/adf-extensions';
import { SharedLinkEntry } from '@alfresco/js-api';
-import { SetSelectedNodesAction } from '../../store/actions';
-import { flatMap, catchError } from 'rxjs/operators';
-import { forkJoin, of, from } from 'rxjs';
-import { appSelection } from '../../store/selectors/app.selectors';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { forkJoin, from, of } from 'rxjs';
+import { catchError, flatMap } from 'rxjs/operators';
+import { AppExtensionService } from '../../extensions/extension.service';
@Component({
selector: 'app-shared-link-view',
@@ -48,7 +75,7 @@ export class SharedLinkViewComponent implements OnInit {
this.sharedLinkId = sharedId;
});
- this.store.select(appSelection).subscribe(selection => {
+ this.store.select(getAppSelection).subscribe(selection => {
if (!selection.isEmpty)
this.viewerToolbarActions = this.extensions.getSharedLinkViewerToolbarActions();
});
diff --git a/src/app/components/shared/content-node-share/content-node-share.dialog.spec.ts b/src/app/components/shared/content-node-share/content-node-share.dialog.spec.ts
index 873aad179..3f3a3af58 100644
--- a/src/app/components/shared/content-node-share/content-node-share.dialog.spec.ts
+++ b/src/app/components/shared/content-node-share/content-node-share.dialog.spec.ts
@@ -17,7 +17,11 @@
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TestBed, fakeAsync, async, tick } from '@angular/core/testing';
-import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material';
+import {
+ MatDialogRef,
+ MAT_DIALOG_DATA,
+ MatDialog
+} from '@angular/material/dialog';
import { of } from 'rxjs';
import {
setupTestBed,
diff --git a/src/app/components/shared/content-node-share/content-node-share.dialog.ts b/src/app/components/shared/content-node-share/content-node-share.dialog.ts
index ecdf01365..43455dfa2 100644
--- a/src/app/components/shared/content-node-share/content-node-share.dialog.ts
+++ b/src/app/components/shared/content-node-share/content-node-share.dialog.ts
@@ -23,11 +23,14 @@ import {
ViewChild,
OnDestroy
} from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef, MatDialog } from '@angular/material';
+import {
+ MAT_DIALOG_DATA,
+ MatDialogRef,
+ MatDialog
+} from '@angular/material/dialog';
import { FormGroup, FormControl } from '@angular/forms';
import { Subscription, Observable, throwError } from 'rxjs';
-import { SnackbarErrorAction } from '../../../store/actions';
-import { AppStore } from '../../../store/states/app.state';
+import { AppStore, SnackbarErrorAction } from '@alfresco/aca-shared/store';
import { Store } from '@ngrx/store';
import {
skip,
diff --git a/src/app/components/shared/toggle-shared/toggle-shared.component.ts b/src/app/components/shared/toggle-shared/toggle-shared.component.ts
index e61821454..ca3968859 100644
--- a/src/app/components/shared/toggle-shared/toggle-shared.component.ts
+++ b/src/app/components/shared/toggle-shared/toggle-shared.component.ts
@@ -26,10 +26,12 @@
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states/app.state';
-import { appSelection } from '../../../store/selectors/app.selectors';
import { SelectionState } from '@alfresco/adf-extensions';
-import { ShareNodeAction } from '../../../store/actions';
+import {
+ AppStore,
+ ShareNodeAction,
+ getAppSelection
+} from '@alfresco/aca-shared/store';
@Component({
selector: 'app-toggle-shared',
@@ -41,7 +43,7 @@ export class ToggleSharedComponent implements OnInit {
constructor(private store: Store) {}
ngOnInit() {
- this.selection$ = this.store.select(appSelection);
+ this.selection$ = this.store.select(getAppSelection);
}
isShared(selection: SelectionState) {
diff --git a/src/app/components/sidenav/directives/action.directive.ts b/src/app/components/sidenav/directives/action.directive.ts
index bc201ea8e..7ca148891 100644
--- a/src/app/components/sidenav/directives/action.directive.ts
+++ b/src/app/components/sidenav/directives/action.directive.ts
@@ -26,7 +26,6 @@
import { Directive, Input, HostListener } from '@angular/core';
import { PRIMARY_OUTLET, Router } from '@angular/router';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states/app.state';
@Directive({
/* tslint:disable-next-line */
@@ -41,18 +40,14 @@ export class ActionDirective {
if (this.action.route) {
this.router.navigate(this.getNavigationCommands(this.action.route));
} else if (this.action.click) {
- this.dispatchAction(this.action.click);
+ this.store.dispatch({
+ type: this.action.click.action,
+ payload: this.getNavigationCommands(this.action.click.payload)
+ });
}
}
- constructor(private router: Router, private store: Store) {}
-
- private dispatchAction(action) {
- this.store.dispatch({
- type: action.action,
- payload: this.getNavigationCommands(action.payload)
- });
- }
+ constructor(private router: Router, private store: Store) {}
private getNavigationCommands(url: string): any[] {
const urlTree = this.router.parseUrl(url);
diff --git a/src/app/components/sidenav/directives/expansion-panel.directive.ts b/src/app/components/sidenav/directives/expansion-panel.directive.ts
index 86640f308..693d13113 100644
--- a/src/app/components/sidenav/directives/expansion-panel.directive.ts
+++ b/src/app/components/sidenav/directives/expansion-panel.directive.ts
@@ -35,7 +35,6 @@ import { filter, takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs';
import { MatExpansionPanel } from '@angular/material/expansion';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states/app.state';
@Directive({
selector: '[acaExpansionPanel]',
@@ -63,7 +62,7 @@ export class ExpansionPanelDirective implements OnInit, OnDestroy {
}
constructor(
- private store: Store,
+ private store: Store,
private router: Router,
private expansionPanel: MatExpansionPanel
) {}
diff --git a/src/app/components/sidenav/directives/menu-panel.directive.ts b/src/app/components/sidenav/directives/menu-panel.directive.ts
index 154bfbd76..956297cac 100644
--- a/src/app/components/sidenav/directives/menu-panel.directive.ts
+++ b/src/app/components/sidenav/directives/menu-panel.directive.ts
@@ -34,7 +34,6 @@ import { Router, NavigationEnd, PRIMARY_OUTLET } from '@angular/router';
import { filter, takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states/app.state';
@Directive({
selector: '[acaMenuPanel]',
@@ -61,7 +60,7 @@ export class MenuPanelDirective implements OnInit, OnDestroy {
}
}
- constructor(private store: Store, private router: Router) {}
+ constructor(private store: Store, private router: Router) {}
hasActiveLinks() {
if (this.acaMenuPanel && this.acaMenuPanel.children) {
diff --git a/src/app/components/sidenav/sidenav.component.ts b/src/app/components/sidenav/sidenav.component.ts
index 9c2a8c3a1..83179b534 100755
--- a/src/app/components/sidenav/sidenav.component.ts
+++ b/src/app/components/sidenav/sidenav.component.ts
@@ -37,8 +37,7 @@ import { ExpandedTemplateDirective } from './directives/expanded-template.direct
import { AppExtensionService } from '../../extensions/extension.service';
import { NavBarGroupRef } from '@alfresco/adf-extensions';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states';
-import { sidenavState } from '../../store/selectors/app.selectors';
+import { AppStore, getSideNavState } from '@alfresco/aca-shared/store';
import { Subject } from 'rxjs';
import { takeUntil, distinctUntilChanged, debounceTime } from 'rxjs/operators';
@@ -68,7 +67,7 @@ export class SidenavComponent implements OnInit, OnDestroy {
ngOnInit() {
this.store
- .select(sidenavState)
+ .select(getSideNavState)
.pipe(
debounceTime(300),
distinctUntilChanged(),
diff --git a/src/app/components/toolbar/document-display-mode/document-display-mode.component.ts b/src/app/components/toolbar/document-display-mode/document-display-mode.component.ts
index 5a241c655..124a9a7dc 100644
--- a/src/app/components/toolbar/document-display-mode/document-display-mode.component.ts
+++ b/src/app/components/toolbar/document-display-mode/document-display-mode.component.ts
@@ -26,9 +26,11 @@
import { Component, ViewEncapsulation } from '@angular/core';
import { Observable } from 'rxjs';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states';
-import { documentDisplayMode } from '../../../store/selectors/app.selectors';
-import { ToggleDocumentDisplayMode } from '../../../store/actions';
+import {
+ AppStore,
+ ToggleDocumentDisplayMode,
+ getDocumentDisplayMode
+} from '@alfresco/aca-shared/store';
@Component({
selector: 'app-document-display-mode',
@@ -45,7 +47,7 @@ export class DocumentDisplayModeComponent {
displayMode$: Observable;
constructor(private store: Store) {
- this.displayMode$ = store.select(documentDisplayMode);
+ this.displayMode$ = store.select(getDocumentDisplayMode);
}
onClick() {
diff --git a/src/app/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.spec.ts b/src/app/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.spec.ts
index 119e80a62..0f089ca92 100644
--- a/src/app/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.spec.ts
+++ b/src/app/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.spec.ts
@@ -33,7 +33,7 @@ import {
DownloadNodesAction,
EditOfflineAction,
SnackbarErrorAction
-} from '../../../store/actions';
+} from '@alfresco/aca-shared/store';
describe('ToggleEditOfflineComponent', () => {
let fixture;
diff --git a/src/app/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts b/src/app/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
index 26f4c8157..bead7cbde 100644
--- a/src/app/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
+++ b/src/app/components/toolbar/toggle-edit-offline/toggle-edit-offline.component.ts
@@ -23,16 +23,16 @@
* along with Alfresco. If not, see .
*/
-import { Component, ViewEncapsulation, OnInit } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states';
-import { appSelection } from '../../../store/selectors/app.selectors';
import {
+ AppStore,
DownloadNodesAction,
EditOfflineAction,
- SnackbarErrorAction
-} from '../../../store/actions';
+ SnackbarErrorAction,
+ getAppSelection
+} from '@alfresco/aca-shared/store';
import { MinimalNodeEntity } from '@alfresco/js-api';
+import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Store } from '@ngrx/store';
@Component({
selector: 'app-toggle-edit-offline',
@@ -70,7 +70,7 @@ export class ToggleEditOfflineComponent implements OnInit {
constructor(private store: Store) {}
ngOnInit() {
- this.store.select(appSelection).subscribe(({ file }) => {
+ this.store.select(getAppSelection).subscribe(({ file }) => {
this.selection = file;
});
}
diff --git a/src/app/components/toolbar/toggle-favorite-library/toggle-favorite-library.component.ts b/src/app/components/toolbar/toggle-favorite-library/toggle-favorite-library.component.ts
index df7759828..d2c0d734f 100644
--- a/src/app/components/toolbar/toggle-favorite-library/toggle-favorite-library.component.ts
+++ b/src/app/components/toolbar/toggle-favorite-library/toggle-favorite-library.component.ts
@@ -25,8 +25,7 @@
import { Component, ViewEncapsulation, OnInit } from '@angular/core';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states';
-import { appSelection } from '../../../store/selectors/app.selectors';
+import { AppStore, getAppSelection } from '@alfresco/aca-shared/store';
import { Observable } from 'rxjs';
import { SelectionState } from '@alfresco/adf-extensions';
import { ContentManagementService } from '../../../services/content-management.service';
@@ -73,7 +72,7 @@ export class ToggleFavoriteLibraryComponent implements OnInit {
'/favorite/libraries'
);
- this.selection$ = this.store.select(appSelection).pipe(
+ this.selection$ = this.store.select(getAppSelection).pipe(
distinctUntilChanged(),
map(selection => {
// favorite libraries list should already be marked as favorite
diff --git a/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts b/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts
index 37ae414fe..32498c979 100644
--- a/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts
+++ b/src/app/components/toolbar/toggle-favorite/toggle-favorite.component.ts
@@ -25,11 +25,13 @@
import { Component, ViewEncapsulation } from '@angular/core';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states';
-import { appSelection } from '../../../store/selectors/app.selectors';
import { Observable } from 'rxjs';
import { SelectionState } from '@alfresco/adf-extensions';
-import { ReloadDocumentListAction } from '../../../store/actions';
+import {
+ AppStore,
+ ReloadDocumentListAction,
+ getAppSelection
+} from '@alfresco/aca-shared/store';
@Component({
selector: 'app-toggle-favorite',
@@ -56,7 +58,7 @@ export class ToggleFavoriteComponent {
selection$: Observable;
constructor(private store: Store) {
- this.selection$ = this.store.select(appSelection);
+ this.selection$ = this.store.select(getAppSelection);
}
onToggleEvent() {
diff --git a/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts b/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
index 174df9090..2c268e305 100644
--- a/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
+++ b/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
@@ -26,9 +26,10 @@
import { Component, ViewEncapsulation } from '@angular/core';
import { Observable } from 'rxjs';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states';
-import { infoDrawerOpened } from '../../../store/selectors/app.selectors';
-import { ToggleInfoDrawerAction } from '../../../store/actions';
+import {
+ ToggleInfoDrawerAction,
+ isInfoDrawerOpened
+} from '@alfresco/aca-shared/store';
@Component({
selector: 'app-toggle-info-drawer',
@@ -48,8 +49,8 @@ import { ToggleInfoDrawerAction } from '../../../store/actions';
export class ToggleInfoDrawerComponent {
infoDrawerOpened$: Observable;
- constructor(private store: Store) {
- this.infoDrawerOpened$ = this.store.select(infoDrawerOpened);
+ constructor(private store: Store) {
+ this.infoDrawerOpened$ = this.store.select(isInfoDrawerOpened);
}
onClick() {
diff --git a/src/app/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts b/src/app/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts
index 44d015269..a5313da09 100644
--- a/src/app/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts
+++ b/src/app/components/toolbar/toggle-join-library/toggle-join-library-button.component.ts
@@ -23,22 +23,22 @@
* along with Alfresco. If not, see .
*/
+import {
+ AppStore,
+ SetSelectedNodesAction,
+ SnackbarErrorAction,
+ SnackbarInfoAction,
+ getAppSelection
+} from '@alfresco/aca-shared/store';
+import { SelectionState } from '@alfresco/adf-extensions';
import { Component, ViewEncapsulation } from '@angular/core';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states';
-import { appSelection } from '../../../store/selectors/app.selectors';
import { Observable } from 'rxjs';
-import { SelectionState } from '@alfresco/adf-extensions';
-import { ContentManagementService } from '../../../services/content-management.service';
import {
- SnackbarErrorAction,
- SnackbarInfoAction
-} from '../../../store/actions/snackbar.actions';
-import { SetSelectedNodesAction } from '../../../store/actions/node.actions';
-import {
- LibraryMembershipToggleEvent,
- LibraryMembershipErrorEvent
+ LibraryMembershipErrorEvent,
+ LibraryMembershipToggleEvent
} from '../../../directives/library-membership.directive';
+import { ContentManagementService } from '../../../services/content-management.service';
@Component({
selector: 'app-toggle-join-library-button',
@@ -73,7 +73,7 @@ export class ToggleJoinLibraryButtonComponent {
private store: Store,
private content: ContentManagementService
) {
- this.selection$ = this.store.select(appSelection);
+ this.selection$ = this.store.select(getAppSelection);
}
onToggleEvent(event: LibraryMembershipToggleEvent) {
diff --git a/src/app/components/toolbar/toggle-join-library/toggle-join-library-menu.component.ts b/src/app/components/toolbar/toggle-join-library/toggle-join-library-menu.component.ts
index 2c90969c0..57281e195 100644
--- a/src/app/components/toolbar/toggle-join-library/toggle-join-library-menu.component.ts
+++ b/src/app/components/toolbar/toggle-join-library/toggle-join-library-menu.component.ts
@@ -25,7 +25,7 @@
import { Component, ViewEncapsulation } from '@angular/core';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../../store/states';
+import { AppStore } from '@alfresco/aca-shared/store';
import { ContentManagementService } from '../../../services/content-management.service';
import { ToggleJoinLibraryButtonComponent } from './toggle-join-library-button.component';
diff --git a/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.spec.ts b/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.spec.ts
index 753495afb..a0c9c9c10 100644
--- a/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.spec.ts
+++ b/src/app/components/toolbar/toggle-join-library/toggle-join-library.component.spec.ts
@@ -32,7 +32,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
import {
SnackbarErrorAction,
SnackbarInfoAction
-} from '../../../store/actions/snackbar.actions';
+} from '@alfresco/aca-shared/store';
import { AppTestingModule } from '../../../testing/app-testing.module';
import { ContentManagementService } from '../../../services/content-management.service';
import { ToggleJoinLibraryButtonComponent } from './toggle-join-library-button.component';
diff --git a/src/app/components/trashcan/trashcan.component.html b/src/app/components/trashcan/trashcan.component.html
index 032009ebf..37f87576b 100644
--- a/src/app/components/trashcan/trashcan.component.html
+++ b/src/app/components/trashcan/trashcan.component.html
@@ -1,5 +1,5 @@
-
-
+
+
@@ -7,9 +7,9 @@
-
+
-
+
-
-
+
+
diff --git a/src/app/components/trashcan/trashcan.component.ts b/src/app/components/trashcan/trashcan.component.ts
index 0e0e6aa4d..b830c5555 100644
--- a/src/app/components/trashcan/trashcan.component.ts
+++ b/src/app/components/trashcan/trashcan.component.ts
@@ -23,16 +23,15 @@
* along with Alfresco. If not, see .
*/
-import { Component, OnInit } from '@angular/core';
+import { AppStore, getUserProfile } from '@alfresco/aca-shared/store';
+import { ProfileState } from '@alfresco/adf-extensions';
import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
+import { Component, OnInit } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { AppExtensionService } from '../../extensions/extension.service';
import { ContentManagementService } from '../../services/content-management.service';
import { PageComponent } from '../page.component';
-import { Store } from '@ngrx/store';
-import { selectUser } from '../../store/selectors/app.selectors';
-import { AppStore } from '../../store/states/app.state';
-import { AppExtensionService } from '../../extensions/extension.service';
-import { Observable } from 'rxjs';
-import { ProfileState } from '@alfresco/adf-extensions';
@Component({
templateUrl: './trashcan.component.html'
@@ -50,7 +49,7 @@ export class TrashcanComponent extends PageComponent implements OnInit {
private breakpointObserver: BreakpointObserver
) {
super(store, extensions, content);
- this.user$ = this.store.select(selectUser);
+ this.user$ = this.store.select(getUserProfile);
}
ngOnInit() {
diff --git a/src/app/components/viewer/viewer.component.ts b/src/app/components/viewer/viewer.component.ts
index c50d28cee..3a08068e2 100644
--- a/src/app/components/viewer/viewer.component.ts
+++ b/src/app/components/viewer/viewer.component.ts
@@ -23,21 +23,21 @@
* along with Alfresco. If not, see .
*/
-import { Component, OnInit, OnDestroy, ViewEncapsulation } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { ContentActionRef, SelectionState } from '@alfresco/adf-extensions';
-import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states';
+import { ContentApiService } from '@alfresco/aca-shared';
import {
- appSelection,
- infoDrawerOpened
-} from '../../store/selectors/app.selectors';
-import { takeUntil } from 'rxjs/operators';
-import { Subject, Observable, from } from 'rxjs';
-import { AppExtensionService } from '../../extensions/extension.service';
+ AppStore,
+ getAppSelection,
+ isInfoDrawerOpened,
+ SetSelectedNodesAction
+} from '@alfresco/aca-shared/store';
+import { ContentActionRef, SelectionState } from '@alfresco/adf-extensions';
import { MinimalNodeEntryEntity } from '@alfresco/js-api';
-import { ContentApiService } from '../../services/content-api.service';
-import { SetSelectedNodesAction } from '../../store/actions';
+import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { from, Observable, Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+import { AppExtensionService } from '../../extensions/extension.service';
@Component({
selector: 'app-viewer',
@@ -66,7 +66,7 @@ export class AppViewerComponent implements OnInit, OnDestroy {
) {}
ngOnInit() {
- this.infoDrawerOpened$ = this.store.select(infoDrawerOpened);
+ this.infoDrawerOpened$ = this.store.select(isInfoDrawerOpened);
from(this.infoDrawerOpened$)
.pipe(takeUntil(this.onDestroy$))
@@ -75,7 +75,7 @@ export class AppViewerComponent implements OnInit, OnDestroy {
});
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(takeUntil(this.onDestroy$))
.subscribe(selection => {
this.selection = selection;
diff --git a/src/app/dialogs/node-versions/node-versions.dialog.ts b/src/app/dialogs/node-versions/node-versions.dialog.ts
index 1a7935794..d88292520 100644
--- a/src/app/dialogs/node-versions/node-versions.dialog.ts
+++ b/src/app/dialogs/node-versions/node-versions.dialog.ts
@@ -23,12 +23,11 @@
* along with Alfresco. If not, see .
*/
-import { Component, Inject, ViewEncapsulation } from '@angular/core';
-import { MAT_DIALOG_DATA } from '@angular/material';
+import { SnackbarErrorAction } from '@alfresco/aca-shared/store';
import { MinimalNodeEntryEntity } from '@alfresco/js-api';
+import { Component, Inject, ViewEncapsulation } from '@angular/core';
+import { MAT_DIALOG_DATA } from '@angular/material/dialog';
import { Store } from '@ngrx/store';
-import { AppStore } from '../../store/states/app.state';
-import { SnackbarErrorAction } from '../../store/actions';
@Component({
templateUrl: './node-versions.dialog.html',
@@ -38,10 +37,7 @@ import { SnackbarErrorAction } from '../../store/actions';
export class NodeVersionsDialogComponent {
node: MinimalNodeEntryEntity;
- constructor(
- @Inject(MAT_DIALOG_DATA) data: any,
- private store: Store
- ) {
+ constructor(@Inject(MAT_DIALOG_DATA) data: any, private store: Store) {
this.node = data.node;
}
diff --git a/src/app/directives/document-list.directive.ts b/src/app/directives/document-list.directive.ts
index ae0d64137..4468561ce 100644
--- a/src/app/directives/document-list.directive.ts
+++ b/src/app/directives/document-list.directive.ts
@@ -29,7 +29,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { UserPreferencesService } from '@alfresco/adf-core';
import { Subject } from 'rxjs';
import { Store } from '@ngrx/store';
-import { SetSelectedNodesAction } from '../store/actions';
+import { SetSelectedNodesAction } from '@alfresco/aca-shared/store';
import { takeUntil } from 'rxjs/operators';
import { ContentManagementService } from '../services/content-management.service';
diff --git a/src/app/extensions/core.extensions.module.ts b/src/app/extensions/core.extensions.module.ts
index 6baca9af5..f7332d8ec 100644
--- a/src/app/extensions/core.extensions.module.ts
+++ b/src/app/extensions/core.extensions.module.ts
@@ -27,9 +27,7 @@ import { CoreModule, AuthGuardEcm } from '@alfresco/adf-core';
import { CommonModule } from '@angular/common';
import { APP_INITIALIZER, ModuleWithProviders, NgModule } from '@angular/core';
import { AppLayoutComponent } from '../components/layout/app-layout/app-layout.component';
-import * as repository from './evaluators/repository.evaluators';
-import * as app from './evaluators/app.evaluators';
-import * as nav from './evaluators/navigation.evaluators';
+import * as rules from '@alfresco/aca-shared/rules';
import { AppExtensionService } from './extension.service';
import { ToggleInfoDrawerComponent } from '../components/toolbar/toggle-info-drawer/toggle-info-drawer.component';
import { ToggleFavoriteComponent } from '../components/toolbar/toggle-favorite/toggle-favorite.component';
@@ -109,63 +107,63 @@ export class CoreExtensionsModule {
});
extensions.setEvaluators({
- canCopyNode: app.canCopyNode,
- canToggleJoinLibrary: app.canToggleJoinLibrary,
- canEditFolder: app.canEditFolder,
- isTrashcanItemSelected: app.isTrashcanItemSelected,
- canViewFile: app.canViewFile,
- canLeaveLibrary: app.canLeaveLibrary,
- canToggleSharedLink: app.canToggleSharedLink,
- canShowInfoDrawer: app.canShowInfoDrawer,
- canManageFileVersions: app.canManageFileVersions,
- canManagePermissions: app.canManagePermissions,
- canToggleEditOffline: app.canToggleEditOffline,
- canToggleFavorite: app.canToggleFavorite,
+ canCopyNode: rules.canCopyNode,
+ canToggleJoinLibrary: rules.canToggleJoinLibrary,
+ canEditFolder: rules.canEditFolder,
+ isTrashcanItemSelected: rules.isTrashcanItemSelected,
+ canViewFile: rules.canViewFile,
+ canLeaveLibrary: rules.canLeaveLibrary,
+ canToggleSharedLink: rules.canToggleSharedLink,
+ canShowInfoDrawer: rules.canShowInfoDrawer,
+ canManageFileVersions: rules.canManageFileVersions,
+ canManagePermissions: rules.canManagePermissions,
+ canToggleEditOffline: rules.canToggleEditOffline,
+ canToggleFavorite: rules.canToggleFavorite,
- 'app.selection.canDelete': app.canDeleteSelection,
- 'app.selection.file.canUnlock': app.canUnlockFile,
- 'app.selection.file.canLock': app.canLockFile,
- 'app.selection.canDownload': app.canDownloadSelection,
- 'app.selection.notEmpty': app.hasSelection,
- 'app.selection.canUnshare': app.canUnshareNodes,
- 'app.selection.canAddFavorite': app.canAddFavorite,
- 'app.selection.canRemoveFavorite': app.canRemoveFavorite,
- 'app.selection.first.canUpdate': app.canUpdateSelectedNode,
- 'app.selection.file': app.hasFileSelected,
- 'app.selection.file.canShare': app.canShareFile,
- 'app.selection.file.isShared': app.isShared,
- 'app.selection.file.isLocked': app.hasLockedFiles,
- 'app.selection.file.isLockOwner': app.isUserWriteLockOwner,
- 'app.selection.file.canUploadVersion': app.canUploadVersion,
- 'app.selection.library': app.hasLibrarySelected,
- 'app.selection.isPrivateLibrary': app.isPrivateLibrary,
- 'app.selection.hasLibraryRole': app.hasLibraryRole,
- 'app.selection.hasNoLibraryRole': app.hasNoLibraryRole,
- 'app.selection.folder': app.hasFolderSelected,
- 'app.selection.folder.canUpdate': app.canUpdateSelectedFolder,
+ 'app.selection.canDelete': rules.canDeleteSelection,
+ 'app.selection.file.canUnlock': rules.canUnlockFile,
+ 'app.selection.file.canLock': rules.canLockFile,
+ 'app.selection.canDownload': rules.canDownloadSelection,
+ 'app.selection.notEmpty': rules.hasSelection,
+ 'app.selection.canUnshare': rules.canUnshareNodes,
+ 'app.selection.canAddFavorite': rules.canAddFavorite,
+ 'app.selection.canRemoveFavorite': rules.canRemoveFavorite,
+ 'app.selection.first.canUpdate': rules.canUpdateSelectedNode,
+ 'app.selection.file': rules.hasFileSelected,
+ 'app.selection.file.canShare': rules.canShareFile,
+ 'app.selection.file.isShared': rules.isShared,
+ 'app.selection.file.isLocked': rules.hasLockedFiles,
+ 'app.selection.file.isLockOwner': rules.isUserWriteLockOwner,
+ 'app.selection.file.canUploadVersion': rules.canUploadVersion,
+ 'app.selection.library': rules.hasLibrarySelected,
+ 'app.selection.isPrivateLibrary': rules.isPrivateLibrary,
+ 'app.selection.hasLibraryRole': rules.hasLibraryRole,
+ 'app.selection.hasNoLibraryRole': rules.hasNoLibraryRole,
+ 'app.selection.folder': rules.hasFolderSelected,
+ 'app.selection.folder.canUpdate': rules.canUpdateSelectedFolder,
- 'app.navigation.folder.canCreate': app.canCreateFolder,
- 'app.navigation.folder.canUpload': app.canUpload,
- 'app.navigation.isTrashcan': nav.isTrashcan,
- 'app.navigation.isNotTrashcan': nav.isNotTrashcan,
- 'app.navigation.isLibraries': nav.isLibraries,
- 'app.navigation.isLibraryFiles': nav.isLibraryFiles,
- 'app.navigation.isPersonalFiles': nav.isPersonalFiles,
- 'app.navigation.isNotLibraries': nav.isNotLibraries,
- 'app.navigation.isSharedFiles': nav.isSharedFiles,
- 'app.navigation.isNotSharedFiles': nav.isNotSharedFiles,
- 'app.navigation.isFavorites': nav.isFavorites,
- 'app.navigation.isNotFavorites': nav.isNotFavorites,
- 'app.navigation.isRecentFiles': nav.isRecentFiles,
- 'app.navigation.isNotRecentFiles': nav.isNotRecentFiles,
- 'app.navigation.isSearchResults': nav.isSearchResults,
- 'app.navigation.isNotSearchResults': nav.isNotSearchResults,
- 'app.navigation.isPreview': nav.isPreview,
- 'app.navigation.isSharedPreview': nav.isSharedPreview,
- 'app.navigation.isFavoritesPreview': nav.isFavoritesPreview,
- 'app.navigation.isSharedFileViewer': nav.isSharedFileViewer,
+ 'app.navigation.folder.canCreate': rules.canCreateFolder,
+ 'app.navigation.folder.canUpload': rules.canUpload,
+ 'app.navigation.isTrashcan': rules.isTrashcan,
+ 'app.navigation.isNotTrashcan': rules.isNotTrashcan,
+ 'app.navigation.isLibraries': rules.isLibraries,
+ 'app.navigation.isLibraryFiles': rules.isLibraryFiles,
+ 'app.navigation.isPersonalFiles': rules.isPersonalFiles,
+ 'app.navigation.isNotLibraries': rules.isNotLibraries,
+ 'app.navigation.isSharedFiles': rules.isSharedFiles,
+ 'app.navigation.isNotSharedFiles': rules.isNotSharedFiles,
+ 'app.navigation.isFavorites': rules.isFavorites,
+ 'app.navigation.isNotFavorites': rules.isNotFavorites,
+ 'app.navigation.isRecentFiles': rules.isRecentFiles,
+ 'app.navigation.isNotRecentFiles': rules.isNotRecentFiles,
+ 'app.navigation.isSearchResults': rules.isSearchResults,
+ 'app.navigation.isNotSearchResults': rules.isNotSearchResults,
+ 'app.navigation.isPreview': rules.isPreview,
+ 'app.navigation.isSharedPreview': rules.isSharedPreview,
+ 'app.navigation.isFavoritesPreview': rules.isFavoritesPreview,
+ 'app.navigation.isSharedFileViewer': rules.isSharedFileViewer,
- 'repository.isQuickShareEnabled': repository.hasQuickShareEnabled
+ 'repository.isQuickShareEnabled': rules.hasQuickShareEnabled
});
}
}
diff --git a/src/app/extensions/extension.service.spec.ts b/src/app/extensions/extension.service.spec.ts
index 085ab7df4..cd23575f2 100644
--- a/src/app/extensions/extension.service.spec.ts
+++ b/src/app/extensions/extension.service.spec.ts
@@ -27,7 +27,7 @@ import { TestBed } from '@angular/core/testing';
import { AppTestingModule } from '../testing/app-testing.module';
import { AppExtensionService } from './extension.service';
import { Store } from '@ngrx/store';
-import { AppStore } from '../store/states';
+import { AppStore } from '@alfresco/aca-shared/store';
import {
ContentActionType,
mergeArrays,
diff --git a/src/app/extensions/extension.service.ts b/src/app/extensions/extension.service.ts
index 380f9eff9..d8cba2084 100644
--- a/src/app/extensions/extension.service.ts
+++ b/src/app/extensions/extension.service.ts
@@ -26,11 +26,10 @@
import { Injectable, Type } from '@angular/core';
import { Store } from '@ngrx/store';
import { Route } from '@angular/router';
-import { MatIconRegistry } from '@angular/material';
+import { MatIconRegistry } from '@angular/material/icon';
import { DomSanitizer } from '@angular/platform-browser';
-import { AppStore } from '../store/states';
-import { ruleContext } from '../store/selectors/app.selectors';
-import { NodePermissionService } from '../services/node-permission.service';
+import { AppStore, getRuleContext } from '@alfresco/aca-shared/store';
+import { NodePermissionService } from '@alfresco/aca-shared';
import {
SelectionState,
NavigationState,
@@ -117,7 +116,7 @@ export class AppExtensionService implements RuleContext {
) {
this.references$ = this._references.asObservable();
- this.store.select(ruleContext).subscribe(result => {
+ this.store.select(getRuleContext).subscribe(result => {
this.selection = result.selection;
this.navigation = result.navigation;
this.profile = result.profile;
diff --git a/src/app/material.module.ts b/src/app/material.module.ts
index 397e6d222..2caa53326 100644
--- a/src/app/material.module.ts
+++ b/src/app/material.module.ts
@@ -24,16 +24,16 @@
*/
import { NgModule } from '@angular/core';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatIconModule } from '@angular/material/icon';
+import { MatButtonModule } from '@angular/material/button';
import {
- MatMenuModule,
- MatIconModule,
- MatButtonModule,
MatDialogModule,
- MatInputModule,
- MatSnackBarModule,
- MatProgressBarModule,
MAT_DIALOG_DEFAULT_OPTIONS
-} from '@angular/material';
+} from '@angular/material/dialog';
+import { MatInputModule } from '@angular/material/input';
+import { MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatProgressBarModule } from '@angular/material/progress-bar';
@NgModule({
imports: [
diff --git a/src/app/services/content-management.service.spec.ts b/src/app/services/content-management.service.spec.ts
index c190b6d18..2c33097f3 100644
--- a/src/app/services/content-management.service.spec.ts
+++ b/src/app/services/content-management.service.spec.ts
@@ -25,36 +25,37 @@
import { TestBed, fakeAsync, tick, flush } from '@angular/core/testing';
import { of, throwError } from 'rxjs';
-import { MatDialog, MatSnackBar } from '@angular/material';
import { Actions, ofType, EffectsModule } from '@ngrx/effects';
import {
- SNACKBAR_INFO,
+ AppStore,
SnackbarWarningAction,
SnackbarInfoAction,
SnackbarErrorAction,
- SNACKBAR_ERROR,
- SNACKBAR_WARNING,
PurgeDeletedNodesAction,
RestoreDeletedNodesAction,
NavigateToParentFolder,
NavigateRouteAction,
- NAVIGATE_ROUTE,
DeleteNodesAction,
MoveNodesAction,
CopyNodesAction,
ShareNodeAction,
SetSelectedNodesAction,
UnlockWriteAction
-} from '../store/actions';
+} from '@alfresco/aca-shared/store';
import { map } from 'rxjs/operators';
import { NodeEffects } from '../store/effects/node.effects';
import { AppTestingModule } from '../testing/app-testing.module';
-import { ContentApiService } from '../services/content-api.service';
+import { ContentApiService } from '@alfresco/aca-shared';
import { Store } from '@ngrx/store';
-import { AppStore } from '../store/states';
import { ContentManagementService } from './content-management.service';
import { NodeActionsService } from './node-actions.service';
import { TranslationService } from '@alfresco/adf-core';
+import { MatDialog } from '@angular/material/dialog';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import {
+ SnackbarActionTypes,
+ RouterActionTypes
+} from '../../../projects/aca-shared/store/src/public_api';
describe('ContentManagementService', () => {
let dialog: MatDialog;
@@ -773,7 +774,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'restoreNode').and.returnValue(throwError(null));
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map(action => done())
);
@@ -815,7 +816,7 @@ describe('ContentManagementService', () => {
);
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map(action => done())
);
@@ -848,7 +849,7 @@ describe('ContentManagementService', () => {
);
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map(action => done())
);
@@ -882,7 +883,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'deleteNode').and.returnValue(of(null));
actions$.pipe(
- ofType(SNACKBAR_INFO),
+ ofType(SnackbarActionTypes.Info),
map(action => {
done();
})
@@ -897,7 +898,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'deleteNode').and.returnValue(throwError(null));
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map(action => {
done();
})
@@ -912,7 +913,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'deleteNode').and.returnValue(of(null));
actions$.pipe(
- ofType(SNACKBAR_INFO),
+ ofType(SnackbarActionTypes.Info),
map(action => {
done();
})
@@ -930,7 +931,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'deleteNode').and.returnValue(throwError(null));
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map(action => {
done();
})
@@ -954,7 +955,7 @@ describe('ContentManagementService', () => {
});
actions$.pipe(
- ofType(SNACKBAR_WARNING),
+ ofType(SnackbarActionTypes.Warning),
map(action => {
done();
})
@@ -984,7 +985,7 @@ describe('ContentManagementService', () => {
});
actions$.pipe(
- ofType(SNACKBAR_WARNING),
+ ofType(SnackbarActionTypes.Warning),
map(action => {
done();
})
@@ -1028,7 +1029,7 @@ describe('ContentManagementService', () => {
describe('notification', () => {
it('raises warning on multiple fail and one success', fakeAsync(done => {
actions$.pipe(
- ofType(SNACKBAR_WARNING),
+ ofType(SnackbarActionTypes.Warning),
map((action: SnackbarWarningAction) => {
done();
})
@@ -1059,7 +1060,7 @@ describe('ContentManagementService', () => {
it('raises warning on multiple success and multiple fail', fakeAsync(done => {
actions$.pipe(
- ofType(SNACKBAR_WARNING),
+ ofType(SnackbarActionTypes.Warning),
map((action: SnackbarWarningAction) => {
done();
})
@@ -1095,7 +1096,7 @@ describe('ContentManagementService', () => {
it('raises info on one selected node success', fakeAsync(done => {
actions$.pipe(
- ofType(SNACKBAR_INFO),
+ ofType(SnackbarActionTypes.Info),
map((action: SnackbarInfoAction) => {
done();
})
@@ -1110,7 +1111,7 @@ describe('ContentManagementService', () => {
it('raises error on one selected node fail', fakeAsync(done => {
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map((action: SnackbarErrorAction) => {
done();
})
@@ -1125,7 +1126,7 @@ describe('ContentManagementService', () => {
it('raises info on all nodes success', fakeAsync(done => {
actions$.pipe(
- ofType(SNACKBAR_INFO),
+ ofType(SnackbarActionTypes.Info),
map((action: SnackbarInfoAction) => {
done();
})
@@ -1150,7 +1151,7 @@ describe('ContentManagementService', () => {
it('raises error on all nodes fail', fakeAsync(done => {
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map((action: SnackbarErrorAction) => {
done();
})
@@ -1278,7 +1279,7 @@ describe('ContentManagementService', () => {
const error = { message: '{ "error": {} }' };
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map(action => done())
);
@@ -1319,7 +1320,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'restoreNode').and.returnValue(throwError(error));
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map(action => done())
);
@@ -1343,7 +1344,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'restoreNode').and.returnValue(throwError(error));
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map(action => done())
);
@@ -1367,7 +1368,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'restoreNode').and.returnValue(throwError(error));
actions$.pipe(
- ofType(SNACKBAR_ERROR),
+ ofType(SnackbarActionTypes.Error),
map(action => done())
);
@@ -1397,7 +1398,7 @@ describe('ContentManagementService', () => {
});
actions$.pipe(
- ofType(SNACKBAR_INFO),
+ ofType(SnackbarActionTypes.Info),
map(action => done())
);
@@ -1422,7 +1423,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'restoreNode').and.returnValue(of({}));
actions$.pipe(
- ofType(SNACKBAR_INFO),
+ ofType(SnackbarActionTypes.Info),
map(action => done())
);
@@ -1444,7 +1445,7 @@ describe('ContentManagementService', () => {
spyOn(contentApi, 'restoreNode').and.returnValue(of({}));
actions$.pipe(
- ofType(NAVIGATE_ROUTE),
+ ofType(RouterActionTypes.NavigateRoute),
map(action => done())
);
diff --git a/src/app/services/content-management.service.ts b/src/app/services/content-management.service.ts
index 1e80db29a..91ec3c779 100644
--- a/src/app/services/content-management.service.ts
+++ b/src/app/services/content-management.service.ts
@@ -23,49 +23,53 @@
* along with Alfresco. If not, see .
*/
-import { Subject, Observable, forkJoin, of, zip } from 'rxjs';
-import { Injectable } from '@angular/core';
-import { MatDialog, MatSnackBar } from '@angular/material';
+import { ContentApiService } from '@alfresco/aca-shared';
import {
- FolderDialogComponent,
- ConfirmDialogComponent,
- LibraryDialogComponent
-} from '@alfresco/adf-content-services';
-import {
- SnackbarErrorAction,
- SnackbarInfoAction,
- SnackbarAction,
- SnackbarWarningAction,
+ AppStore,
+ DeletedNodeInfo,
+ DeleteStatus,
+ getAppSelection,
+ getSharedUrl,
NavigateRouteAction,
NavigateToParentFolder,
- SnackbarUserAction,
- UndoDeleteNodesAction,
+ NodeInfo,
+ ReloadDocumentListAction,
SetSelectedNodesAction,
- ReloadDocumentListAction
-} from '../store/actions';
-import { Store } from '@ngrx/store';
-import { AppStore } from '../store/states';
+ SnackbarAction,
+ SnackbarErrorAction,
+ SnackbarInfoAction,
+ SnackbarUserAction,
+ SnackbarWarningAction,
+ UndoDeleteNodesAction
+} from '@alfresco/aca-shared/store';
import {
+ ConfirmDialogComponent,
+ FolderDialogComponent,
+ LibraryDialogComponent
+} from '@alfresco/adf-content-services';
+import { TranslationService } from '@alfresco/adf-core';
+import {
+ DeletedNodesPaging,
MinimalNodeEntity,
MinimalNodeEntryEntity,
Node,
- SiteEntry,
- DeletedNodesPaging,
+ NodeEntry,
PathInfoEntity,
SiteBody,
- NodeEntry
+ SiteEntry
} from '@alfresco/js-api';
-import { NodePermissionService } from './node-permission.service';
-import { NodeInfo, DeletedNodeInfo, DeleteStatus } from '../store/models';
-import { ContentApiService } from './content-api.service';
-import { sharedUrl, appSelection } from '../store/selectors/app.selectors';
-import { NodeActionsService } from './node-actions.service';
-import { TranslationService, ViewUtilService } from '@alfresco/adf-core';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { Store } from '@ngrx/store';
+import { forkJoin, Observable, of, Subject, zip } from 'rxjs';
+import { catchError, flatMap, map, mergeMap, take, tap } from 'rxjs/operators';
+import { NodePermissionsDialogComponent } from '../components/permissions/permission-dialog/node-permissions.dialog';
+import { ShareDialogComponent } from '../components/shared/content-node-share/content-node-share.dialog';
import { NodeVersionUploadDialogComponent } from '../dialogs/node-version-upload/node-version-upload.dialog';
import { NodeVersionsDialogComponent } from '../dialogs/node-versions/node-versions.dialog';
-import { ShareDialogComponent } from '../components/shared/content-node-share/content-node-share.dialog';
-import { take, map, tap, mergeMap, catchError, flatMap } from 'rxjs/operators';
-import { NodePermissionsDialogComponent } from '../components/permissions/permission-dialog/node-permissions.dialog';
+import { NodeActionsService } from './node-actions.service';
+import { NodePermissionService } from '@alfresco/aca-shared';
interface RestoredNode {
status: number;
@@ -96,8 +100,7 @@ export class ContentManagementService {
private dialogRef: MatDialog,
private nodeActionsService: NodeActionsService,
private translation: TranslationService,
- private snackBar: MatSnackBar,
- private viewUtils: ViewUtilService
+ private snackBar: MatSnackBar
) {}
addFavorite(nodes: Array) {
@@ -197,7 +200,7 @@ export class ContentManagementService {
openShareLinkDialog(node) {
this.store
- .select(sharedUrl)
+ .select(getSharedUrl)
.pipe(take(1))
.subscribe(baseShareUrl => {
this.dialogRef
@@ -1164,42 +1167,8 @@ export class ContentManagementService {
return i18nMessageString;
}
- printFile(node: any) {
- if (node && node.entry) {
- // shared and favorite
- const id = node.entry.nodeId || node.entry.guid || node.entry.id;
- const mimeType = node.entry.content.mimeType;
-
- if (id) {
- this.viewUtils.printFileGeneric(id, mimeType);
- }
- }
- }
-
- /**
- * Triggers full screen mode with a main content area displayed.
- */
- fullscreenViewer() {
- const container = (
- document.documentElement.querySelector(
- '.adf-viewer__fullscreen-container'
- )
- );
- if (container) {
- if (container.requestFullscreen) {
- container.requestFullscreen();
- } else if (container.webkitRequestFullscreen) {
- container.webkitRequestFullscreen();
- } else if (container.mozRequestFullScreen) {
- container.mozRequestFullScreen();
- } else if (container.msRequestFullscreen) {
- container.msRequestFullscreen();
- }
- }
- }
-
getNodeInfo() {
- return this.store.select(appSelection).pipe(
+ return this.store.select(getAppSelection).pipe(
take(1),
flatMap(({ file }) => {
const id = (file).entry.nodeId || (file).entry.guid;
diff --git a/src/app/services/node-actions.service.spec.ts b/src/app/services/node-actions.service.spec.ts
index a2326c0f0..17518dc61 100644
--- a/src/app/services/node-actions.service.spec.ts
+++ b/src/app/services/node-actions.service.spec.ts
@@ -24,14 +24,14 @@
*/
import { TestBed, async } from '@angular/core/testing';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
import { of, throwError } from 'rxjs';
import { AlfrescoApiService, TranslationService } from '@alfresco/adf-core';
import { DocumentListService } from '@alfresco/adf-content-services';
import { NodeActionsService } from './node-actions.service';
import { MinimalNodeEntryEntity } from '@alfresco/js-api';
import { AppTestingModule } from '../testing/app-testing.module';
-import { ContentApiService } from '../services/content-api.service';
+import { ContentApiService } from '@alfresco/aca-shared';
class TestNode {
entry?: MinimalNodeEntryEntity;
diff --git a/src/app/services/node-actions.service.ts b/src/app/services/node-actions.service.ts
index f5a1a08a6..ada1b3937 100644
--- a/src/app/services/node-actions.service.ts
+++ b/src/app/services/node-actions.service.ts
@@ -24,7 +24,7 @@
*/
import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material';
+import { MatDialog } from '@angular/material/dialog';
import { Observable, Subject, of, zip, from } from 'rxjs';
import {
@@ -48,7 +48,7 @@ import {
Site,
NodeChildAssociationPaging
} from '@alfresco/js-api';
-import { ContentApiService } from '../services/content-api.service';
+import { ContentApiService } from '@alfresco/aca-shared';
import { catchError, map, mergeMap } from 'rxjs/operators';
export enum BatchOperationType {
diff --git a/src/app/store/app-store.module.ts b/src/app/store/app-store.module.ts
index 1d39ce07e..4ea9aae32 100644
--- a/src/app/store/app-store.module.ts
+++ b/src/app/store/app-store.module.ts
@@ -26,41 +26,37 @@
import { NgModule } from '@angular/core';
import { StoreModule } from '@ngrx/store';
import { appReducer } from './reducers/app.reducer';
-import { INITIAL_STATE } from './states';
import { StoreRouterConnectingModule } from '@ngrx/router-store';
import { EffectsModule } from '@ngrx/effects';
import { environment } from '../../environments/environment';
import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { SharedStoreModule } from '@alfresco/aca-shared/store';
import {
AppEffects,
- SnackbarEffects,
NodeEffects,
- RouterEffects,
DownloadEffects,
ViewerEffects,
SearchEffects,
LibraryEffects,
UploadEffects,
- FavoriteEffects,
- ModalsEffects
+ FavoriteEffects
} from './effects';
+import { INITIAL_STATE } from './initial-state';
@NgModule({
imports: [
StoreModule.forRoot({ app: appReducer }, { initialState: INITIAL_STATE }),
StoreRouterConnectingModule.forRoot({ stateKey: 'router' }),
+ SharedStoreModule,
EffectsModule.forRoot([
AppEffects,
- SnackbarEffects,
NodeEffects,
- RouterEffects,
DownloadEffects,
ViewerEffects,
SearchEffects,
LibraryEffects,
UploadEffects,
- FavoriteEffects,
- ModalsEffects
+ FavoriteEffects
]),
!environment.production
? StoreDevtoolsModule.instrument({ maxAge: 25 })
diff --git a/src/app/store/effects.ts b/src/app/store/effects.ts
index 421da1919..29bee5773 100644
--- a/src/app/store/effects.ts
+++ b/src/app/store/effects.ts
@@ -27,11 +27,8 @@ export * from './effects/app.effects';
export * from './effects/download.effects';
export * from './effects/favorite.effects';
export * from './effects/node.effects';
-export * from './effects/router.effects';
-export * from './effects/snackbar.effects';
export * from './effects/viewer.effects';
export * from './effects/search.effects';
export * from './effects/library.effects';
export * from './effects/upload.effects';
-export * from './effects/modals.effects';
export * from './effects/upload.effects';
diff --git a/src/app/store/effects/app.effects.ts b/src/app/store/effects/app.effects.ts
index 528602d74..682798aac 100644
--- a/src/app/store/effects/app.effects.ts
+++ b/src/app/store/effects/app.effects.ts
@@ -27,11 +27,10 @@ import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core';
import { map } from 'rxjs/operators';
import {
+ AppActionTypes,
LogoutAction,
- LOGOUT,
- ReloadDocumentListAction,
- RELOAD_DOCUMENT_LIST
-} from '../actions/app.actions';
+ ReloadDocumentListAction
+} from '@alfresco/aca-shared/store';
import { AuthenticationService } from '@alfresco/adf-core';
import { Router } from '@angular/router';
import { ContentManagementService } from '../../services/content-management.service';
@@ -47,7 +46,7 @@ export class AppEffects {
@Effect({ dispatch: false })
reload = this.actions$.pipe(
- ofType(RELOAD_DOCUMENT_LIST),
+ ofType(AppActionTypes.ReloadDocumentList),
map(action => {
this.content.reload.next(action);
})
@@ -55,7 +54,7 @@ export class AppEffects {
@Effect({ dispatch: false })
logout$ = this.actions$.pipe(
- ofType(LOGOUT),
+ ofType(AppActionTypes.Logout),
map(() => {
this.auth
.logout()
diff --git a/src/app/store/effects/download.effects.ts b/src/app/store/effects/download.effects.ts
index d94651dc4..3a53e5448 100644
--- a/src/app/store/effects/download.effects.ts
+++ b/src/app/store/effects/download.effects.ts
@@ -23,18 +23,21 @@
* along with Alfresco. If not, see .
*/
+import {
+ AppStore,
+ DownloadNodesAction,
+ NodeActionTypes,
+ NodeInfo,
+ getAppSelection
+} from '@alfresco/aca-shared/store';
import { DownloadZipDialogComponent } from '@alfresco/adf-core';
-import { Injectable } from '@angular/core';
-import { MatDialog } from '@angular/material';
-import { Actions, Effect, ofType } from '@ngrx/effects';
-import { map, take } from 'rxjs/operators';
-import { DownloadNodesAction, DOWNLOAD_NODES } from '../actions';
-import { NodeInfo } from '../models';
-import { ContentApiService } from '../../services/content-api.service';
import { MinimalNodeEntity } from '@alfresco/js-api';
+import { Injectable } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
+import { Actions, Effect, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store';
-import { AppStore } from '../states';
-import { appSelection } from '../selectors/app.selectors';
+import { map, take } from 'rxjs/operators';
+import { ContentApiService } from '@alfresco/aca-shared';
@Injectable()
export class DownloadEffects {
@@ -47,13 +50,13 @@ export class DownloadEffects {
@Effect({ dispatch: false })
downloadNode$ = this.actions$.pipe(
- ofType(DOWNLOAD_NODES),
+ ofType(NodeActionTypes.Download),
map(action => {
if (action.payload && action.payload.length > 0) {
this.downloadNodes(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && !selection.isEmpty) {
diff --git a/src/app/store/effects/favorite.effects.ts b/src/app/store/effects/favorite.effects.ts
index 1c7388881..2b57eed91 100644
--- a/src/app/store/effects/favorite.effects.ts
+++ b/src/app/store/effects/favorite.effects.ts
@@ -27,14 +27,13 @@ import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core';
import { map, take } from 'rxjs/operators';
import {
- ADD_FAVORITE,
+ AppStore,
+ NodeActionTypes,
AddFavoriteAction,
RemoveFavoriteAction,
- REMOVE_FAVORITE
-} from '../actions/favorite.actions';
+ getAppSelection
+} from '@alfresco/aca-shared/store';
import { Store } from '@ngrx/store';
-import { AppStore } from '../states';
-import { appSelection } from '../selectors/app.selectors';
import { ContentManagementService } from '../../services/content-management.service';
@Injectable()
@@ -47,13 +46,13 @@ export class FavoriteEffects {
@Effect({ dispatch: false })
addFavorite$ = this.actions$.pipe(
- ofType(ADD_FAVORITE),
+ ofType(NodeActionTypes.AddFavorite),
map(action => {
if (action.payload && action.payload.length > 0) {
this.content.addFavorite(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && !selection.isEmpty) {
@@ -66,13 +65,13 @@ export class FavoriteEffects {
@Effect({ dispatch: false })
removeFavorite$ = this.actions$.pipe(
- ofType(REMOVE_FAVORITE),
+ ofType(NodeActionTypes.RemoveFavorite),
map(action => {
if (action.payload && action.payload.length > 0) {
this.content.removeFavorite(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && !selection.isEmpty) {
diff --git a/src/app/store/effects/library.effects.ts b/src/app/store/effects/library.effects.ts
index 2350d759a..c496cd3bf 100644
--- a/src/app/store/effects/library.effects.ts
+++ b/src/app/store/effects/library.effects.ts
@@ -23,28 +23,24 @@
* along with Alfresco. If not, see .
*/
-import { Effect, Actions, ofType } from '@ngrx/effects';
-import { Injectable } from '@angular/core';
-import { map, take, mergeMap } from 'rxjs/operators';
import {
- DeleteLibraryAction,
- DELETE_LIBRARY,
+ AppStore,
CreateLibraryAction,
- CREATE_LIBRARY,
- NavigateLibraryAction,
- NAVIGATE_LIBRARY,
- UpdateLibraryAction,
- UPDATE_LIBRARY,
+ DeleteLibraryAction,
LeaveLibraryAction,
- LEAVE_LIBRARY,
- NavigateRouteAction
-} from '../actions';
-import { ContentManagementService } from '../../services/content-management.service';
+ LibraryActionTypes,
+ NavigateLibraryAction,
+ NavigateRouteAction,
+ SnackbarErrorAction,
+ UpdateLibraryAction,
+ getAppSelection
+} from '@alfresco/aca-shared/store';
+import { Injectable } from '@angular/core';
+import { Actions, Effect, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store';
-import { AppStore } from '../states';
-import { appSelection } from '../selectors/app.selectors';
-import { ContentApiService } from '../../services/content-api.service';
-import { SnackbarErrorAction } from '../actions/snackbar.actions';
+import { map, mergeMap, take } from 'rxjs/operators';
+import { ContentApiService } from '@alfresco/aca-shared';
+import { ContentManagementService } from '../../services/content-management.service';
@Injectable()
export class LibraryEffects {
@@ -57,13 +53,13 @@ export class LibraryEffects {
@Effect({ dispatch: false })
deleteLibrary$ = this.actions$.pipe(
- ofType(DELETE_LIBRARY),
+ ofType(LibraryActionTypes.Delete),
map(action => {
if (action.payload) {
this.content.deleteLibrary(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.library) {
@@ -76,13 +72,13 @@ export class LibraryEffects {
@Effect({ dispatch: false })
leaveLibrary$ = this.actions$.pipe(
- ofType(LEAVE_LIBRARY),
+ ofType(LibraryActionTypes.Leave),
map(action => {
if (action.payload) {
this.content.leaveLibrary(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.library) {
@@ -95,14 +91,14 @@ export class LibraryEffects {
@Effect()
createLibrary$ = this.actions$.pipe(
- ofType(CREATE_LIBRARY),
+ ofType(LibraryActionTypes.Create),
mergeMap(() => this.content.createLibrary()),
map(libraryId => new NavigateLibraryAction(libraryId))
);
@Effect({ dispatch: false })
navigateLibrary$ = this.actions$.pipe(
- ofType(NAVIGATE_LIBRARY),
+ ofType(LibraryActionTypes.Navigate),
map(action => {
const libraryId = action.payload;
if (libraryId) {
@@ -125,10 +121,10 @@ export class LibraryEffects {
@Effect({ dispatch: false })
updateLibrary$ = this.actions$.pipe(
- ofType(UPDATE_LIBRARY),
+ ofType(LibraryActionTypes.Update),
map(action => {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.library) {
diff --git a/src/app/store/effects/node.effects.spec.ts b/src/app/store/effects/node.effects.spec.ts
index f5e232523..cab0701c6 100644
--- a/src/app/store/effects/node.effects.spec.ts
+++ b/src/app/store/effects/node.effects.spec.ts
@@ -30,6 +30,7 @@ import { EffectsModule } from '@ngrx/effects';
import { Store } from '@ngrx/store';
import { ContentManagementService } from '../../services/content-management.service';
import {
+ SharedStoreModule,
ShareNodeAction,
SetSelectedNodesAction,
UnshareNodesAction,
@@ -44,25 +45,34 @@ import {
ManagePermissionsAction,
UnlockWriteAction,
FullscreenViewerAction,
- PrintFileAction
-} from '../actions/node.actions';
-import { SetCurrentFolderAction } from '../actions/app.actions';
+ PrintFileAction,
+ SetCurrentFolderAction
+} from '@alfresco/aca-shared/store';
+import { ViewUtilService } from '@alfresco/adf-core';
+import { ViewerEffects } from './viewer.effects';
describe('NodeEffects', () => {
let store: Store;
- // let actions$: Actions;
let contentService: ContentManagementService;
+ let viewUtilService: ViewUtilService;
+ let viewerEffects: ViewerEffects;
beforeEach(() => {
TestBed.configureTestingModule({
- imports: [AppTestingModule, EffectsModule.forRoot([NodeEffects])],
+ imports: [
+ AppTestingModule,
+ SharedStoreModule,
+ EffectsModule.forRoot([NodeEffects, ViewerEffects])
+ ],
declarations: [],
- providers: []
+ providers: [ViewUtilService]
});
// actions$ = TestBed.get(Actions);
store = TestBed.get(Store);
contentService = TestBed.get(ContentManagementService);
+ viewUtilService = TestBed.get(ViewUtilService);
+ viewerEffects = TestBed.get(ViewerEffects);
});
describe('shareNode$', () => {
@@ -403,17 +413,28 @@ describe('NodeEffects', () => {
describe('printFile$', () => {
it('it should print node content from payload', () => {
- spyOn(contentService, 'printFile').and.stub();
- const node: any = { entry: { id: 'node-id' } };
+ spyOn(viewUtilService, 'printFileGeneric').and.stub();
+ const node: any = {
+ entry: { id: 'node-id', content: { mimeType: 'text/json' } }
+ };
store.dispatch(new PrintFileAction(node));
- expect(contentService.printFile).toHaveBeenCalledWith(node);
+ expect(viewUtilService.printFileGeneric).toHaveBeenCalledWith(
+ 'node-id',
+ 'text/json'
+ );
});
it('it should print node content from store', fakeAsync(() => {
- spyOn(contentService, 'printFile').and.stub();
- const node: any = { entry: { isFile: true, id: 'node-id' } };
+ spyOn(viewUtilService, 'printFileGeneric').and.stub();
+ const node: any = {
+ entry: {
+ isFile: true,
+ id: 'node-id',
+ content: { mimeType: 'text/json' }
+ }
+ };
store.dispatch(new SetSelectedNodesAction([node]));
@@ -421,17 +442,20 @@ describe('NodeEffects', () => {
store.dispatch(new PrintFileAction(null));
- expect(contentService.printFile).toHaveBeenCalledWith(node);
+ expect(viewUtilService.printFileGeneric).toHaveBeenCalledWith(
+ 'node-id',
+ 'text/json'
+ );
}));
});
describe('fullscreenViewer$', () => {
it('should call fullscreen viewer', () => {
- spyOn(contentService, 'fullscreenViewer').and.stub();
+ spyOn(viewerEffects, 'enterFullScreen').and.stub();
store.dispatch(new FullscreenViewerAction(null));
- expect(contentService.fullscreenViewer).toHaveBeenCalled();
+ expect(viewerEffects.enterFullScreen).toHaveBeenCalled();
});
});
diff --git a/src/app/store/effects/node.effects.ts b/src/app/store/effects/node.effects.ts
index 3128edfea..dd90baf39 100644
--- a/src/app/store/effects/node.effects.ts
+++ b/src/app/store/effects/node.effects.ts
@@ -27,61 +27,47 @@ import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core';
import { map, take } from 'rxjs/operators';
import { Store } from '@ngrx/store';
-import { AppStore } from '../states/app.state';
import {
+ AppStore,
+ NodeActionTypes,
PurgeDeletedNodesAction,
- PURGE_DELETED_NODES,
DeleteNodesAction,
- DELETE_NODES,
UndoDeleteNodesAction,
- UNDO_DELETE_NODES,
CreateFolderAction,
- CREATE_FOLDER,
EditFolderAction,
- EDIT_FOLDER,
RestoreDeletedNodesAction,
- RESTORE_DELETED_NODES,
ShareNodeAction,
- SHARE_NODE,
ManageVersionsAction,
- MANAGE_VERSIONS,
UnlockWriteAction,
- UNLOCK_WRITE
-} from '../actions';
-import { ContentManagementService } from '../../services/content-management.service';
-import { currentFolder, appSelection } from '../selectors/app.selectors';
-import {
UnshareNodesAction,
- UNSHARE_NODES,
CopyNodesAction,
- COPY_NODES,
MoveNodesAction,
- MOVE_NODES,
ManagePermissionsAction,
- MANAGE_PERMISSIONS,
- PRINT_FILE,
PrintFileAction,
- FULLSCREEN_VIEWER,
- FullscreenViewerAction
-} from '../actions/node.actions';
+ getCurrentFolder,
+ getAppSelection
+} from '@alfresco/aca-shared/store';
+import { ContentManagementService } from '../../services/content-management.service';
+import { ViewUtilService } from '@alfresco/adf-core';
@Injectable()
export class NodeEffects {
constructor(
private store: Store,
private actions$: Actions,
- private contentService: ContentManagementService
+ private contentService: ContentManagementService,
+ private viewUtils: ViewUtilService
) {}
@Effect({ dispatch: false })
shareNode$ = this.actions$.pipe(
- ofType(SHARE_NODE),
+ ofType(NodeActionTypes.Share),
map(action => {
if (action.payload) {
this.contentService.shareNode(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.file) {
@@ -94,13 +80,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
unshareNodes$ = this.actions$.pipe(
- ofType(UNSHARE_NODES),
+ ofType(NodeActionTypes.Unshare),
map(action => {
if (action && action.payload && action.payload.length > 0) {
this.contentService.unshareNodes(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && !selection.isEmpty) {
@@ -113,13 +99,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
purgeDeletedNodes$ = this.actions$.pipe(
- ofType(PURGE_DELETED_NODES),
+ ofType(NodeActionTypes.PurgeDeleted),
map(action => {
if (action && action.payload && action.payload.length > 0) {
this.contentService.purgeDeletedNodes(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.count > 0) {
@@ -132,13 +118,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
restoreDeletedNodes$ = this.actions$.pipe(
- ofType(RESTORE_DELETED_NODES),
+ ofType(NodeActionTypes.RestoreDeleted),
map(action => {
if (action && action.payload && action.payload.length > 0) {
this.contentService.restoreDeletedNodes(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.count > 0) {
@@ -151,13 +137,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
deleteNodes$ = this.actions$.pipe(
- ofType(DELETE_NODES),
+ ofType(NodeActionTypes.Delete),
map(action => {
if (action && action.payload && action.payload.length > 0) {
this.contentService.deleteNodes(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.count > 0) {
@@ -170,7 +156,7 @@ export class NodeEffects {
@Effect({ dispatch: false })
undoDeleteNodes$ = this.actions$.pipe(
- ofType(UNDO_DELETE_NODES),
+ ofType(NodeActionTypes.UndoDelete),
map(action => {
if (action.payload.length > 0) {
this.contentService.undoDeleteNodes(action.payload);
@@ -180,13 +166,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
createFolder$ = this.actions$.pipe(
- ofType(CREATE_FOLDER),
+ ofType(NodeActionTypes.CreateFolder),
map(action => {
if (action.payload) {
this.contentService.createFolder(action.payload);
} else {
this.store
- .select(currentFolder)
+ .select(getCurrentFolder)
.pipe(take(1))
.subscribe(node => {
if (node && node.id) {
@@ -199,13 +185,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
editFolder$ = this.actions$.pipe(
- ofType(EDIT_FOLDER),
+ ofType(NodeActionTypes.EditFolder),
map(action => {
if (action.payload) {
this.contentService.editFolder(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.folder) {
@@ -218,13 +204,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
copyNodes$ = this.actions$.pipe(
- ofType(COPY_NODES),
+ ofType(NodeActionTypes.Copy),
map(action => {
if (action.payload && action.payload.length > 0) {
this.contentService.copyNodes(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && !selection.isEmpty) {
@@ -237,13 +223,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
moveNodes$ = this.actions$.pipe(
- ofType(MOVE_NODES),
+ ofType(NodeActionTypes.Move),
map(action => {
if (action.payload && action.payload.length > 0) {
this.contentService.moveNodes(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && !selection.isEmpty) {
@@ -256,13 +242,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
managePermissions$ = this.actions$.pipe(
- ofType(MANAGE_PERMISSIONS),
+ ofType(NodeActionTypes.ManagePermissions),
map(action => {
if (action && action.payload) {
this.contentService.managePermissions(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && !selection.isEmpty) {
@@ -275,13 +261,13 @@ export class NodeEffects {
@Effect({ dispatch: false })
manageVersions$ = this.actions$.pipe(
- ofType(MANAGE_VERSIONS),
+ ofType(NodeActionTypes.ManageVersions),
map(action => {
if (action && action.payload) {
this.contentService.manageVersions(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.file) {
@@ -294,40 +280,32 @@ export class NodeEffects {
@Effect({ dispatch: false })
printFile$ = this.actions$.pipe(
- ofType(PRINT_FILE),
+ ofType(NodeActionTypes.PrintFile),
map(action => {
if (action && action.payload) {
- this.contentService.printFile(action.payload);
+ this.printFile(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.file) {
- this.contentService.printFile(selection.file);
+ this.printFile(selection.file);
}
});
}
})
);
- @Effect({ dispatch: false })
- fullscreenViewer$ = this.actions$.pipe(
- ofType(FULLSCREEN_VIEWER),
- map(() => {
- this.contentService.fullscreenViewer();
- })
- );
-
@Effect({ dispatch: false })
unlockWrite$ = this.actions$.pipe(
- ofType(UNLOCK_WRITE),
+ ofType(NodeActionTypes.UnlockForWriting),
map(action => {
if (action && action.payload) {
this.contentService.unlockNode(action.payload);
} else {
this.store
- .select(appSelection)
+ .select(getAppSelection)
.pipe(take(1))
.subscribe(selection => {
if (selection && selection.file) {
@@ -337,4 +315,16 @@ export class NodeEffects {
}
})
);
+
+ printFile(node: any) {
+ if (node && node.entry) {
+ // shared and favorite
+ const id = node.entry.nodeId || node.entry.guid || node.entry.id;
+ const mimeType = node.entry.content.mimeType;
+
+ if (id) {
+ this.viewUtils.printFileGeneric(id, mimeType);
+ }
+ }
+ }
}
diff --git a/src/app/store/effects/search.effects.spec.ts b/src/app/store/effects/search.effects.spec.ts
index 08eacc76b..4667cf0bd 100644
--- a/src/app/store/effects/search.effects.spec.ts
+++ b/src/app/store/effects/search.effects.spec.ts
@@ -28,9 +28,11 @@ import { AppTestingModule } from '../../testing/app-testing.module';
import { SearchEffects } from './search.effects';
import { EffectsModule } from '@ngrx/effects';
import { Store } from '@ngrx/store';
-import { SearchByTermAction } from '../actions/search.actions';
import { Router } from '@angular/router';
-import { SearchOptionIds } from '../models/searchOption.model';
+import {
+ SearchOptionIds,
+ SearchByTermAction
+} from '@alfresco/aca-shared/store';
describe('SearchEffects', () => {
let store: Store;
diff --git a/src/app/store/effects/search.effects.ts b/src/app/store/effects/search.effects.ts
index a6037ae11..477f73eeb 100644
--- a/src/app/store/effects/search.effects.ts
+++ b/src/app/store/effects/search.effects.ts
@@ -26,9 +26,12 @@
import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core';
import { map } from 'rxjs/operators';
-import { SEARCH_BY_TERM, SearchByTermAction } from '../actions/search.actions';
+import {
+ SearchActionTypes,
+ SearchByTermAction,
+ SearchOptionIds
+} from '@alfresco/aca-shared/store';
import { Router } from '@angular/router';
-import { SearchOptionIds } from '../models/searchOption.model';
@Injectable()
export class SearchEffects {
@@ -36,7 +39,7 @@ export class SearchEffects {
@Effect({ dispatch: false })
searchByTerm$ = this.actions$.pipe(
- ofType(SEARCH_BY_TERM),
+ ofType(SearchActionTypes.SearchByTerm),
map(action => {
const query = action.payload
.replace(/[(]/g, '%28')
diff --git a/src/app/store/effects/upload.effects.spec.ts b/src/app/store/effects/upload.effects.spec.ts
index a5d094b73..8a4992f9e 100644
--- a/src/app/store/effects/upload.effects.spec.ts
+++ b/src/app/store/effects/upload.effects.spec.ts
@@ -34,7 +34,7 @@ import {
FileUploadCompleteEvent,
FileModel
} from '@alfresco/adf-core';
-import { UnlockWriteAction } from '../actions';
+import { UnlockWriteAction } from '@alfresco/aca-shared/store';
describe('UploadEffects', () => {
let store: Store;
diff --git a/src/app/store/effects/upload.effects.ts b/src/app/store/effects/upload.effects.ts
index 4b8d5b600..e53e8a471 100644
--- a/src/app/store/effects/upload.effects.ts
+++ b/src/app/store/effects/upload.effects.ts
@@ -23,33 +23,31 @@
* along with Alfresco. If not, see .
*/
-import { Injectable, RendererFactory2, NgZone } from '@angular/core';
+import {
+ AppStore,
+ SnackbarErrorAction,
+ UnlockWriteAction,
+ UploadActionTypes,
+ UploadFilesAction,
+ UploadFileVersionAction,
+ UploadFolderAction,
+ getCurrentFolder
+} from '@alfresco/aca-shared/store';
+import { FileModel, FileUtils, UploadService } from '@alfresco/adf-core';
+import { Injectable, NgZone, RendererFactory2 } from '@angular/core';
import { Actions, Effect, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store';
-import { AppStore } from '../states';
+import { forkJoin, fromEvent, of } from 'rxjs';
import {
- UploadFilesAction,
- UPLOAD_FILES,
- UploadFolderAction,
- UPLOAD_FOLDER,
- UPLOAD_FILE_VERSION,
- UploadFileVersionAction,
- SnackbarErrorAction,
- UnlockWriteAction
-} from '../actions';
-import {
- map,
- take,
- flatMap,
- distinctUntilChanged,
catchError,
+ distinctUntilChanged,
+ filter,
+ flatMap,
+ map,
switchMap,
- tap,
- filter
+ take,
+ tap
} from 'rxjs/operators';
-import { FileUtils, FileModel, UploadService } from '@alfresco/adf-core';
-import { currentFolder } from '../selectors/app.selectors';
-import { fromEvent, of, forkJoin } from 'rxjs';
import { ContentManagementService } from '../../services/content-management.service';
@Injectable()
@@ -95,7 +93,7 @@ export class UploadEffects {
@Effect({ dispatch: false })
uploadFiles$ = this.actions$.pipe(
- ofType(UPLOAD_FILES),
+ ofType(UploadActionTypes.UploadFiles),
map(() => {
this.fileInput.click();
})
@@ -103,7 +101,7 @@ export class UploadEffects {
@Effect({ dispatch: false })
uploadFolder$ = this.actions$.pipe(
- ofType(UPLOAD_FOLDER),
+ ofType(UploadActionTypes.UploadFolder),
map(() => {
this.folderInput.click();
})
@@ -111,7 +109,7 @@ export class UploadEffects {
@Effect({ dispatch: false })
uploadVersion$ = this.actions$.pipe(
- ofType(UPLOAD_FILE_VERSION),
+ ofType(UploadActionTypes.UploadFileVersion),
switchMap(() => {
this.fileVersionInput.click();
return fromEvent(this.fileVersionInput, 'change').pipe(
@@ -155,7 +153,7 @@ export class UploadEffects {
private upload(event: any): void {
this.store
- .select(currentFolder)
+ .select(getCurrentFolder)
.pipe(take(1))
.subscribe(node => {
if (node && node.id) {
diff --git a/src/app/store/effects/viewer.effects.ts b/src/app/store/effects/viewer.effects.ts
index fc7be8f10..31ccc90cc 100644
--- a/src/app/store/effects/viewer.effects.ts
+++ b/src/app/store/effects/viewer.effects.ts
@@ -26,16 +26,21 @@
import { Effect, Actions, ofType } from '@ngrx/effects';
import { Injectable } from '@angular/core';
import { map, take } from 'rxjs/operators';
-import { VIEW_FILE, ViewFileAction } from '../actions';
+import {
+ AppStore,
+ ViewerActionTypes,
+ ViewFileAction,
+ ViewNodeAction,
+ getCurrentFolder,
+ getAppSelection,
+ FullscreenViewerAction
+} from '@alfresco/aca-shared/store';
import { Router } from '@angular/router';
import { Store, createSelector } from '@ngrx/store';
-import { AppStore } from '../states';
-import { appSelection, currentFolder } from '../selectors/app.selectors';
-import { ViewNodeAction, VIEW_NODE } from '../actions/viewer.actions';
export const fileToPreview = createSelector(
- appSelection,
- currentFolder,
+ getAppSelection,
+ getCurrentFolder,
(selection, folder) => {
return {
selection,
@@ -52,9 +57,17 @@ export class ViewerEffects {
private router: Router
) {}
+ @Effect({ dispatch: false })
+ fullscreenViewer$ = this.actions$.pipe(
+ ofType(ViewerActionTypes.FullScreen),
+ map(() => {
+ this.enterFullScreen();
+ })
+ );
+
@Effect({ dispatch: false })
viewNode$ = this.actions$.pipe(
- ofType(VIEW_NODE),
+ ofType(ViewerActionTypes.ViewNode),
map(action => {
if (action.location) {
this.router.navigate(
@@ -76,7 +89,7 @@ export class ViewerEffects {
@Effect({ dispatch: false })
viewFile$ = this.actions$.pipe(
- ofType(VIEW_FILE),
+ ofType(ViewerActionTypes.ViewFile),
map(action => {
if (action.payload && action.payload.entry) {
const { id, nodeId, isFile } = action.payload.entry;
@@ -123,4 +136,23 @@ export class ViewerEffects {
path.push('preview', nodeId);
this.router.navigateByUrl(path.join('/'));
}
+
+ enterFullScreen() {
+ const container = (
+ document.documentElement.querySelector(
+ '.adf-viewer__fullscreen-container'
+ )
+ );
+ if (container) {
+ if (container.requestFullscreen) {
+ container.requestFullscreen();
+ } else if (container.webkitRequestFullscreen) {
+ container.webkitRequestFullscreen();
+ } else if (container.mozRequestFullScreen) {
+ container.mozRequestFullScreen();
+ } else if (container.msRequestFullscreen) {
+ container.msRequestFullscreen();
+ }
+ }
+ }
}
diff --git a/src/app/store/states/app.state.ts b/src/app/store/initial-state.ts
similarity index 74%
rename from src/app/store/states/app.state.ts
rename to src/app/store/initial-state.ts
index f1356549d..7af49305d 100644
--- a/src/app/store/states/app.state.ts
+++ b/src/app/store/initial-state.ts
@@ -23,30 +23,10 @@
* along with Alfresco. If not, see .
*/
-import {
- SelectionState,
- ProfileState,
- NavigationState
-} from '@alfresco/adf-extensions';
-import { RepositoryInfo } from '@alfresco/js-api';
-
-export interface AppState {
- appName: string;
- headerColor: string;
- logoPath: string;
- languagePicker: boolean;
- sharedUrl: string;
- selection: SelectionState;
- user: ProfileState;
- navigation: NavigationState;
- infoDrawerOpened: boolean;
- showFacetFilter: boolean;
- documentDisplayMode: string;
- repository: RepositoryInfo;
-}
+import { AppState, AppStore } from '@alfresco/aca-shared/store';
export const INITIAL_APP_STATE: AppState = {
- appName: 'Alfresco Example Content Application',
+ appName: 'Alfresco Content Application',
headerColor: '#2196F3',
logoPath: 'assets/images/alfresco-logo-white.svg',
languagePicker: false,
@@ -76,10 +56,6 @@ export const INITIAL_APP_STATE: AppState = {
}
};
-export interface AppStore {
- app: AppState;
-}
-
export const INITIAL_STATE: AppStore = {
app: INITIAL_APP_STATE
};
diff --git a/src/app/store/models.ts b/src/app/store/models.ts
deleted file mode 100644
index 9aea5f541..000000000
--- a/src/app/store/models.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*!
- * @license
- * Alfresco Example Content Application
- *
- * Copyright (C) 2005 - 2019 Alfresco Software Limited
- *
- * This file is part of the Alfresco Example Content Application.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * The Alfresco Example Content Application is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * The Alfresco Example Content Application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- */
-
-export * from './models/delete-status.model';
-export * from './models/deleted-node-info.model';
-export * from './models/node-info.model';
diff --git a/src/app/store/reducers/app.reducer.ts b/src/app/store/reducers/app.reducer.ts
index 4f376f50c..04dd55465 100644
--- a/src/app/store/reducers/app.reducer.ts
+++ b/src/app/store/reducers/app.reducer.ts
@@ -24,30 +24,21 @@
*/
import { Action } from '@ngrx/store';
-import { AppState, INITIAL_APP_STATE } from '../states/app.state';
import {
- SET_SELECTED_NODES,
- SetSelectedNodesAction,
- SET_USER_PROFILE,
+ AppState,
+ AppActionTypes,
+ NodeActionTypes,
+ SearchActionTypes,
SetUserProfileAction,
- SET_REPOSITORY_INFO,
- SetRepositoryInfoAction,
- SET_LANGUAGE_PICKER,
SetLanguagePickerAction,
- SET_CURRENT_FOLDER,
SetCurrentFolderAction,
- SET_CURRENT_URL,
SetCurrentUrlAction,
- SET_INFO_DRAWER_STATE,
- SetInfoDrawerStateAction,
- TOGGLE_INFO_DRAWER,
- TOGGLE_DOCUMENT_DISPLAY_MODE,
- SET_INITIAL_STATE,
SetInitialStateAction,
- TOGGLE_SEARCH_FILTER,
- SHOW_SEARCH_FILTER,
- HIDE_SEARCH_FILTER
-} from '../actions';
+ SetSelectedNodesAction,
+ SetRepositoryInfoAction,
+ SetInfoDrawerStateAction
+} from '@alfresco/aca-shared/store';
+import { INITIAL_APP_STATE } from '../initial-state';
export function appReducer(
state: AppState = INITIAL_APP_STATE,
@@ -56,43 +47,43 @@ export function appReducer(
let newState: AppState;
switch (action.type) {
- case SET_INITIAL_STATE:
+ case AppActionTypes.SetInitialState:
newState = Object.assign({}, (action).payload);
break;
- case SET_SELECTED_NODES:
+ case NodeActionTypes.SetSelection:
newState = updateSelectedNodes(state, action);
break;
- case SET_USER_PROFILE:
+ case AppActionTypes.SetUserProfile:
newState = updateUser(state, action);
break;
- case SET_LANGUAGE_PICKER:
+ case AppActionTypes.SetLanguagePicker:
newState = updateLanguagePicker(state, action);
break;
- case SET_CURRENT_FOLDER:
+ case AppActionTypes.SetCurrentFolder:
newState = updateCurrentFolder(state, action);
break;
- case SET_CURRENT_URL:
+ case AppActionTypes.SetCurrentUrl:
newState = updateCurrentUrl(state, action);
break;
- case TOGGLE_INFO_DRAWER:
+ case AppActionTypes.ToggleInfoDrawer:
newState = toggleInfoDrawer(state);
break;
- case SET_INFO_DRAWER_STATE:
+ case AppActionTypes.SetInfoDrawerState:
newState = setInfoDrawer(state, action);
break;
- case TOGGLE_DOCUMENT_DISPLAY_MODE:
+ case AppActionTypes.ToggleDocumentDisplayMode:
newState = toggleDocumentDisplayMode(state);
break;
- case SET_REPOSITORY_INFO:
+ case AppActionTypes.SetRepositoryInfo:
newState = updateRepositoryStatus(state, action);
break;
- case TOGGLE_SEARCH_FILTER:
+ case SearchActionTypes.ToggleFilter:
newState = toggleSearchFilter(state);
break;
- case SHOW_SEARCH_FILTER:
+ case SearchActionTypes.ShowFilter:
newState = showSearchFilter(state);
break;
- case HIDE_SEARCH_FILTER:
+ case SearchActionTypes.HideFilter:
newState = hideSearchFilter(state);
break;
default:
diff --git a/src/app/testing/app-testing.module.ts b/src/app/testing/app-testing.module.ts
index d13f2767f..3e8bf6b0f 100644
--- a/src/app/testing/app-testing.module.ts
+++ b/src/app/testing/app-testing.module.ts
@@ -48,7 +48,6 @@ import { HttpClientModule } from '@angular/common/http';
import { TranslateServiceMock } from './translation.service';
import { StoreModule } from '@ngrx/store';
import { appReducer } from '../store/reducers/app.reducer';
-import { INITIAL_STATE } from '../store/states/app.state';
import { RouterTestingModule } from '@angular/router/testing';
import { EffectsModule } from '@ngrx/effects';
import {
@@ -56,6 +55,7 @@ import {
DocumentListService
} from '@alfresco/adf-content-services';
import { MaterialModule } from '../material.module';
+import { INITIAL_STATE } from '../store/initial-state';
@NgModule({
imports: [
diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss
index 097475f51..e970dd835 100644
--- a/src/app/ui/custom-theme.scss
+++ b/src/app/ui/custom-theme.scss
@@ -3,7 +3,6 @@
@import '../components/sidenav/sidenav.component.theme';
@import '../components/about/about.component.theme';
-@import '../components/common/generic-error/generic-error.component.theme';
@import '../components/search/search-input/search-input.component.theme';
@import '../components/settings/settings.component.theme';
@import '../components/current-user/current-user.component.theme';
@@ -60,6 +59,7 @@ $custom-theme-accent: mat-palette($alfresco-accent-orange);
$custom-theme-warn: mat-palette($alfresco-warn);
$custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent);
$foreground: map-get($custom-theme, foreground);
+$warn: map-get($custom-theme, warn);
@mixin custom-theme($theme) {
@include custom-adf-toolbar-theme($theme);
@@ -67,7 +67,6 @@ $foreground: map-get($custom-theme, foreground);
@include layout-theme($theme);
@include aca-search-input-theme($theme);
- @include aca-generic-error-theme($theme);
@include app-permission-manager-theme($theme);
@include aca-node-versions-dialog-theme($theme);
@include aca-settings-theme($theme);
@@ -96,3 +95,18 @@ $adf-upload-dragging-border: 1px solid #00bcd4;
$adf-upload-dragging-background: #e0f7fa;
$adf-upload-dragging-level1-color: unset;
$adf-upload-dragging-level1-border: none;
+
+$defaults: (
+ --theme-warn-color: mat-color($warn),
+ --theme-text-color: mat-color($foreground, text, 0.54),
+ --theme-title-color: mat-color($foreground, text, 0.87),
+ --theme-text-disabled-color: mat-color($foreground, text, 0.38),
+ --theme-border-color: mat-color($foreground, text, 0.07)
+);
+
+// defaults
+:root {
+ @each $name, $value in $defaults {
+ #{$name}: #{$value};
+ }
+}
diff --git a/tsconfig.json b/tsconfig.json
index b6dad6889..a0b9424f8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,9 @@
],
"@alfresco/adf-office-services-ext/*": [
"dist/@alfresco/adf-office-services-ext/*"
- ]
+ ],
+ "@alfresco/aca-shared": ["dist/@alfresco/aca-shared"],
+ "@alfresco/aca-shared/*": ["dist/@alfresco/aca-shared/*"]
},
"resolveJsonModule": true
},