From 2b77e4a90d873312de08766a77fa650a4e9a5a12 Mon Sep 17 00:00:00 2001 From: nibou230 Date: Wed, 4 May 2022 11:17:25 -0400 Subject: [PATCH] Moved showAccessStatus from UI to item config Renamed item-page to item to make it generic --- config/config.example.yml | 6 +++--- .../item-search-result-grid-element.component.ts | 2 +- .../item-list-preview.component.ts | 2 +- .../item-search-result-list-element.component.ts | 2 +- src/config/app-config.interface.ts | 4 ++-- src/config/default-app-config.ts | 15 +++++++-------- src/config/item-config.interface.ts | 9 +++++++++ src/config/item-page-config.interface.ts | 7 ------- src/config/ui-server-config.interface.ts | 2 -- src/environments/environment.test.ts | 8 ++++---- 10 files changed, 28 insertions(+), 29 deletions(-) create mode 100644 src/config/item-config.interface.ts delete mode 100644 src/config/item-page-config.interface.ts diff --git a/config/config.example.yml b/config/config.example.yml index 724d7f8a64..37428bb7cd 100644 --- a/config/config.example.yml +++ b/config/config.example.yml @@ -13,8 +13,6 @@ ui: rateLimiter: windowMs: 60000 # 1 minute max: 500 # limit each IP to 500 requests per windowMs - # Show the file access status in items lists - showAccessStatuses: false # The REST API server settings # NOTE: these must be 'synced' with the 'dspace.server.url' setting in your backend's local.cfg. @@ -163,10 +161,12 @@ browseBy: # The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items) defaultLowerLimit: 1900 -# Item Page Config +# Item Config item: edit: undoTimeout: 10000 # 10 seconds + # Show the item access status label in items lists + showAccessStatuses: false # Collection Page Config collection: diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts index 77fc25ff29..6873881d17 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts @@ -32,6 +32,6 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen ngOnInit(): void { super.ngOnInit(); this.itemPageRoute = getItemPageRoute(this.dso); - this.showAccessStatus = environment.ui.showAccessStatuses; + this.showAccessStatus = environment.item.showAccessStatuses; } } diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts index 6b2290c711..52d1b268d2 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts @@ -43,6 +43,6 @@ export class ItemListPreviewComponent { showAccessStatus: boolean; ngOnInit(): void { - this.showAccessStatus = environment.ui.showAccessStatuses; + this.showAccessStatus = environment.item.showAccessStatuses; } } diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts index bbc81e8216..832654ac38 100644 --- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts +++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts @@ -30,6 +30,6 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen ngOnInit(): void { super.ngOnInit(); this.itemPageRoute = getItemPageRoute(this.dso); - this.showAccessStatus = environment.ui.showAccessStatuses; + this.showAccessStatus = environment.item.showAccessStatuses; } } diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts index 121e80cd74..cff908e149 100644 --- a/src/config/app-config.interface.ts +++ b/src/config/app-config.interface.ts @@ -7,7 +7,7 @@ import { INotificationBoardOptions } from './notifications-config.interfaces'; import { SubmissionConfig } from './submission-config.interface'; import { FormConfig } from './form-config.interfaces'; import { LangConfig } from './lang-config.interface'; -import { ItemPageConfig } from './item-page-config.interface'; +import { ItemConfig } from './item-config.interface'; import { CollectionPageConfig } from './collection-page-config.interface'; import { ThemeConfig } from './theme.model'; import { AuthConfig } from './auth-config.interfaces'; @@ -28,7 +28,7 @@ interface AppConfig extends Config { defaultLanguage: string; languages: LangConfig[]; browseBy: BrowseByConfig; - item: ItemPageConfig; + item: ItemConfig; collection: CollectionPageConfig; themes: ThemeConfig[]; mediaViewer: MediaViewerConfig; diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index 46f07f8f64..5bc1532e7a 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -6,7 +6,7 @@ import { BrowseByConfig } from './browse-by-config.interface'; import { CacheConfig } from './cache-config.interface'; import { CollectionPageConfig } from './collection-page-config.interface'; import { FormConfig } from './form-config.interfaces'; -import { ItemPageConfig } from './item-page-config.interface'; +import { ItemConfig } from './item-config.interface'; import { LangConfig } from './lang-config.interface'; import { MediaViewerConfig } from './media-viewer-config.interface'; import { INotificationBoardOptions } from './notifications-config.interfaces'; @@ -34,10 +34,7 @@ export class DefaultAppConfig implements AppConfig { rateLimiter: { windowMs: 1 * 60 * 1000, // 1 minute max: 500 // limit each IP to 500 requests per windowMs - }, - - // Show the file access status in items lists - showAccessStatuses: false + } }; // The REST API server settings @@ -199,11 +196,13 @@ export class DefaultAppConfig implements AppConfig { defaultLowerLimit: 1900 }; - // Item Page Config - item: ItemPageConfig = { + // Item Config + item: ItemConfig = { edit: { undoTimeout: 10000 // 10 seconds - } + }, + // Show the item access status label in items lists + showAccessStatuses: false }; // Collection Page Config diff --git a/src/config/item-config.interface.ts b/src/config/item-config.interface.ts new file mode 100644 index 0000000000..f842c37c05 --- /dev/null +++ b/src/config/item-config.interface.ts @@ -0,0 +1,9 @@ +import { Config } from './config.interface'; + +export interface ItemConfig extends Config { + edit: { + undoTimeout: number; + }; + // This is used to show the access status label of items in results lists + showAccessStatuses: boolean; +} diff --git a/src/config/item-page-config.interface.ts b/src/config/item-page-config.interface.ts deleted file mode 100644 index 2b05e28715..0000000000 --- a/src/config/item-page-config.interface.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { Config } from './config.interface'; - -export interface ItemPageConfig extends Config { - edit: { - undoTimeout: number; - }; -} diff --git a/src/config/ui-server-config.interface.ts b/src/config/ui-server-config.interface.ts index 6ff10e214d..93f90c345c 100644 --- a/src/config/ui-server-config.interface.ts +++ b/src/config/ui-server-config.interface.ts @@ -10,7 +10,5 @@ export class UIServerConfig extends ServerConfig { windowMs: number; max: number; }; - // This section is used to show the access status of items in results lists - showAccessStatuses: boolean; } diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index d84a65dc0e..da4800cc12 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -25,9 +25,7 @@ export const environment: BuildConfig = { rateLimiter: { windowMs: 1 * 60 * 1000, // 1 minute max: 500 // limit each IP to 500 requests per windowMs - }, - // Show the file access status in items lists - showAccessStatuses: false + } }, // The REST API server settings. @@ -198,7 +196,9 @@ export const environment: BuildConfig = { item: { edit: { undoTimeout: 10000 // 10 seconds - } + }, + // Show the item access status label in items lists + showAccessStatuses: false }, collection: { edit: {