Resolve conflicts after merge of part 1

This commit is contained in:
FrancescoMolinaro
2024-02-29 15:13:53 +01:00
parent eab079124c
commit 0a3f884793
11 changed files with 546 additions and 198 deletions

View File

@@ -26,6 +26,9 @@ import { FilterVocabularyConfig } from './filter-vocabulary-config';
import { DiscoverySortConfig } from './discovery-sort.config';
import { QualityAssuranceConfig } from './quality-assurance.config';
import { SearchConfig } from './search-page-config.interface';
import {
AdminNotifyMetricsRow
} from "../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model";
interface AppConfig extends Config {
ui: UIServerConfig;
rest: ServerConfig;
@@ -55,6 +58,7 @@ interface AppConfig extends Config {
comcolSelectionSort: DiscoverySortConfig;
qualityAssuranceConfig: QualityAssuranceConfig;
search: SearchConfig;
notifyMetrics: AdminNotifyMetricsRow[];
}
/**