Merge branch 'live-region-7.6' into live-region-8.0

# Conflicts:
#	config/config.example.yml
#	src/app/shared/shared.module.ts
#	src/config/app-config.interface.ts
#	src/config/default-app-config.ts
#	src/environments/environment.test.ts
This commit is contained in:
Andreas Awouters
2024-09-20 14:03:19 +02:00
15 changed files with 422 additions and 3 deletions

View File

@@ -6,6 +6,7 @@ import {
import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
import { HALDataService } from '../app/core/data/base/hal-data-service.interface';
import { LiveRegionConfig } from '../app/shared/live-region/live-region.config';
import { ActuatorsConfig } from './actuators.config';
import { AuthConfig } from './auth-config.interfaces';
import { BrowseByConfig } from './browse-by-config.interface';
@@ -33,6 +34,7 @@ import { SuggestionConfig } from './suggestion-config.interfaces';
import { ThemeConfig } from './theme.config';
import { UIServerConfig } from './ui-server-config.interface';
interface AppConfig extends Config {
ui: UIServerConfig;
rest: ServerConfig;
@@ -63,6 +65,7 @@ interface AppConfig extends Config {
qualityAssuranceConfig: QualityAssuranceConfig;
search: SearchConfig;
notifyMetrics: AdminNotifyMetricsRow[];
liveRegion: LiveRegionConfig;
}
/**