From a364cd8d27ccb531d4f9fd19de308bc6338497bd Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 14 Mar 2024 15:11:07 +0100 Subject: [PATCH] [DURACOM-191] Remove menu.module, resource-policies.module and search.module --- src/app/shared/menu/menu.module.ts | 54 -------- .../mydspace-actions.module.ts | 56 --------- .../resource-policies.module.ts | 41 ------ src/app/shared/search/search.module.ts | 119 ------------------ src/modules/app/browser-app.module.ts | 4 + src/themes/custom/lazy-theme.module.ts | 6 - src/themes/dspace/lazy-theme.module.ts | 6 - 7 files changed, 4 insertions(+), 282 deletions(-) delete mode 100644 src/app/shared/menu/menu.module.ts delete mode 100644 src/app/shared/mydspace-actions/mydspace-actions.module.ts delete mode 100644 src/app/shared/resource-policies/resource-policies.module.ts delete mode 100644 src/app/shared/search/search.module.ts diff --git a/src/app/shared/menu/menu.module.ts b/src/app/shared/menu/menu.module.ts deleted file mode 100644 index 762c8244ad..0000000000 --- a/src/app/shared/menu/menu.module.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { TranslateModule } from '@ngx-translate/core'; - -import { MenuComponent } from './menu.component'; -import { ExternalLinkMenuItemComponent } from './menu-item/external-link-menu-item.component'; -import { LinkMenuItemComponent } from './menu-item/link-menu-item.component'; -import { OnClickMenuItemComponent } from './menu-item/onclick-menu-item.component'; -import { TextMenuItemComponent } from './menu-item/text-menu-item.component'; -import { MenuSectionComponent } from './menu-section/menu-section.component'; - -const COMPONENTS = [ - MenuSectionComponent, - MenuComponent, -]; - -const ENTRY_COMPONENTS = [ - TextMenuItemComponent, - LinkMenuItemComponent, - OnClickMenuItemComponent, - ExternalLinkMenuItemComponent, -]; - -const MODULES = [ - TranslateModule, - RouterModule, - CommonModule, -]; -const PROVIDERS = [ - -]; - -@NgModule({ - imports: [ - ...MODULES, - ...COMPONENTS, - ...ENTRY_COMPONENTS, - ], - providers: [ - ...PROVIDERS, - ...ENTRY_COMPONENTS, - ], - exports: [ - ...COMPONENTS, - ], -}) - -/** - * This module handles all components, providers and modules that are needed for the menu - */ -export class MenuModule { - -} diff --git a/src/app/shared/mydspace-actions/mydspace-actions.module.ts b/src/app/shared/mydspace-actions/mydspace-actions.module.ts deleted file mode 100644 index 4ac0f19c03..0000000000 --- a/src/app/shared/mydspace-actions/mydspace-actions.module.ts +++ /dev/null @@ -1,56 +0,0 @@ -/** - * The contents of this file are subject to the license and copyright - * detailed in the LICENSE and NOTICE files at the root of the source - * tree and available online at - * - * http://www.dspace.org/license/ - */ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; - -import { ClaimedTaskActionsApproveComponent } from './claimed-task/approve/claimed-task-actions-approve.component'; -import { ClaimedTaskActionsComponent } from './claimed-task/claimed-task-actions.component'; -import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component'; -import { ClaimedTaskActionsRejectComponent } from './claimed-task/reject/claimed-task-actions-reject.component'; -import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component'; -import { ClaimedTaskActionsLoaderComponent } from './claimed-task/switcher/claimed-task-actions-loader.component'; -import { ItemActionsComponent } from './item/item-actions.component'; -import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component'; -import { WorkflowitemActionsComponent } from './workflowitem/workflowitem-actions.component'; -import { WorkspaceitemActionsComponent } from './workspaceitem/workspaceitem-actions.component'; - -const ENTRY_COMPONENTS = [ - ClaimedTaskActionsApproveComponent, - ClaimedTaskActionsRejectComponent, - ClaimedTaskActionsReturnToPoolComponent, - ClaimedTaskActionsEditMetadataComponent, -]; - -const DECLARATIONS = [ - ...ENTRY_COMPONENTS, - ClaimedTaskActionsComponent, - ClaimedTaskActionsLoaderComponent, - ItemActionsComponent, - PoolTaskActionsComponent, - WorkflowitemActionsComponent, - WorkspaceitemActionsComponent, -]; - -/** - * This module contains Item actions used in MyDSpace - */ -@NgModule({ - imports: [ - CommonModule, - ...DECLARATIONS, - ], - providers: [ - ...ENTRY_COMPONENTS, - ], - exports: [ - ...DECLARATIONS, - ], -}) -export class MyDSpaceActionsModule { - -} diff --git a/src/app/shared/resource-policies/resource-policies.module.ts b/src/app/shared/resource-policies/resource-policies.module.ts deleted file mode 100644 index 25e15ca343..0000000000 --- a/src/app/shared/resource-policies/resource-policies.module.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { TranslateModule } from '@ngx-translate/core'; - -import { ResourcePolicyCreateComponent } from './create/resource-policy-create.component'; -import { ResourcePolicyEditComponent } from './edit/resource-policy-edit.component'; -import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component'; -import { ResourcePolicyFormComponent } from './form/resource-policy-form.component'; -import { ResourcePolicyResolver } from './resolvers/resource-policy.resolver'; -import { ResourcePolicyTargetResolver } from './resolvers/resource-policy-target.resolver'; -import { ResourcePoliciesComponent } from './resource-policies.component'; - -const COMPONENTS = [ - ResourcePoliciesComponent, - ResourcePolicyEntryComponent, - ResourcePolicyFormComponent, - ResourcePolicyEditComponent, - ResourcePolicyCreateComponent, -]; - -const PROVIDERS = [ - ResourcePolicyResolver, - ResourcePolicyTargetResolver, -]; - -@NgModule({ - imports: [ - NgbModule, - CommonModule, - TranslateModule, - ...COMPONENTS, - ], - providers: [ - ...PROVIDERS, - ], - exports: [ - ...COMPONENTS, - ], -}) -export class ResourcePoliciesModule { } diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts deleted file mode 100644 index edc5007750..0000000000 --- a/src/app/shared/search/search.module.ts +++ /dev/null @@ -1,119 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { - MissingTranslationHandler, - TranslateModule, -} from '@ngx-translate/core'; -import { NouisliderModule } from 'ng2-nouislider'; - -import { ConfigurationSearchPageComponent } from '../../search-page/configuration-search-page.component'; -import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component'; -import { MissingTranslationHelper } from '../translate/missing-translation.helper'; -import { AdvancedSearchComponent } from './advanced-search/advanced-search.component'; -import { FacetConfigResponse } from './models/facet-config-response.model'; -import { FacetValues } from './models/facet-values.model'; -import { SearchObjects } from './models/search-objects.model'; -import { SearchResult } from './models/search-result.model'; -import { SearchComponent } from './search.component'; -import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component'; -import { SearchBooleanFilterComponent } from './search-filters/search-filter/search-boolean-filter/search-boolean-filter.component'; -import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component'; -import { SearchFacetOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component'; -import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component'; -import { SearchFacetSelectedOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component'; -import { SearchFacetFilterWrapperComponent } from './search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component'; -import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component'; -import { SearchHierarchyFilterComponent } from './search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component'; -import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component'; -import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component'; -import { SearchFiltersComponent } from './search-filters/search-filters.component'; -import { ThemedSearchFiltersComponent } from './search-filters/themed-search-filters.component'; -import { SearchLabelComponent } from './search-labels/search-label/search-label.component'; -import { SearchLabelsComponent } from './search-labels/search-labels.component'; -import { SearchResultsComponent } from './search-results/search-results.component'; -import { ThemedSearchResultsComponent } from './search-results/themed-search-results.component'; -import { SearchSettingsComponent } from './search-settings/search-settings.component'; -import { ThemedSearchSettingsComponent } from './search-settings/themed-search-settings.component'; -import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component'; -import { ThemedSearchSidebarComponent } from './search-sidebar/themed-search-sidebar.component'; -import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component'; -import { ThemedSearchComponent } from './themed-search.component'; - -const COMPONENTS = [ - SearchComponent, - ThemedSearchComponent, - SearchResultsComponent, - SearchSidebarComponent, - SearchSettingsComponent, - SearchFiltersComponent, - SearchFilterComponent, - SearchFacetFilterComponent, - SearchLabelsComponent, - SearchLabelComponent, - SearchFacetFilterWrapperComponent, - SearchRangeFilterComponent, - SearchTextFilterComponent, - SearchHierarchyFilterComponent, - SearchBooleanFilterComponent, - SearchFacetOptionComponent, - SearchFacetSelectedOptionComponent, - SearchFacetRangeOptionComponent, - SearchAuthorityFilterComponent, - SearchSwitchConfigurationComponent, - ConfigurationSearchPageComponent, - ThemedConfigurationSearchPageComponent, - ThemedSearchResultsComponent, - ThemedSearchSettingsComponent, - AdvancedSearchComponent, - ThemedSearchFiltersComponent, - ThemedSearchSidebarComponent, -]; - -const ENTRY_COMPONENTS = [ - SearchFacetFilterComponent, - SearchRangeFilterComponent, - SearchTextFilterComponent, - SearchHierarchyFilterComponent, - SearchBooleanFilterComponent, - SearchFacetOptionComponent, - SearchFacetSelectedOptionComponent, - SearchFacetRangeOptionComponent, - SearchAuthorityFilterComponent, -]; - -/** - * Declaration needed to make sure all decorator functions are called in time - */ -export const MODELS = [ - SearchObjects, - FacetConfigResponse, - FacetValues, - SearchResult, -]; - -@NgModule({ - imports: [ - CommonModule, - TranslateModule.forChild({ - missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper }, - useDefaultLang: true, - }), - NouisliderModule, - ...COMPONENTS, - ], - exports: [ - ...COMPONENTS, - ], -}) -export class SearchModule { - /** - * NOTE: this method allows to resolve issue with components that using a custom decorator - * which are not loaded during SSR otherwise - */ - static withEntryComponents() { - return { - ngModule: SearchModule, - providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })), - }; - } -} diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts index d1a2d7d2d7..d35a6e1df2 100644 --- a/src/modules/app/browser-app.module.ts +++ b/src/modules/app/browser-app.module.ts @@ -18,6 +18,7 @@ import { } from '@ngrx/store'; import { REQUEST } from '@nguniversal/express-engine/tokens'; import { + MissingTranslationHandler, TranslateLoader, TranslateModule, } from '@ngx-translate/core'; @@ -54,6 +55,7 @@ import { StatisticsModule } from '../../app/statistics/statistics.module'; import { SubmissionService } from '../../app/submission/submission.service'; import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader'; import { BrowserInitService } from './browser-init.service'; +import { MissingTranslationHelper } from '../../app/shared/translate/missing-translation.helper'; export const REQ_KEY = makeStateKey('req'); @@ -86,6 +88,8 @@ export function getRequest(transferState: TransferState): any { useFactory: (createTranslateLoader), deps: [TransferState, HttpClient], }, + missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper }, + useDefaultLang: true, }), AppModule, ], diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 9369da6d87..7d630d7821 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -14,9 +14,6 @@ import { IdlePreloadModule } from 'angular-idle-preload'; import { AppModule } from '../../app/app.module'; import { RootModule } from '../../app/root.module'; -import { MenuModule } from '../../app/shared/menu/menu.module'; -import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module'; -import { SearchModule } from '../../app/shared/search/search.module'; import { StatisticsModule } from '../../app/statistics/statistics.module'; import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module'; import { SubmissionModule } from '../../app/submission/submission.module'; @@ -200,7 +197,6 @@ const DECLARATIONS = [ FormsModule, HttpClientModule, IdlePreloadModule, - MenuModule, NgbModule, RouterModule, ScrollToModule, @@ -210,9 +206,7 @@ const DECLARATIONS = [ StoreRouterConnectingModule, TranslateModule, SubmissionModule, - SearchModule, FormsModule, - ResourcePoliciesModule, SystemWideAlertModule, NgxGalleryModule, ...DECLARATIONS, diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts index 972b5e1f55..5cfc988000 100644 --- a/src/themes/dspace/lazy-theme.module.ts +++ b/src/themes/dspace/lazy-theme.module.ts @@ -13,9 +13,6 @@ import { IdlePreloadModule } from 'angular-idle-preload'; import { AppModule } from '../../app/app.module'; import { RootModule } from '../../app/root.module'; -import { MenuModule } from '../../app/shared/menu/menu.module'; -import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module'; -import { SearchModule } from '../../app/shared/search/search.module'; import { StatisticsModule } from '../../app/statistics/statistics.module'; import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module'; import { SubmissionModule } from '../../app/submission/submission.module'; @@ -32,7 +29,6 @@ const DECLARATIONS = [ FormsModule, HttpClientModule, IdlePreloadModule, - MenuModule, NgbModule, RouterModule, ScrollToModule, @@ -42,9 +38,7 @@ const DECLARATIONS = [ StoreRouterConnectingModule, TranslateModule, SubmissionModule, - SearchModule, FormsModule, - ResourcePoliciesModule, ], declarations: DECLARATIONS, })