AAE-37292 Bug fixes and code improvements (#4733)

projects/aca-content/src/lib/aca-content.module.ts

@@ -24,7 +24,6 @@
 
 import { HammerModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { AuthGuardEcm, LanguagePickerComponent, NotificationHistoryComponent, provideTranslations } from '@alfresco/adf-core';
 import {
   ContentModule,
@@ -34,17 +33,11 @@ import {
   LibraryStatusColumnComponent,
   TrashcanNameColumnComponent
 } from '@alfresco/adf-content-services';
-import { DocumentBasePageService, ExtensionsDataLoaderGuard } from '@alfresco/aca-shared';
+import { DocumentBasePageService, ExtensionsDataLoaderGuard, provideContentAppExtensions } from '@alfresco/aca-shared';
 import * as rules from '@alfresco/aca-shared/rules';
 import { AppStoreModule } from './store/app-store.module';
-import { CoreExtensionsModule } from './extensions/core.extensions.module';
-import { ExtensionService, ExtensionsModule } from '@alfresco/adf-extensions';
-import { APP_TOOLBAR_DIRECTIVES } from './components/toolbar';
-import { APP_SIDENAV_DIRECTIVES } from './components/sidenav';
-import { APP_COMMON_DIRECTIVES } from './components/common';
-import { APP_SEARCH_DIRECTIVES } from './components/search';
+import { provideAppExtensions, provideExtensions } from '@alfresco/adf-extensions';
 import { ContentUrlService } from './services/content-url.service';
-import { CommonModule } from '@angular/common';
 import { LocationLinkComponent } from './components/common/location-link/location-link.component';
 import { LogoutComponent } from './components/common/logout/logout.component';
 import { ToggleSharedComponent } from './components/common/toggle-shared/toggle-shared.component';
@@ -62,16 +55,15 @@ import { ToggleJoinLibraryButtonComponent } from './components/toolbar/toggle-jo
 import { ToggleJoinLibraryMenuComponent } from './components/toolbar/toggle-join-library/toggle-join-library-menu.component';
 import { ViewNodeComponent } from './components/toolbar/view-node/view-node.component';
 import { CONTENT_ROUTES } from './aca-content.routes';
-import { RouterModule } from '@angular/router';
+import { provideRouter } from '@angular/router';
 import { UploadFilesDialogComponent } from './components/upload-files-dialog/upload-files-dialog.component';
-import { AcaFolderRulesModule } from '@alfresco/aca-content/folder-rules';
+import { provideFolderRulesExtension } from '@alfresco/aca-content/folder-rules';
 import { TagsColumnComponent } from './components/dl-custom-components/tags-column/tags-column.component';
 import { UserInfoComponent } from './components/common/user-info/user-info.component';
 import { SidenavComponent } from './components/sidenav/sidenav.component';
 import { ContentManagementService } from './services/content-management.service';
 import { SHELL_NAVBAR_MIN_WIDTH, ShellLayoutComponent } from '@alfresco/adf-core/shell';
 import { UserMenuComponent } from './components/sidenav/user-menu/user-menu.component';
-import { ContextMenuComponent } from './components/context-menu/context-menu.component';
 import { MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
 import { SearchResultsRowComponent } from './components/search/search-results-row/search-results-row.component';
 import { BulkActionsDropdownComponent } from './components/bulk-actions-dropdown/bulk-actions-dropdown.component';
@@ -79,116 +71,101 @@ import { AgentsButtonComponent } from './components/knowledge-retrieval/search-a
 import { SaveSearchSidenavComponent } from './components/search/search-save/sidenav/save-search-sidenav.component';
 
 @NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    ContentModule.forRoot(),
-    RouterModule.forChild(CONTENT_ROUTES),
-    ExtensionsModule,
-    CoreExtensionsModule,
-    AppStoreModule,
-    ...APP_COMMON_DIRECTIVES,
-    ...APP_TOOLBAR_DIRECTIVES,
-    ...APP_SIDENAV_DIRECTIVES,
-    ...APP_SEARCH_DIRECTIVES,
-    ContextMenuComponent,
-    HammerModule,
-    AcaFolderRulesModule
-  ],
+  imports: [ContentModule.forRoot(), AppStoreModule, HammerModule],
   providers: [
+    provideRouter(CONTENT_ROUTES),
     { provide: ContentVersionService, useClass: ContentUrlService },
     { provide: DocumentBasePageService, useExisting: ContentManagementService },
+    provideAppExtensions(),
+    provideContentAppExtensions(),
+    provideFolderRulesExtension(),
     provideTranslations('app', 'assets'),
     { provide: SHELL_NAVBAR_MIN_WIDTH, useValue: 0 },
     {
       provide: MAT_DIALOG_DEFAULT_OPTIONS,
       useValue: { closeOnNavigation: true, hasBackdrop: true, autoFocus: true }
-    }
+    },
+    provideExtensions({
+      authGuards: {
+        'app.auth': AuthGuardEcm,
+        'app.extensions.dataLoaderGuard': ExtensionsDataLoaderGuard
+      },
+      components: {
+        'app.layout.main': ShellLayoutComponent,
+        'app.layout.sidenav': SidenavComponent,
+        'app.shell.sibling': UploadFilesDialogComponent,
+        'app.components.tabs.metadata': MetadataTabComponent,
+        'app.components.tabs.library.metadata': LibraryMetadataTabComponent,
+        'app.components.tabs.comments': CommentsTabComponent,
+        'app.components.tabs.versions': VersionsTabComponent,
+        'app.components.preview': PreviewComponent,
+        'app.toolbar.toggleInfoDrawer': ToggleInfoDrawerComponent,
+        'app.toolbar.toggleFavorite': ToggleFavoriteComponent,
+        'app.toolbar.toggleFavoriteLibrary': ToggleFavoriteLibraryComponent,
+        'app.toolbar.toggleJoinLibrary': ToggleJoinLibraryButtonComponent,
+        'app.toolbar.ai.agents-button': AgentsButtonComponent,
+        'app.menu.toggleJoinLibrary': ToggleJoinLibraryMenuComponent,
+        'app.bulk-actions-dropdown': BulkActionsDropdownComponent,
+        'app.shared-link.toggleSharedLink': ToggleSharedComponent,
+        'app.columns.name': CustomNameColumnComponent,
+        'app.columns.libraryName': LibraryNameColumnComponent,
+        'app.columns.libraryRole': LibraryRoleColumnComponent,
+        'app.columns.libraryStatus': LibraryStatusColumnComponent,
+        'app.columns.trashcanName': TrashcanNameColumnComponent,
+        'app.columns.location': LocationLinkComponent,
+        'app.columns.tags': TagsColumnComponent,
+        'app.toolbar.toggleEditOffline': ToggleEditOfflineComponent,
+        'app.toolbar.viewNode': ViewNodeComponent,
+        'app.languagePicker': LanguagePickerComponent,
+        'app.logout': LogoutComponent,
+        'app.user': UserInfoComponent,
+        'app.notification-center': NotificationHistoryComponent,
+        'app.user.menu': UserMenuComponent,
+        'app.search.columns.name': SearchResultsRowComponent,
+        'app.search.navbar': SaveSearchSidenavComponent
+      },
+      evaluators: {
+        canToggleJoinLibrary: rules.canToggleJoinLibrary,
+        canToggleSharedLink: rules.canToggleSharedLink,
+        canToggleFileLock: rules.canToggleFileLock,
+        canToggleFavorite: rules.canToggleFavorite,
+        isLibraryManager: rules.isLibraryManager,
+        canEditAspects: rules.canEditAspects,
+        isSmartFolder: rules.isSmartFolder,
+        isMultiSelection: rules.isMultiselection,
+        canPrintFile: rules.canPrintFile,
+
+        'app.selection.canDelete': rules.canDeleteSelection,
+        'app.selection.canDownload': rules.canDownloadSelection,
+        'app.selection.notEmpty': rules.hasSelection,
+        'app.selection.canAddFavorite': rules.canAddFavorite,
+        'app.selection.canRemoveFavorite': rules.canRemoveFavorite,
+        'app.selection.first.canUpdate': rules.canUpdateSelectedNode,
+        'app.selection.file': rules.hasFileSelected,
+        'app.selection.file.isLocked': rules.hasLockedFiles,
+        'app.selection.file.canUploadVersion': rules.canUploadVersion,
+        'app.selection.library': rules.hasLibrarySelected,
+        'app.selection.hasLibraryRole': rules.hasLibraryRole,
+        'app.selection.folder': rules.hasFolderSelected,
+        'app.selection.folder.canUpdate': rules.canUpdateSelectedFolder,
+        'app.selection.displayedKnowledgeRetrievalButton': rules.canDisplayKnowledgeRetrievalButton,
+
+        'app.navigation.folder.canCreate': rules.canCreateFolder,
+        'app.navigation.isTrashcan': rules.isTrashcan,
+        'app.navigation.isLibraries': rules.isLibraries,
+        'app.navigation.isSharedFiles': rules.isSharedFiles,
+        'app.navigation.isFavorites': rules.isFavorites,
+        'app.navigation.isRecentFiles': rules.isRecentFiles,
+        'app.navigation.isSearchResults': rules.isSearchResults,
+        'app.navigation.isPreview': rules.isPreview,
+        'app.navigation.isDetails': rules.isDetails,
+
+        'app.canShowLogout': rules.canShowLogout,
+        'app.isContentServiceEnabled': rules.isContentServiceEnabled,
+        'app.areTagsEnabled': rules.areTagsEnabled,
+        'app.areCategoriesEnabled': rules.areCategoriesEnabled
+      }
+    })
   ]
 })
-export class ContentServiceExtensionModule {
-  constructor(public extensions: ExtensionService) {
-    extensions.setAuthGuards({
-      'app.auth': AuthGuardEcm,
-      'app.extensions.dataLoaderGuard': ExtensionsDataLoaderGuard
-    });
-
-    extensions.setComponents({
-      'app.layout.main': ShellLayoutComponent,
-      'app.layout.sidenav': SidenavComponent,
-      'app.shell.sibling': UploadFilesDialogComponent,
-      'app.components.tabs.metadata': MetadataTabComponent,
-      'app.components.tabs.library.metadata': LibraryMetadataTabComponent,
-      'app.components.tabs.comments': CommentsTabComponent,
-      'app.components.tabs.versions': VersionsTabComponent,
-      'app.components.preview': PreviewComponent,
-      'app.toolbar.toggleInfoDrawer': ToggleInfoDrawerComponent,
-      'app.toolbar.toggleFavorite': ToggleFavoriteComponent,
-      'app.toolbar.toggleFavoriteLibrary': ToggleFavoriteLibraryComponent,
-      'app.toolbar.toggleJoinLibrary': ToggleJoinLibraryButtonComponent,
-      'app.toolbar.ai.agents-button': AgentsButtonComponent,
-      'app.menu.toggleJoinLibrary': ToggleJoinLibraryMenuComponent,
-      'app.bulk-actions-dropdown': BulkActionsDropdownComponent,
-      'app.shared-link.toggleSharedLink': ToggleSharedComponent,
-      'app.columns.name': CustomNameColumnComponent,
-      'app.columns.libraryName': LibraryNameColumnComponent,
-      'app.columns.libraryRole': LibraryRoleColumnComponent,
-      'app.columns.libraryStatus': LibraryStatusColumnComponent,
-      'app.columns.trashcanName': TrashcanNameColumnComponent,
-      'app.columns.location': LocationLinkComponent,
-      'app.columns.tags': TagsColumnComponent,
-      'app.toolbar.toggleEditOffline': ToggleEditOfflineComponent,
-      'app.toolbar.viewNode': ViewNodeComponent,
-      'app.languagePicker': LanguagePickerComponent,
-      'app.logout': LogoutComponent,
-      'app.user': UserInfoComponent,
-      'app.notification-center': NotificationHistoryComponent,
-      'app.user.menu': UserMenuComponent,
-      'app.search.columns.name': SearchResultsRowComponent,
-      'app.search.navbar': SaveSearchSidenavComponent
-    });
-
-    extensions.setEvaluators({
-      canToggleJoinLibrary: rules.canToggleJoinLibrary,
-      canToggleSharedLink: rules.canToggleSharedLink,
-      canToggleFileLock: rules.canToggleFileLock,
-      canToggleFavorite: rules.canToggleFavorite,
-      isLibraryManager: rules.isLibraryManager,
-      canEditAspects: rules.canEditAspects,
-      isSmartFolder: rules.isSmartFolder,
-      isMultiSelection: rules.isMultiselection,
-      canPrintFile: rules.canPrintFile,
-
-      'app.selection.canDelete': rules.canDeleteSelection,
-      'app.selection.canDownload': rules.canDownloadSelection,
-      'app.selection.notEmpty': rules.hasSelection,
-      'app.selection.canAddFavorite': rules.canAddFavorite,
-      'app.selection.canRemoveFavorite': rules.canRemoveFavorite,
-      'app.selection.first.canUpdate': rules.canUpdateSelectedNode,
-      'app.selection.file': rules.hasFileSelected,
-      'app.selection.file.isLocked': rules.hasLockedFiles,
-      'app.selection.file.canUploadVersion': rules.canUploadVersion,
-      'app.selection.library': rules.hasLibrarySelected,
-      'app.selection.hasLibraryRole': rules.hasLibraryRole,
-      'app.selection.folder': rules.hasFolderSelected,
-      'app.selection.folder.canUpdate': rules.canUpdateSelectedFolder,
-      'app.selection.displayedKnowledgeRetrievalButton': rules.canDisplayKnowledgeRetrievalButton,
-
-      'app.navigation.folder.canCreate': rules.canCreateFolder,
-      'app.navigation.isTrashcan': rules.isTrashcan,
-      'app.navigation.isLibraries': rules.isLibraries,
-      'app.navigation.isSharedFiles': rules.isSharedFiles,
-      'app.navigation.isFavorites': rules.isFavorites,
-      'app.navigation.isRecentFiles': rules.isRecentFiles,
-      'app.navigation.isSearchResults': rules.isSearchResults,
-      'app.navigation.isPreview': rules.isPreview,
-      'app.navigation.isDetails': rules.isDetails,
-
-      'app.canShowLogout': rules.canShowLogout,
-      'app.isContentServiceEnabled': rules.isContentServiceEnabled,
-      'app.areTagsEnabled': rules.areTagsEnabled,
-      'app.areCategoriesEnabled': rules.areCategoriesEnabled
-    });
-  }
-}
+export class ContentServiceExtensionModule {}

projects/aca-content/src/lib/aca-content.routes.ts

@@ -337,7 +337,7 @@ export const CONTENT_LAYOUT_ROUTES: Route[] = [
         children: [
           {
             path: '',
-            loadChildren: () => import('@alfresco/aca-content/folder-rules').then((m) => m.AcaFolderRulesModule)
+            loadChildren: () => import('@alfresco/aca-content/folder-rules').then((m) => m.FOLDER_RULES_ROUTES)
           }
         ]
       },

projects/aca-content/src/lib/components/common/index.ts

@@ -28,6 +28,7 @@ import { LanguagePickerComponent } from './language-picker/language-picker.compo
 import { LogoutComponent } from './logout/logout.component';
 import { UserInfoComponent } from './user-info/user-info.component';
 
+/* @deprecated import standalone components instead */
 export const APP_COMMON_DIRECTIVES = [
   LanguagePickerComponent,
   LocationLinkComponent,

projects/aca-content/src/lib/components/search/index.ts

@@ -29,6 +29,7 @@ import { SearchResultsRowComponent } from './search-results-row/search-results-r
 import { SearchInputComponent } from './search-input/search-input.component';
 import { SearchInputControlComponent } from './search-input-control/search-input-control.component';
 
+/* @deprecated import standalone components instead */
 export const APP_SEARCH_DIRECTIVES = [
   SearchActionMenuComponent,
   SearchLibrariesResultsComponent,

projects/aca-content/src/lib/components/sidenav/index.ts

@@ -32,6 +32,7 @@ import { ActionDirective } from './directives/action.directive';
 import { SidenavHeaderComponent } from './components/sidenav-header.component';
 import { UserMenuComponent } from './user-menu/user-menu.component';
 
+/* @deprecated import standalone components instead */
 export const APP_SIDENAV_DIRECTIVES = [
   ButtonMenuComponent,
   ActiveLinkDirective,

projects/aca-content/src/lib/components/toolbar/index.ts

@@ -30,6 +30,7 @@ import { ToggleFavoriteLibraryComponent } from './toggle-favorite-library/toggle
 import { ToggleEditOfflineComponent } from './toggle-edit-offline/toggle-edit-offline.component';
 import { ViewNodeComponent } from './view-node/view-node.component';
 
+/* @deprecated import standalone components instead */
 export const APP_TOOLBAR_DIRECTIVES = [
   ToggleFavoriteComponent,
   ToggleEditOfflineComponent,

projects/aca-content/src/lib/extensions/core.extensions.module.ts

@@ -1,42 +0,0 @@
-/*!
- * Copyright © 2005-2025 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * 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
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { inject, ModuleWithProviders, NgModule, provideAppInitializer } from '@angular/core';
-import { AppExtensionService } from '@alfresco/aca-shared';
-
-/** @deprecated use provideExtensions() api instead */
-@NgModule()
-export class CoreExtensionsModule {
-  static forRoot(): ModuleWithProviders<CoreExtensionsModule> {
-    return {
-      ngModule: CoreExtensionsModule,
-      providers: [
-        provideAppInitializer(() => {
-          const service = inject(AppExtensionService);
-          return service.load();
-        })
-      ]
-    };
-  }
-}

projects/aca-content/src/lib/extensions/provide-extensions.ts

@@ -1,35 +0,0 @@
-/*!
- * Copyright © 2005-2025 Hyland Software, Inc. and its affiliates. All rights reserved.
- *
- * Alfresco Example Content Application
- *
- * 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
- * from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import { EnvironmentProviders, inject, provideAppInitializer, Provider } from '@angular/core';
-import { AppExtensionService } from '@alfresco/aca-shared';
-
-export function provideExtensions(): (Provider | EnvironmentProviders)[] {
-  return [
-    provideAppInitializer(() => {
-      const service = inject(AppExtensionService);
-      return service.load();
-    })
-  ];
-}

projects/aca-content/src/public-api.ts

@@ -28,10 +28,8 @@
 
 export * from './lib/aca-content.module';
 export * from './lib/aca-content.routes';
-export * from './lib/extensions/core.extensions.module';
 export * from './lib/store/initial-state';
 export * from './lib/services/content-url.service';
 export * from './lib/services/content-management.service';
 export * from './lib/components/info-drawer/comments-tab/external-node-permission-comments-tab.service';
 export * from './lib/utils/aca-search-utils';
-export * from './lib/extensions/provide-extensions';