diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 79285a631..6c53b95a4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -52,22 +52,22 @@ import { SidenavComponent } from './components/sidenav/sidenav.component'; import { AboutComponent } from './components/about/about.component'; import { LocationLinkComponent } from './components/location-link/location-link.component'; import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component'; -import { NodeCopyDirective } from './common/directives/node-copy.directive'; -import { NodeDeleteDirective } from './common/directives/node-delete.directive'; -import { NodeMoveDirective } from './common/directives/node-move.directive'; -import { NodeRestoreDirective } from './common/directives/node-restore.directive'; -import { NodePermanentDeleteDirective } from './common/directives/node-permanent-delete.directive'; -import { NodeUnshareDirective } from './common/directives/node-unshare.directive'; -import { NodeVersionsDirective } from './common/directives/node-versions.directive'; +import { NodeCopyDirective } from './directives/node-copy.directive'; +import { NodeDeleteDirective } from './directives/node-delete.directive'; +import { NodeMoveDirective } from './directives/node-move.directive'; +import { NodeRestoreDirective } from './directives/node-restore.directive'; +import { NodePermanentDeleteDirective } from './directives/node-permanent-delete.directive'; +import { NodeUnshareDirective } from './directives/node-unshare.directive'; +import { NodeVersionsDirective } from './directives/node-versions.directive'; import { NodeVersionsDialogComponent } from './dialogs/node-versions/node-versions.dialog'; import { LibraryDialogComponent } from './dialogs/library/library.dialog'; -import { ContentManagementService } from './common/services/content-management.service'; -import { NodeActionsService } from './common/services/node-actions.service'; -import { NodePermissionService } from './common/services/node-permission.service'; +import { ContentManagementService } from './services/content-management.service'; +import { NodeActionsService } from './services/node-actions.service'; +import { NodePermissionService } from './services/node-permission.service'; import { SearchResultsComponent } from './components/search/search-results/search-results.component'; import { SettingsComponent } from './components/settings/settings.component'; -import { ProfileResolver } from './common/services/profile.resolver'; -import { ExperimentalGuard } from './common/services/experimental-guard.service'; +import { ProfileResolver } from './services/profile.resolver'; +import { ExperimentalGuard } from './services/experimental-guard.service'; import { InfoDrawerComponent } from './components/info-drawer/info-drawer.component'; import { EditFolderDirective } from './directives/edit-folder.directive'; @@ -81,7 +81,7 @@ import { ExtensionsModule } from './extensions.module'; import { CoreExtensionsModule } from './extensions/core.extensions.module'; import { SearchResultsRowComponent } from './components/search/search-results-row/search-results-row.component'; import { NodePermissionsDialogComponent } from './dialogs/node-permissions/node-permissions.dialog'; -import { NodePermissionsDirective } from './common/directives/node-permissions.directive'; +import { NodePermissionsDirective } from './directives/node-permissions.directive'; import { PermissionsManagerComponent } from './components/permission-manager/permissions-manager.component'; @NgModule({ diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 8a4a42a69..c7725a5bb 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -43,8 +43,8 @@ import { GenericErrorComponent } from './components/generic-error/generic-error. import { SearchResultsComponent } from './components/search/search-results/search-results.component'; import { SettingsComponent } from './components/settings/settings.component'; -import { ProfileResolver } from './common/services/profile.resolver'; -import { ExperimentalGuard } from './common/services/experimental-guard.service'; +import { ProfileResolver } from './services/profile.resolver'; +import { ExperimentalGuard } from './services/experimental-guard.service'; export const APP_ROUTES: Routes = [ { diff --git a/src/app/components/favorites/favorites.component.spec.ts b/src/app/components/favorites/favorites.component.spec.ts index 67076d2cd..77f5b02d2 100644 --- a/src/app/components/favorites/favorites.component.spec.ts +++ b/src/app/components/favorites/favorites.component.spec.ts @@ -33,7 +33,7 @@ import { NodeFavoriteDirective, DataTableComponent, AppConfigPipe } from '@alfresco/adf-core'; import { DocumentListComponent } from '@alfresco/adf-content-services'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { FavoritesComponent } from './favorites.component'; import { AppTestingModule } from '../../testing/app-testing.module'; diff --git a/src/app/components/favorites/favorites.component.ts b/src/app/components/favorites/favorites.component.ts index 363134143..da332aa3f 100644 --- a/src/app/components/favorites/favorites.component.ts +++ b/src/app/components/favorites/favorites.component.ts @@ -32,7 +32,7 @@ import { PathElementEntity, PathInfo } from 'alfresco-js-api'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { AppStore } from '../../store/states/app.state'; import { PageComponent } from '../page.component'; import { ContentApiService } from '../../services/content-api.service'; diff --git a/src/app/components/files/files.component.spec.ts b/src/app/components/files/files.component.spec.ts index 678321691..a8f706818 100644 --- a/src/app/components/files/files.component.spec.ts +++ b/src/app/components/files/files.component.spec.ts @@ -32,8 +32,8 @@ import { DataTableComponent, UploadService, AppConfigPipe } from '@alfresco/adf-core'; import { DocumentListComponent } from '@alfresco/adf-content-services'; -import { ContentManagementService } from '../../common/services/content-management.service'; -import { NodeActionsService } from '../../common/services/node-actions.service'; +import { ContentManagementService } from '../../services/content-management.service'; +import { NodeActionsService } from '../../services/node-actions.service'; import { FilesComponent } from './files.component'; import { AppTestingModule } from '../../testing/app-testing.module'; import { ContentApiService } from '../../services/content-api.service'; diff --git a/src/app/components/files/files.component.ts b/src/app/components/files/files.component.ts index 4e98f104b..22efb389a 100644 --- a/src/app/components/files/files.component.ts +++ b/src/app/components/files/files.component.ts @@ -29,8 +29,8 @@ import { ActivatedRoute, Params, Router } from '@angular/router'; import { Store } from '@ngrx/store'; import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging, PathElement, PathElementEntity } from 'alfresco-js-api'; import { Observable } from 'rxjs/Rx'; -import { ContentManagementService } from '../../common/services/content-management.service'; -import { NodeActionsService } from '../../common/services/node-actions.service'; +import { ContentManagementService } from '../../services/content-management.service'; +import { NodeActionsService } from '../../services/node-actions.service'; import { AppStore } from '../../store/states/app.state'; import { PageComponent } from '../page.component'; import { ContentApiService } from '../../services/content-api.service'; diff --git a/src/app/components/info-drawer/info-drawer.component.ts b/src/app/components/info-drawer/info-drawer.component.ts index 116e1ca93..4f50919e7 100644 --- a/src/app/components/info-drawer/info-drawer.component.ts +++ b/src/app/components/info-drawer/info-drawer.component.ts @@ -25,7 +25,7 @@ import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; -import { NodePermissionService } from '../../common/services/node-permission.service'; +import { NodePermissionService } from '../../services/node-permission.service'; import { ContentApiService } from '../../services/content-api.service'; @Component({ diff --git a/src/app/components/layout/layout.component.ts b/src/app/components/layout/layout.component.ts index 3681d095f..6ee3e68ec 100644 --- a/src/app/components/layout/layout.component.ts +++ b/src/app/components/layout/layout.component.ts @@ -26,7 +26,7 @@ import { Component, OnInit, OnDestroy, ViewChild, ViewEncapsulation } from '@angular/core'; import { Observable, Subject } from 'rxjs/Rx'; import { MinimalNodeEntryEntity } from 'alfresco-js-api'; -import { NodePermissionService } from '../../common/services/node-permission.service'; +import { NodePermissionService } from '../../services/node-permission.service'; import { SidenavViewsManagerDirective } from './sidenav-views-manager.directive'; import { Store } from '@ngrx/store'; import { AppStore } from '../../store/states'; diff --git a/src/app/components/libraries/libraries.component.ts b/src/app/components/libraries/libraries.component.ts index 0aec56010..841b1e393 100644 --- a/src/app/components/libraries/libraries.component.ts +++ b/src/app/components/libraries/libraries.component.ts @@ -32,7 +32,7 @@ import { Store } from '@ngrx/store'; import { AppStore } from '../../store/states/app.state'; import { DeleteLibraryAction, CreateLibraryAction } from '../../store/actions'; import { SiteEntry } from 'alfresco-js-api'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { ContentApiService } from '../../services/content-api.service'; import { ExtensionService } from '../../extensions/extension.service'; diff --git a/src/app/components/page.component.ts b/src/app/components/page.component.ts index 95c3dd909..c70c169d6 100644 --- a/src/app/components/page.component.ts +++ b/src/app/components/page.component.ts @@ -37,7 +37,7 @@ import { SelectionState } from '../store/states/selection.state'; import { Observable } from 'rxjs/Rx'; import { ExtensionService } from '../extensions/extension.service'; import { ContentActionExtension } from '../extensions/content-action.extension'; -import { ContentManagementService } from '../common/services/content-management.service'; +import { ContentManagementService } from '../services/content-management.service'; export abstract class PageComponent implements OnInit, OnDestroy { diff --git a/src/app/components/preview/preview.component.ts b/src/app/components/preview/preview.component.ts index 6d0816f10..eb3088476 100644 --- a/src/app/components/preview/preview.component.ts +++ b/src/app/components/preview/preview.component.ts @@ -33,7 +33,7 @@ import { PageComponent } from '../page.component'; import { ContentApiService } from '../../services/content-api.service'; import { ExtensionService } from '../../extensions/extension.service'; import { OpenWithExtension } from '../../extensions/open-with.extension'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; @Component({ selector: 'app-preview', templateUrl: 'preview.component.html', diff --git a/src/app/components/recent-files/recent-files.component.spec.ts b/src/app/components/recent-files/recent-files.component.spec.ts index 7313beb40..b359aea59 100644 --- a/src/app/components/recent-files/recent-files.component.spec.ts +++ b/src/app/components/recent-files/recent-files.component.spec.ts @@ -30,7 +30,7 @@ import { TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent, AppConfigPipe } from '@alfresco/adf-core'; import { DocumentListComponent } from '@alfresco/adf-content-services'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { RecentFilesComponent } from './recent-files.component'; import { AppTestingModule } from '../../testing/app-testing.module'; diff --git a/src/app/components/recent-files/recent-files.component.ts b/src/app/components/recent-files/recent-files.component.ts index b4b74dfb3..f1c6af04e 100644 --- a/src/app/components/recent-files/recent-files.component.ts +++ b/src/app/components/recent-files/recent-files.component.ts @@ -25,7 +25,7 @@ import { Component, OnInit } from '@angular/core'; import { MinimalNodeEntity } from 'alfresco-js-api'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { PageComponent } from '../page.component'; import { Store } from '@ngrx/store'; import { AppStore } from '../../store/states/app.state'; 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 7e3044321..af47617e9 100644 --- a/src/app/components/search/search-results/search-results.component.ts +++ b/src/app/components/search/search-results/search-results.component.ts @@ -32,7 +32,7 @@ import { Store } from '@ngrx/store'; import { AppStore } from '../../../store/states/app.state'; import { NavigateToFolder } from '../../../store/actions'; import { ExtensionService } from '../../../extensions/extension.service'; -import { ContentManagementService } from '../../../common/services/content-management.service'; +import { ContentManagementService } from '../../../services/content-management.service'; @Component({ selector: 'aca-search-results', diff --git a/src/app/components/shared-files/shared-files.component.spec.ts b/src/app/components/shared-files/shared-files.component.spec.ts index 690d95db7..d59f6448f 100644 --- a/src/app/components/shared-files/shared-files.component.spec.ts +++ b/src/app/components/shared-files/shared-files.component.spec.ts @@ -30,7 +30,7 @@ import { TimeAgoPipe, NodeNameTooltipPipe, NodeFavoriteDirective, DataTableComponent, AppConfigPipe } from '@alfresco/adf-core'; import { DocumentListComponent } from '@alfresco/adf-content-services'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { SharedFilesComponent } from './shared-files.component'; import { AppTestingModule } from '../../testing/app-testing.module'; import { ExperimentalDirective } from '../../directives/experimental.directive'; diff --git a/src/app/components/shared-files/shared-files.component.ts b/src/app/components/shared-files/shared-files.component.ts index 737fdad9a..1479dccc5 100644 --- a/src/app/components/shared-files/shared-files.component.ts +++ b/src/app/components/shared-files/shared-files.component.ts @@ -24,7 +24,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { PageComponent } from '../page.component'; import { Store } from '@ngrx/store'; import { AppStore } from '../../store/states/app.state'; diff --git a/src/app/components/sidenav/sidenav.component.ts b/src/app/components/sidenav/sidenav.component.ts index 9ecf401c0..fea5fbdc4 100644 --- a/src/app/components/sidenav/sidenav.component.ts +++ b/src/app/components/sidenav/sidenav.component.ts @@ -26,7 +26,7 @@ import { Subject } from 'rxjs/Rx'; import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { Node } from 'alfresco-js-api'; -import { NodePermissionService } from '../../common/services/node-permission.service'; +import { NodePermissionService } from '../../services/node-permission.service'; import { ExtensionService } from '../../extensions/extension.service'; import { NavigationExtension } from '../../extensions/navigation.extension'; import { Store } from '@ngrx/store'; diff --git a/src/app/components/trashcan/trashcan.component.spec.ts b/src/app/components/trashcan/trashcan.component.spec.ts index e7e16dd70..c39dd0e15 100644 --- a/src/app/components/trashcan/trashcan.component.spec.ts +++ b/src/app/components/trashcan/trashcan.component.spec.ts @@ -30,7 +30,7 @@ import { NodeFavoriteDirective, DataTableComponent, AppConfigPipe } from '@alfresco/adf-core'; import { DocumentListComponent } from '@alfresco/adf-content-services'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { TrashcanComponent } from './trashcan.component'; import { AppTestingModule } from '../../testing/app-testing.module'; import { ExperimentalDirective } from '../../directives/experimental.directive'; diff --git a/src/app/components/trashcan/trashcan.component.ts b/src/app/components/trashcan/trashcan.component.ts index 5e80f61a9..fddc50518 100644 --- a/src/app/components/trashcan/trashcan.component.ts +++ b/src/app/components/trashcan/trashcan.component.ts @@ -24,7 +24,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { ContentManagementService } from '../../common/services/content-management.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'; diff --git a/src/app/common/directives/node-copy.directive.spec.ts b/src/app/directives/node-copy.directive.spec.ts similarity index 98% rename from src/app/common/directives/node-copy.directive.spec.ts rename to src/app/directives/node-copy.directive.spec.ts index c95b98546..911c195ce 100644 --- a/src/app/common/directives/node-copy.directive.spec.ts +++ b/src/app/directives/node-copy.directive.spec.ts @@ -30,8 +30,8 @@ import { Observable } from 'rxjs/Rx'; import { MatSnackBar } from '@angular/material'; import { NodeActionsService } from '../services/node-actions.service'; import { NodeCopyDirective } from './node-copy.directive'; -import { AppTestingModule } from '../../testing/app-testing.module'; -import { ContentApiService } from '../../services/content-api.service'; +import { ContentApiService } from '../services/content-api.service'; +import { AppTestingModule } from '../testing/app-testing.module'; @Component({ template: '
' diff --git a/src/app/common/directives/node-copy.directive.ts b/src/app/directives/node-copy.directive.ts similarity index 98% rename from src/app/common/directives/node-copy.directive.ts rename to src/app/directives/node-copy.directive.ts index c483da02d..c8e994190 100644 --- a/src/app/common/directives/node-copy.directive.ts +++ b/src/app/directives/node-copy.directive.ts @@ -31,7 +31,7 @@ import { TranslationService } from '@alfresco/adf-core'; import { MinimalNodeEntity } from 'alfresco-js-api'; import { NodeActionsService } from '../services/node-actions.service'; import { ContentManagementService } from '../services/content-management.service'; -import { ContentApiService } from '../../services/content-api.service'; +import { ContentApiService } from '../services/content-api.service'; @Directive({ selector: '[acaCopyNode]' diff --git a/src/app/common/directives/node-delete.directive.spec.ts b/src/app/directives/node-delete.directive.spec.ts similarity index 97% rename from src/app/common/directives/node-delete.directive.spec.ts rename to src/app/directives/node-delete.directive.spec.ts index a9087766b..8fe99c3d8 100644 --- a/src/app/common/directives/node-delete.directive.spec.ts +++ b/src/app/directives/node-delete.directive.spec.ts @@ -29,14 +29,14 @@ import { Component, DebugElement } from '@angular/core'; import { NodeDeleteDirective } from './node-delete.directive'; import { EffectsModule, Actions, ofType } from '@ngrx/effects'; -import { NodeEffects } from '../../store/effects/node.effects'; +import { NodeEffects } from '../store/effects/node.effects'; import { SnackbarInfoAction, SNACKBAR_INFO, SNACKBAR_ERROR, SnackbarErrorAction, SnackbarWarningAction, SNACKBAR_WARNING -} from '../../store/actions'; +} from '../store/actions'; import { map } from 'rxjs/operators'; -import { AppTestingModule } from '../../testing/app-testing.module'; -import { ContentApiService } from '../../services/content-api.service'; +import { AppTestingModule } from '../testing/app-testing.module'; +import { ContentApiService } from '../services/content-api.service'; import { Observable } from 'rxjs/Rx'; @Component({ diff --git a/src/app/common/directives/node-delete.directive.ts b/src/app/directives/node-delete.directive.ts similarity index 92% rename from src/app/common/directives/node-delete.directive.ts rename to src/app/directives/node-delete.directive.ts index c66cc4562..a5a70a61c 100644 --- a/src/app/common/directives/node-delete.directive.ts +++ b/src/app/directives/node-delete.directive.ts @@ -26,9 +26,9 @@ import { Directive, HostListener, Input } from '@angular/core'; import { MinimalNodeEntity } from 'alfresco-js-api'; import { Store } from '@ngrx/store'; -import { AppStore } from '../../store/states/app.state'; -import { DeleteNodesAction } from '../../store/actions'; -import { NodeInfo } from '../../store/models'; +import { AppStore } from '../store/states/app.state'; +import { DeleteNodesAction } from '../store/actions'; +import { NodeInfo } from '../store/models'; @Directive({ selector: '[acaDeleteNode]' diff --git a/src/app/common/directives/node-move.directive.spec.ts b/src/app/directives/node-move.directive.spec.ts similarity index 98% rename from src/app/common/directives/node-move.directive.spec.ts rename to src/app/directives/node-move.directive.spec.ts index e23209b5a..9d0ae8002 100644 --- a/src/app/common/directives/node-move.directive.spec.ts +++ b/src/app/directives/node-move.directive.spec.ts @@ -32,11 +32,11 @@ import { TranslationService } from '@alfresco/adf-core'; import { NodeActionsService } from '../services/node-actions.service'; import { NodeMoveDirective } from './node-move.directive'; import { EffectsModule, Actions, ofType } from '@ngrx/effects'; -import { NodeEffects } from '../../store/effects/node.effects'; -import { SnackbarErrorAction, SNACKBAR_ERROR } from '../../store/actions'; +import { NodeEffects } from '../store/effects/node.effects'; +import { SnackbarErrorAction, SNACKBAR_ERROR } from '../store/actions'; import { map } from 'rxjs/operators'; -import { AppTestingModule } from '../../testing/app-testing.module'; -import { ContentApiService } from '../../services/content-api.service'; +import { AppTestingModule } from '../testing/app-testing.module'; +import { ContentApiService } from '../services/content-api.service'; @Component({ template: '
' diff --git a/src/app/common/directives/node-move.directive.ts b/src/app/directives/node-move.directive.ts similarity index 97% rename from src/app/common/directives/node-move.directive.ts rename to src/app/directives/node-move.directive.ts index a1b645a47..09aa9105e 100644 --- a/src/app/common/directives/node-move.directive.ts +++ b/src/app/directives/node-move.directive.ts @@ -33,9 +33,9 @@ import { ContentManagementService } from '../services/content-management.service import { NodeActionsService } from '../services/node-actions.service'; import { Observable } from 'rxjs/Rx'; import { Store } from '@ngrx/store'; -import { AppStore } from '../../store/states/app.state'; -import { SnackbarErrorAction } from '../../store/actions'; -import { ContentApiService } from '../../services/content-api.service'; +import { AppStore } from '../store/states/app.state'; +import { SnackbarErrorAction } from '../store/actions'; +import { ContentApiService } from '../services/content-api.service'; @Directive({ selector: '[acaMoveNode]' diff --git a/src/app/common/directives/node-permanent-delete.directive.spec.ts b/src/app/directives/node-permanent-delete.directive.spec.ts similarity index 97% rename from src/app/common/directives/node-permanent-delete.directive.spec.ts rename to src/app/directives/node-permanent-delete.directive.spec.ts index efde1230f..6981144eb 100644 --- a/src/app/common/directives/node-permanent-delete.directive.spec.ts +++ b/src/app/directives/node-permanent-delete.directive.spec.ts @@ -34,11 +34,11 @@ import { Actions, ofType, EffectsModule } from '@ngrx/effects'; import { SNACKBAR_INFO, SnackbarWarningAction, SnackbarInfoAction, SnackbarErrorAction, SNACKBAR_ERROR, SNACKBAR_WARNING -} from '../../store/actions'; +} from '../store/actions'; 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 { NodeEffects } from '../store/effects/node.effects'; +import { AppTestingModule } from '../testing/app-testing.module'; +import { ContentApiService } from '../services/content-api.service'; @Component({ template: `
` diff --git a/src/app/common/directives/node-permanent-delete.directive.ts b/src/app/directives/node-permanent-delete.directive.ts similarity index 94% rename from src/app/common/directives/node-permanent-delete.directive.ts rename to src/app/directives/node-permanent-delete.directive.ts index 90f1e9f40..459f54360 100644 --- a/src/app/common/directives/node-permanent-delete.directive.ts +++ b/src/app/directives/node-permanent-delete.directive.ts @@ -29,9 +29,9 @@ import { MatDialog } from '@angular/material'; import { ConfirmDialogComponent } from '@alfresco/adf-content-services'; import { Store } from '@ngrx/store'; -import { AppStore } from '../../store/states/app.state'; -import { PurgeDeletedNodesAction } from '../../store/actions'; -import { NodeInfo } from '../../store/models'; +import { AppStore } from '../store/states/app.state'; +import { PurgeDeletedNodesAction } from '../store/actions'; +import { NodeInfo } from '../store/models'; @Directive({ selector: '[acaPermanentDelete]' diff --git a/src/app/common/directives/node-permissions.directive.ts b/src/app/directives/node-permissions.directive.ts similarity index 91% rename from src/app/common/directives/node-permissions.directive.ts rename to src/app/directives/node-permissions.directive.ts index 6fe39cbe7..92973e104 100644 --- a/src/app/common/directives/node-permissions.directive.ts +++ b/src/app/directives/node-permissions.directive.ts @@ -27,9 +27,9 @@ import { Directive, HostListener, Input } from '@angular/core'; import { MinimalNodeEntity } from 'alfresco-js-api'; import { MatDialog } from '@angular/material'; import { Store } from '@ngrx/store'; -import { AppStore } from '../../store/states/app.state'; -import { SnackbarErrorAction } from '../../store/actions'; -import { NodePermissionsDialogComponent } from '../../dialogs/node-permissions/node-permissions.dialog'; +import { AppStore } from '../store/states/app.state'; +import { SnackbarErrorAction } from '../store/actions'; +import { NodePermissionsDialogComponent } from '../dialogs/node-permissions/node-permissions.dialog'; @Directive({ selector: '[acaNodePermissions]' diff --git a/src/app/common/directives/node-restore.directive.spec.ts b/src/app/directives/node-restore.directive.spec.ts similarity index 98% rename from src/app/common/directives/node-restore.directive.spec.ts rename to src/app/directives/node-restore.directive.spec.ts index 620c22ec9..2380f8fb7 100644 --- a/src/app/common/directives/node-restore.directive.spec.ts +++ b/src/app/directives/node-restore.directive.spec.ts @@ -31,10 +31,10 @@ import { ContentManagementService } from '../services/content-management.service import { Actions, ofType } from '@ngrx/effects'; import { SnackbarErrorAction, SNACKBAR_ERROR, SnackbarInfoAction, SNACKBAR_INFO, - NavigateRouteAction, NAVIGATE_ROUTE } from '../../store/actions'; + NavigateRouteAction, NAVIGATE_ROUTE } from '../store/actions'; import { map } from 'rxjs/operators'; -import { AppTestingModule } from '../../testing/app-testing.module'; -import { ContentApiService } from '../../services/content-api.service'; +import { AppTestingModule } from '../testing/app-testing.module'; +import { ContentApiService } from '../services/content-api.service'; import { Observable } from 'rxjs/Rx'; @Component({ diff --git a/src/app/common/directives/node-restore.directive.ts b/src/app/directives/node-restore.directive.ts similarity index 97% rename from src/app/common/directives/node-restore.directive.ts rename to src/app/directives/node-restore.directive.ts index ddacb0b28..217920900 100644 --- a/src/app/common/directives/node-restore.directive.ts +++ b/src/app/directives/node-restore.directive.ts @@ -31,18 +31,18 @@ import { PathInfoEntity, DeletedNodesPaging } from 'alfresco-js-api'; -import { DeleteStatus, DeletedNodeInfo } from '../../store/models'; +import { DeleteStatus, DeletedNodeInfo } from '../store/models'; import { ContentManagementService } from '../services/content-management.service'; import { Store } from '@ngrx/store'; -import { AppStore } from '../../store/states/app.state'; +import { AppStore } from '../store/states/app.state'; import { NavigateRouteAction, SnackbarAction, SnackbarErrorAction, SnackbarInfoAction, SnackbarUserAction -} from '../../store/actions'; -import { ContentApiService } from '../../services/content-api.service'; +} from '../store/actions'; +import { ContentApiService } from '../services/content-api.service'; @Directive({ selector: '[acaRestoreNode]' diff --git a/src/app/common/directives/node-unshare.directive.ts b/src/app/directives/node-unshare.directive.ts similarity index 96% rename from src/app/common/directives/node-unshare.directive.ts rename to src/app/directives/node-unshare.directive.ts index 19fdedfa7..2426e393e 100644 --- a/src/app/common/directives/node-unshare.directive.ts +++ b/src/app/directives/node-unshare.directive.ts @@ -26,7 +26,7 @@ import { Directive, HostListener, Input } from '@angular/core'; import { MinimalNodeEntity } from 'alfresco-js-api'; import { ContentManagementService } from '../services/content-management.service'; -import { ContentApiService } from '../../services/content-api.service'; +import { ContentApiService } from '../services/content-api.service'; @Directive({ selector: '[acaUnshareNode]' diff --git a/src/app/common/directives/node-versions.directive.ts b/src/app/directives/node-versions.directive.ts similarity index 90% rename from src/app/common/directives/node-versions.directive.ts rename to src/app/directives/node-versions.directive.ts index 55c862ef2..aceddc086 100644 --- a/src/app/common/directives/node-versions.directive.ts +++ b/src/app/directives/node-versions.directive.ts @@ -25,12 +25,12 @@ import { Directive, HostListener, Input } from '@angular/core'; import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; -import { NodeVersionsDialogComponent } from '../../dialogs/node-versions/node-versions.dialog'; +import { NodeVersionsDialogComponent } from '../dialogs/node-versions/node-versions.dialog'; import { MatDialog } from '@angular/material'; import { Store } from '@ngrx/store'; -import { AppStore } from '../../store/states/app.state'; -import { SnackbarErrorAction } from '../../store/actions'; -import { ContentApiService } from '../../services/content-api.service'; +import { AppStore } from '../store/states/app.state'; +import { SnackbarErrorAction } from '../store/actions'; +import { ContentApiService } from '../services/content-api.service'; @Directive({ selector: '[acaNodeVersions]' diff --git a/src/app/common/services/content-management.service.ts b/src/app/services/content-management.service.ts similarity index 96% rename from src/app/common/services/content-management.service.ts rename to src/app/services/content-management.service.ts index 8dab2870f..8f1eadb16 100644 --- a/src/app/common/services/content-management.service.ts +++ b/src/app/services/content-management.service.ts @@ -27,10 +27,10 @@ import { Subject } from 'rxjs/Rx'; import { Injectable } from '@angular/core'; import { MatDialog } from '@angular/material'; import { FolderDialogComponent } from '@alfresco/adf-content-services'; -import { LibraryDialogComponent } from '../../dialogs/library/library.dialog'; -import { SnackbarErrorAction } from '../../store/actions'; +import { LibraryDialogComponent } from '../dialogs/library/library.dialog'; +import { SnackbarErrorAction } from '../store/actions'; import { Store } from '@ngrx/store'; -import { AppStore } from '../../store/states'; +import { AppStore } from '../store/states'; import { MinimalNodeEntity, MinimalNodeEntryEntity, diff --git a/src/app/common/services/experimental-guard.service.ts b/src/app/services/experimental-guard.service.ts similarity index 93% rename from src/app/common/services/experimental-guard.service.ts rename to src/app/services/experimental-guard.service.ts index 237541cb7..d07b7439c 100644 --- a/src/app/common/services/experimental-guard.service.ts +++ b/src/app/services/experimental-guard.service.ts @@ -1,7 +1,7 @@ import { CanActivate, ActivatedRouteSnapshot, Router } from '@angular/router'; import { Injectable } from '@angular/core'; import { AppConfigService, StorageService } from '@alfresco/adf-core'; -import { environment } from '../../../environments/environment'; +import { environment } from '../../environments/environment'; @Injectable() export class ExperimentalGuard implements CanActivate { diff --git a/src/app/common/services/node-actions.service.spec.ts b/src/app/services/node-actions.service.spec.ts similarity index 99% rename from src/app/common/services/node-actions.service.spec.ts rename to src/app/services/node-actions.service.spec.ts index 9902a7ce3..d00f04ec4 100644 --- a/src/app/common/services/node-actions.service.spec.ts +++ b/src/app/services/node-actions.service.spec.ts @@ -30,8 +30,8 @@ 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 { AppTestingModule } from '../testing/app-testing.module'; +import { ContentApiService } from '../services/content-api.service'; class TestNode { entry?: MinimalNodeEntryEntity; diff --git a/src/app/common/services/node-actions.service.ts b/src/app/services/node-actions.service.ts similarity index 99% rename from src/app/common/services/node-actions.service.ts rename to src/app/services/node-actions.service.ts index 1d49bf082..4e861f705 100644 --- a/src/app/common/services/node-actions.service.ts +++ b/src/app/services/node-actions.service.ts @@ -30,7 +30,7 @@ import { Observable, Subject } from 'rxjs/Rx'; import { AlfrescoApiService, ContentService, DataColumn, TranslationService } from '@alfresco/adf-core'; import { DocumentListService, ContentNodeSelectorComponent, ContentNodeSelectorComponentData } from '@alfresco/adf-content-services'; import { MinimalNodeEntity, MinimalNodeEntryEntity, SitePaging } from 'alfresco-js-api'; -import { ContentApiService } from '../../services/content-api.service'; +import { ContentApiService } from '../services/content-api.service'; @Injectable() export class NodeActionsService { diff --git a/src/app/common/services/node-permission.service.spec.ts b/src/app/services/node-permission.service.spec.ts similarity index 100% rename from src/app/common/services/node-permission.service.spec.ts rename to src/app/services/node-permission.service.spec.ts diff --git a/src/app/common/services/node-permission.service.ts b/src/app/services/node-permission.service.ts similarity index 100% rename from src/app/common/services/node-permission.service.ts rename to src/app/services/node-permission.service.ts diff --git a/src/app/common/services/profile.resolver.ts b/src/app/services/profile.resolver.ts similarity index 91% rename from src/app/common/services/profile.resolver.ts rename to src/app/services/profile.resolver.ts index 429bd3c44..da69e7c74 100644 --- a/src/app/common/services/profile.resolver.ts +++ b/src/app/services/profile.resolver.ts @@ -28,9 +28,9 @@ import { Injectable } from '@angular/core'; import { Resolve, Router } from '@angular/router'; import { Person } from 'alfresco-js-api'; import { Observable } from 'rxjs/Observable'; -import { AppStore } from '../../store/states/app.state'; -import { SetUserAction } from '../../store/actions/user.actions'; -import { ContentApiService } from '../../services/content-api.service'; +import { AppStore } from '../store/states/app.state'; +import { SetUserAction } from '../store/actions'; +import { ContentApiService } from './content-api.service'; @Injectable() export class ProfileResolver implements Resolve { diff --git a/src/app/store/effects/library.effects.ts b/src/app/store/effects/library.effects.ts index 115846e16..d9debf63e 100644 --- a/src/app/store/effects/library.effects.ts +++ b/src/app/store/effects/library.effects.ts @@ -36,7 +36,7 @@ import { } from '../actions/snackbar.actions'; import { Store } from '@ngrx/store'; import { AppStore } from '../states/app.state'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { ContentApiService } from '../../services/content-api.service'; @Injectable() diff --git a/src/app/store/effects/node.effects.ts b/src/app/store/effects/node.effects.ts index cf8eb9185..48cc2bcb7 100644 --- a/src/app/store/effects/node.effects.ts +++ b/src/app/store/effects/node.effects.ts @@ -43,7 +43,7 @@ import { CreateFolderAction, CREATE_FOLDER } from '../actions'; -import { ContentManagementService } from '../../common/services/content-management.service'; +import { ContentManagementService } from '../../services/content-management.service'; import { Observable } from 'rxjs/Rx'; import { NodeInfo, DeleteStatus, DeletedNodeInfo } from '../models'; import { ContentApiService } from '../../services/content-api.service'; diff --git a/src/app/testing/app-testing.module.ts b/src/app/testing/app-testing.module.ts index 43d40f3ad..e4a56ccbe 100644 --- a/src/app/testing/app-testing.module.ts +++ b/src/app/testing/app-testing.module.ts @@ -55,9 +55,9 @@ import { DocumentListService } from '@alfresco/adf-content-services'; import { MaterialModule } from '../material.module'; -import { ContentManagementService } from '../common/services/content-management.service'; -import { NodeActionsService } from '../common/services/node-actions.service'; -import { NodePermissionService } from '../common/services/node-permission.service'; +import { ContentManagementService } from '../services/content-management.service'; +import { NodeActionsService } from '../services/node-actions.service'; +import { NodePermissionService } from '../services/node-permission.service'; import { ContentApiService } from '../services/content-api.service'; import { ExtensionService } from '../extensions/extension.service'; import { RuleService } from '../extensions/rules/rule.service';