hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DURACOM-191] fix circular dependencies

Browse Source
This commit is contained in:
Giuseppe Digilio
2024-01-18 19:13:43 +01:00
parent bb64be3a2b
commit 171e0e3dc9
65 changed files with 110 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
View File

@@ -3,7 +3,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { BehaviorSubject, Subscription } from 'rxjs';
import { distinctUntilChanged, map } from 'rxjs/operators';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
import { SelectableListState } from '../../../shared/object-list/selectable-list/selectable-list.reducer';
@@ -27,6 +26,7 @@ import {
import {
ListableObjectComponentLoaderComponent
} from '../../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-bulk-access-browse',

2
src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
View File

@@ -41,12 +41,12 @@ import {
} from '../../shared/remote-data.utils';
import { createPaginatedList } from '../../shared/testing/utils.test';
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
import { GroupDataService } from '../../core/eperson/group-data.service';
import { LinkHeadService } from '../../core/services/link-head.service';
import { ConfigurationDataService } from '../../core/data/configuration-data.service';
import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
describe('CollectionItemMapperComponent', () => {
let comp: CollectionItemMapperComponent;

2
src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
View File

@@ -23,7 +23,6 @@ import { ItemDataService } from '../../core/data/item-data.service';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { CollectionDataService } from '../../core/data/collection-data.service';
import { isNotEmpty } from '../../shared/empty.util';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
import { SearchService } from '../../core/shared/search/search.service';
@@ -34,6 +33,7 @@ import { ThemedSearchFormComponent } from '../../shared/search-form/themed-searc
import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
import { AsyncPipe, NgIf } from '@angular/common';
import { ItemSelectComponent } from '../../shared/object-select/item-select/item-select.component';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-collection-item-mapper',

2
src/app/core/shared/non-hierarchical-browse-definition.ts
View File

@@ -1,7 +1,7 @@
import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
import { SortOption } from './sort-option.model';
import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-decorator';
import { BrowseDefinition } from './browse-definition.model';
import { BrowseByDataType } from '../../browse-by/browse-by-data-type';
/**
* Super class for NonHierarchicalBrowseDefinition models,

4
src/app/item-page/item-shared.module.ts
View File

@@ -4,7 +4,6 @@ import { CommonModule } from '@angular/common';
import { SearchModule } from '../shared/search/search.module';
import { TranslateModule } from '@ngx-translate/core';
import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
import { ItemVersionsDeleteModalComponent } from './versions/item-versions-delete-modal/item-versions-delete-modal.component';
import { ItemVersionsSummaryModalComponent } from './versions/item-versions-summary-modal/item-versions-summary-modal.component';
@@ -15,6 +14,9 @@ import { RelatedItemsComponent } from './simple/related-items/related-items-comp
import {
ThemedMetadataRepresentationListComponent
} from './simple/metadata-representation-list/themed-metadata-representation-list.component';
import {
dsDynamicFormControlMapFn
} from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.map';
const ENTRY_COMPONENTS = [
ItemVersionsDeleteModalComponent,

7
src/app/my-dspace-page/my-dspace-configuration.service.ts
View File

@@ -1,4 +1,4 @@
import { Injectable } from '@angular/core';
import { Injectable, InjectionToken } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { combineLatest, Observable } from 'rxjs';
@@ -6,7 +6,9 @@ import { first, map } from 'rxjs/operators';
import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
import { RoleService } from '../core/roles/role.service';
import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
import {
SearchConfigurationOption
} from '../shared/search/search-switch-configuration/search-configuration-option.model';
import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
@@ -24,6 +26,7 @@ export const MyDSpaceConfigurationToContextMap = new Map([
[MyDSpaceConfigurationValueType.Workflow, Context.Workflow]
]);
export const SEARCH_CONFIG_SERVICE: InjectionToken<SearchConfigurationService> = new InjectionToken<SearchConfigurationService>('searchConfigurationService');
/**
* Service that performs all actions that have to do with the current mydspace configuration

4
src/app/my-dspace-page/my-dspace-page.component.spec.ts
View File

@@ -8,9 +8,9 @@ import { of as observableOf } from 'rxjs';
import { TranslateModule } from '@ngx-translate/core';
import { cold } from 'jasmine-marbles';
import { MyDSpacePageComponent, SEARCH_CONFIG_SERVICE, } from './my-dspace-page.component';
import { MyDSpacePageComponent, } from './my-dspace-page.component';
import { SearchService } from '../core/shared/search/search.service';
import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
import { MyDSpaceConfigurationService, SEARCH_CONFIG_SERVICE } from './my-dspace-configuration.service';
import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
import { Context } from '../core/shared/context.model';
import { RoleService } from '../core/roles/role.service';

10
src/app/my-dspace-page/my-dspace-page.component.ts
View File

@@ -1,12 +1,13 @@
import { ChangeDetectionStrategy, Component, Inject, InjectionToken, OnInit } from '@angular/core';
import { ChangeDetectionStrategy, Component, Inject, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { take } from 'rxjs/operators';
import { SearchService } from '../core/shared/search/search.service';
import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service';
import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
import {
SearchConfigurationOption
} from '../shared/search/search-switch-configuration/search-configuration-option.model';
import { MyDSpaceConfigurationService, SEARCH_CONFIG_SERVICE } from './my-dspace-configuration.service';
import { ViewMode } from '../core/shared/view-mode.model';
import { MyDSpaceRequest } from '../core/data/request.models';
import { Context } from '../core/shared/context.model';
@@ -17,7 +18,6 @@ import { AsyncPipe, NgIf } from '@angular/common';
import { RoleDirective } from '../shared/roles/role.directive';
export const MYDSPACE_ROUTE = '/mydspace';
export const SEARCH_CONFIG_SERVICE: InjectionToken<SearchConfigurationService> = new InjectionToken<SearchConfigurationService>('searchConfigurationService');
/**
* This component represents the whole mydspace page

2
src/app/navbar/navbar.component.spec.ts
View File

@@ -16,7 +16,6 @@ import { RouterTestingModule } from '@angular/router/testing';
import { BrowseService } from '../core/browse/browse.service';
import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
import { buildPaginatedList } from '../core/data/paginated-list.model';
import { BrowseByDataType } from '../browse-by/browse-by-switcher/browse-by-decorator';
import { Item } from '../core/shared/item.model';
import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
import { ThemeService } from '../shared/theme-support/theme.service';
@@ -30,6 +29,7 @@ import { EPersonMock } from '../shared/testing/eperson.mock';
import { FlatBrowseDefinition } from '../core/shared/flat-browse-definition.model';
import { ValueListBrowseDefinition } from '../core/shared/value-list-browse-definition.model';
import { HierarchicalBrowseDefinition } from '../core/shared/hierarchical-browse-definition.model';
import { BrowseByDataType } from '../browse-by/browse-by-data-type';
let comp: NavbarComponent;
let fixture: ComponentFixture<NavbarComponent>;

5
src/app/process-page/form/process-form-factory.ts Normal file
View File

@@ -0,0 +1,5 @@
import { ControlContainer } from '@angular/forms';
export function controlContainerFactory(controlContainer?: ControlContainer) {
return controlContainer;
}

9
src/app/process-page/form/process-form.component.ts
View File

@@ -3,17 +3,17 @@ import { Script } from '../scripts/script.model';
import { Process } from '../processes/process.model';
import { ProcessParameter } from '../processes/process-parameter.model';
import { ScriptDataService } from '../../core/data/processes/script-data.service';
import { ControlContainer, NgForm, FormsModule } from '@angular/forms';
import { FormsModule, NgForm } from '@angular/forms';
import { ScriptParameter } from '../scripts/script-parameter.model';
import { NotificationsService } from '../../shared/notifications/notifications.service';
import { TranslateService, TranslateModule } from '@ngx-translate/core';
import { TranslateModule, TranslateService } from '@ngx-translate/core';
import { RequestService } from '../../core/data/request.service';
import { Router, RouterLink } from '@angular/router';
import { getFirstCompletedRemoteData } from '../../core/shared/operators';
import { RemoteData } from '../../core/data/remote-data';
import { getProcessListRoute } from '../process-page-routing.paths';
import { isEmpty } from '../../shared/empty.util';
import { NgIf, NgFor } from '@angular/common';
import { NgFor, NgIf } from '@angular/common';
import { ScriptHelpComponent } from './script-help/script-help.component';
import { ProcessParametersComponent } from './process-parameters/process-parameters.component';
import { ScriptsSelectComponent } from './scripts-select/scripts-select.component';
@@ -157,6 +157,3 @@ export class ProcessFormComponent implements OnInit {
}
}
export function controlContainerFactory(controlContainer?: ControlContainer) {
return controlContainer;
}

2
src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
View File

@@ -2,10 +2,10 @@ import { Component, EventEmitter, Input, Optional, Output } from '@angular/core'
import { ProcessParameter } from '../../../processes/process-parameter.model';
import { ScriptParameter } from '../../../scripts/script-parameter.model';
import { ControlContainer, NgForm, FormsModule } from '@angular/forms';
import { controlContainerFactory } from '../../process-form.component';
import { ParameterValueInputComponent } from '../parameter-value-input/parameter-value-input.component';
import { NgFor, NgIf } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { controlContainerFactory } from '../../process-form-factory';
/**
* Component to select a single parameter for a process

2
src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
View File

@@ -1,8 +1,8 @@
import { Component, OnInit, Optional } from '@angular/core';
import { ValueInputComponent } from '../value-input.component';
import { ControlContainer, NgForm } from '@angular/forms';
import { controlContainerFactory } from '../../../process-form.component';
import { TranslateModule } from '@ngx-translate/core';
import { controlContainerFactory } from '../../../process-form-factory';
/**
* Represents the value of a boolean parameter

2
src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
View File

@@ -1,9 +1,9 @@
import { Component, Input, Optional } from '@angular/core';
import { ValueInputComponent } from '../value-input.component';
import { ControlContainer, NgForm, FormsModule } from '@angular/forms';
import { controlContainerFactory } from '../../../process-form.component';
import { TranslateModule } from '@ngx-translate/core';
import { NgIf } from '@angular/common';
import { controlContainerFactory } from '../../../process-form-factory';
/**
* Represents the user inputted value of a date parameter

2
src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
View File

@@ -1,11 +1,11 @@
import { Component, Optional } from '@angular/core';
import { ValueInputComponent } from '../value-input.component';
import { ControlContainer, NgForm, FormsModule } from '@angular/forms';
import { controlContainerFactory } from '../../../process-form.component';
import { TranslateModule } from '@ngx-translate/core';
import { NgIf } from '@angular/common';
import { FileValidator } from '../../../../../shared/utils/require-file.validator';
import { FileValueAccessorDirective } from '../../../../../shared/utils/file-value-accessor.directive';
import { controlContainerFactory } from '../../../process-form-factory';
/**
* Represents the user inputted value of a file parameter

2
src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
View File

@@ -2,12 +2,12 @@ import { Component, EventEmitter, Input, Optional, Output } from '@angular/core'
import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
import { ScriptParameter } from '../../../scripts/script-parameter.model';
import { ControlContainer, NgForm } from '@angular/forms';
import { controlContainerFactory } from '../../process-form.component';
import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component';
import { FileValueInputComponent } from './file-value-input/file-value-input.component';
import { DateValueInputComponent } from './date-value-input/date-value-input.component';
import { StringValueInputComponent } from './string-value-input/string-value-input.component';
import { NgSwitch, NgSwitchCase } from '@angular/common';
import { controlContainerFactory } from '../../process-form-factory';
/**
* Component that renders the correct parameter value input based the script parameter's type

2
src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
View File

@@ -1,9 +1,9 @@
import { Component, Optional, Input } from '@angular/core';
import { ValueInputComponent } from '../value-input.component';
import { ControlContainer, NgForm, FormsModule } from '@angular/forms';
import { controlContainerFactory } from '../../../process-form.component';
import { TranslateModule } from '@ngx-translate/core';
import { NgIf } from '@angular/common';
import { controlContainerFactory } from '../../../process-form-factory';
/**
* Represents the user inputted value of a string parameter

2
src/app/process-page/form/process-parameters/process-parameters.component.ts
View File

@@ -4,10 +4,10 @@ import { ProcessParameter } from '../../processes/process-parameter.model';
import { hasValue } from '../../../shared/empty.util';
import { ControlContainer, NgForm } from '@angular/forms';
import { ScriptParameter } from '../../scripts/script-parameter.model';
import { controlContainerFactory } from '../process-form.component';
import { TranslateModule } from '@ngx-translate/core';
import { ParameterSelectComponent } from './parameter-select/parameter-select.component';
import { NgIf, NgFor } from '@angular/common';
import { controlContainerFactory } from '../process-form-factory';
/**
* Component that represents the selected list of parameters for a script

2
src/app/process-page/form/scripts-select/scripts-select.component.ts
View File

@@ -8,9 +8,9 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
import { ActivatedRoute, Params, Router } from '@angular/router';
import { hasNoValue, hasValue } from '../../../shared/empty.util';
import { ControlContainer, NgForm, FormsModule } from '@angular/forms';
import { controlContainerFactory } from '../process-form.component';
import { TranslateModule } from '@ngx-translate/core';
import { NgIf, NgFor, AsyncPipe } from '@angular/common';
import { controlContainerFactory } from '../process-form-factory';
const SCRIPT_QUERY_PARAMETER = 'script';

2
src/app/search-page/configuration-search-page.component.ts
View File

@@ -3,7 +3,6 @@ import { SidebarService } from '../shared/sidebar/sidebar.service';
import { SearchComponent } from '../shared/search/search.component';
import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
import { pushInOut } from '../shared/animations/push';
import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
import { RouteService } from '../core/services/route.service';
import { SearchService } from '../core/shared/search/search.service';
@@ -16,6 +15,7 @@ import { ThemedSearchResultsComponent } from '../shared/search/search-results/th
import { ViewModeSwitchComponent } from '../shared/view-mode-switch/view-mode-switch.component';
import { PageWithSidebarComponent } from '../shared/sidebar/page-with-sidebar.component';
import { NgIf, NgTemplateOutlet, AsyncPipe } from '@angular/common';
import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-configuration.service';
/**
* This component renders a search page using a configuration as input.

2
src/app/search-page/search-page.component.ts
View File

@@ -1,7 +1,7 @@
import { Component } from '@angular/core';
import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
import { ThemedSearchComponent } from '../shared/search/themed-search.component';
import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search-page',

4
src/app/shared/eperson-group-list/eperson-group-list-event-type.ts Normal file
View File

@@ -0,0 +1,4 @@
export interface SearchEvent {
scope: string;
query: string;
}

3
src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts
View File

@@ -12,7 +12,7 @@ import { EPersonDataService } from '../../core/eperson/eperson-data.service';
import { GroupDataService } from '../../core/eperson/group-data.service';
import { RequestService } from '../../core/data/request.service';
import { getMockRequestService } from '../mocks/request.service.mock';
import { EpersonGroupListComponent, SearchEvent } from './eperson-group-list.component';
import { EpersonGroupListComponent } from './eperson-group-list.component';
import { EPersonMock } from '../testing/eperson.mock';
import { GroupMock } from '../testing/group-mock';
import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
@@ -30,6 +30,7 @@ import { EPERSON } from 'src/app/core/eperson/models/eperson.resource-type';
import { GROUP } from 'src/app/core/eperson/models/group.resource-type';
import { ResourceType } from 'src/app/core/shared/resource-type';
import { dataService, getDataServiceFor } from 'src/app/core/data/base/data-service.decorator';
import { SearchEvent } from './eperson-group-list-event-type';
describe('EpersonGroupListComponent test suite', () => {
let comp: EpersonGroupListComponent;

8
src/app/shared/eperson-group-list/eperson-group-list.component.ts
View File

@@ -24,12 +24,8 @@ import { TranslateModule } from '@ngx-translate/core';
import { PaginationComponent } from '../pagination/pagination.component';
import { GroupSearchBoxComponent } from './group-search-box/group-search-box.component';
import { EpersonSearchBoxComponent } from './eperson-search-box/eperson-search-box.component';
import { NgIf, NgFor, AsyncPipe } from '@angular/common';
export interface SearchEvent {
scope: string;
query: string;
}
import { AsyncPipe, NgFor, NgIf } from '@angular/common';
import { SearchEvent } from './eperson-group-list-event-type';
@Component({
selector: 'ds-eperson-group-list',

3
src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
View File

@@ -6,7 +6,8 @@ import { TranslateModule } from '@ngx-translate/core';
import { createTestComponent } from '../../testing/utils.test';
import { EpersonSearchBoxComponent } from './eperson-search-box.component';
import { SearchEvent } from '../eperson-group-list.component';
import { SearchEvent } from '../eperson-group-list-event-type';
describe('EpersonSearchBoxComponent test suite', () => {
let comp: EpersonSearchBoxComponent;

2
src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
View File

@@ -3,9 +3,9 @@ import { UntypedFormBuilder, FormsModule, ReactiveFormsModule } from '@angular/f
import { Subscription } from 'rxjs';
import { SearchEvent } from '../eperson-group-list.component';
import { isNotNull } from '../../empty.util';
import { TranslateModule } from '@ngx-translate/core';
import { SearchEvent } from '../eperson-group-list-event-type';
/**
* A component used to show a search box for epersons.

3
src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts
View File

@@ -6,7 +6,8 @@ import { TranslateModule } from '@ngx-translate/core';
import { createTestComponent } from '../../testing/utils.test';
import { GroupSearchBoxComponent } from './group-search-box.component';
import { SearchEvent } from '../eperson-group-list.component';
import { SearchEvent } from '../eperson-group-list-event-type';
describe('GroupSearchBoxComponent test suite', () => {
let comp: GroupSearchBoxComponent;

2
src/app/shared/eperson-group-list/group-search-box/group-search-box.component.ts
View File

@@ -3,9 +3,9 @@ import { UntypedFormBuilder, FormsModule, ReactiveFormsModule } from '@angular/f
import { Subscription } from 'rxjs';
import { SearchEvent } from '../eperson-group-list.component';
import { isNotNull } from '../../empty.util';
import { TranslateModule } from '@ngx-translate/core';
import { SearchEvent } from '../eperson-group-list-event-type';
/**
* A component used to show a search box for groups.

2
src/app/shared/page-size-selector/page-size-selector.component.spec.ts
View File

@@ -11,9 +11,9 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import { EnumKeysPipe } from '../utils/enum-keys-pipe';
import { VarDirective } from '../utils/var.directive';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
import { PaginationService } from '../../core/pagination/pagination.service';
import { PaginationServiceStub } from '../testing/pagination-service.stub';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
describe('PageSizeSelectorComponent', () => {

2
src/app/shared/page-size-selector/page-size-selector.component.ts
View File

@@ -2,7 +2,6 @@ import { Component, Inject, OnInit } from '@angular/core';
import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
import { Observable } from 'rxjs';
import { ActivatedRoute, Router } from '@angular/router';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
import { map, take } from 'rxjs/operators';
@@ -10,6 +9,7 @@ import { PaginationService } from '../../core/pagination/pagination.service';
import { FormsModule } from '@angular/forms';
import { NgFor, AsyncPipe } from '@angular/common';
import { SidebarDropdownComponent } from '../sidebar/sidebar-dropdown.component';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-page-size-selector',

8
src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
View File

@@ -15,14 +15,14 @@ import { SearchConfigurationService } from '../../../../../../core/shared/search
import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
import { By } from '@angular/platform-browser';
import { SearchFacetRangeOptionComponent } from './search-facet-range-option.component';
import {
RANGE_FILTER_MAX_SUFFIX,
RANGE_FILTER_MIN_SUFFIX
} from '../../search-range-filter/search-range-filter.component';
import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
import { PaginationService } from '../../../../../../core/pagination/pagination.service';
import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
import {
RANGE_FILTER_MAX_SUFFIX,
RANGE_FILTER_MIN_SUFFIX
} from '../../search-range-filter/search-range-filter-constants';
describe('SearchFacetRangeOptionComponent', () => {
let comp: SearchFacetRangeOptionComponent;

8
src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
View File

@@ -6,16 +6,16 @@ import { FacetValue } from '../../../../models/facet-value.model';
import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
import { SearchService } from '../../../../../../core/shared/search/search.service';
import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
import {
RANGE_FILTER_MAX_SUFFIX,
RANGE_FILTER_MIN_SUFFIX
} from '../../search-range-filter/search-range-filter.component';
import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
import { hasValue } from '../../../../../empty.util';
import { currentPath } from '../../../../../utils/route.utils';
import { PaginationService } from '../../../../../../core/pagination/pagination.service';
import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
import { NgIf, AsyncPipe } from '@angular/common';
import {
RANGE_FILTER_MAX_SUFFIX,
RANGE_FILTER_MIN_SUFFIX
} from '../../search-range-filter/search-range-filter-constants';
const rangeDelimiter = '-';

2
src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
View File

@@ -22,8 +22,8 @@ import { PageInfo } from '../../../../../core/shared/page-info.model';
import { SearchFacetFilterComponent } from './search-facet-filter.component';
import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
describe('SearchFacetFilterComponent', () => {
let comp: SearchFacetFilterComponent;

2
src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
View File

@@ -30,11 +30,11 @@ import { SearchConfigurationService } from '../../../../../core/shared/search/se
import { getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
import { SearchOptions } from '../../../models/search-options.model';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
import { currentPath } from '../../../../utils/route.utils';
import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
import { FacetValues } from '../../../models/facet-values.model';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search-facet-filter',

2
src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
View File

@@ -11,9 +11,9 @@ import { SearchFilterComponent } from './search-filter.component';
import { SearchFilterConfig } from '../../models/search-filter-config.model';
import { FilterType } from '../../models/filter-type.model';
import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
import { SequenceService } from '../../../../core/shared/sequence.service';
import { SearchFacetFilterWrapperComponent } from './search-facet-filter-wrapper/search-facet-filter-wrapper.component';
import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
describe('SearchFilterComponent', () => {
let comp: SearchFilterComponent;

2
src/app/shared/search/search-filters/search-filter/search-filter.component.ts
View File

@@ -9,12 +9,12 @@ import { slide } from '../../../animations/slide';
import { isNotEmpty } from '../../../empty.util';
import { SearchService } from '../../../../core/shared/search/search.service';
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
import { SequenceService } from '../../../../core/shared/sequence.service';
import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
import { TranslateModule } from '@ngx-translate/core';
import { SearchFacetFilterWrapperComponent } from './search-facet-filter-wrapper/search-facet-filter-wrapper.component';
import { NgIf, NgClass, AsyncPipe, LowerCasePipe } from '@angular/common';
import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search-filter',

2
src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
View File

@@ -21,11 +21,11 @@ import {
import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
import { Router } from '@angular/router';
import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
import { FacetValue} from '../../../models/facet-value.model';
import { SearchFilterConfig } from '../../../models/search-filter-config.model';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
describe('SearchHierarchyFilterComponent', () => {

2
src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
View File

@@ -13,7 +13,6 @@ import {
} from '../../../../../core/shared/search/search-filter.service';
import { Router } from '@angular/router';
import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
import { SearchFilterConfig } from '../../../models/search-filter-config.model';
import { FacetValue } from '../../../models/facet-value.model';
@@ -38,6 +37,7 @@ import {
SearchFacetSelectedOptionComponent
} from '../search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
import { AsyncPipe, LowerCasePipe, NgFor, NgIf } from '@angular/common';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search-hierarchy-filter',

8
src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter-constants.ts Normal file
View File

@@ -0,0 +1,8 @@
/**
* The suffix for a range filters' minimum in the frontend URL
*/
export const RANGE_FILTER_MIN_SUFFIX = '.min';
/**
* The suffix for a range filters' maximum in the frontend URL
*/
export const RANGE_FILTER_MAX_SUFFIX = '.max';

2
src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
View File

@@ -21,10 +21,10 @@ import { Router } from '@angular/router';
import { PageInfo } from '../../../../../core/shared/page-info.model';
import { SearchRangeFilterComponent } from './search-range-filter.component';
import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
import { RouteService } from '../../../../../core/services/route.service';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
describe('SearchRangeFilterComponent', () => {
let comp: SearchRangeFilterComponent;

13
src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
View File

@@ -14,7 +14,6 @@ import {
} from '../../../../../core/shared/search/search-filter.service';
import { SearchService } from '../../../../../core/shared/search/search.service';
import { Router } from '@angular/router';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
import { RouteService } from '../../../../../core/services/route.service';
import { hasValue } from '../../../../empty.util';
@@ -25,16 +24,8 @@ import {
import { DebounceDirective } from '../../../../utils/debounce.directive';
import { NouisliderComponent } from 'ng2-nouislider';
import { FormsModule } from '@angular/forms';
/**
* The suffix for a range filters' minimum in the frontend URL
*/
export const RANGE_FILTER_MIN_SUFFIX = '.min';
/**
* The suffix for a range filters' maximum in the frontend URL
*/
export const RANGE_FILTER_MAX_SUFFIX = '.max';
import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
import { RANGE_FILTER_MAX_SUFFIX, RANGE_FILTER_MIN_SUFFIX } from './search-range-filter-constants';
/**
* This component renders a simple item page.

2
src/app/shared/search/search-filters/search-filters.component.spec.ts
View File

@@ -7,8 +7,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
import { SearchFiltersComponent } from './search-filters.component';
import { SearchService } from '../../../core/shared/search/search.service';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
describe('SearchFiltersComponent', () => {
let comp: SearchFiltersComponent;

2
src/app/shared/search/search-filters/search-filters.component.ts
View File

@@ -9,12 +9,12 @@ import { RemoteData } from '../../../core/data/remote-data';
import { SearchFilterConfig } from '../models/search-filter-config.model';
import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
import { currentPath } from '../../utils/route.utils';
import { hasValue } from '../../empty.util';
import { TranslateModule } from '@ngx-translate/core';
import { SearchFilterComponent } from './search-filter/search-filter.component';
import { NgIf, NgFor, AsyncPipe } from '@angular/common';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search-filters',

2
src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
View File

@@ -7,7 +7,6 @@ import { Observable, of as observableOf } from 'rxjs';
import { ActivatedRoute, Params, Router, RouterLink } from '@angular/router';
import { SearchLabelComponent } from './search-label.component';
import { ObjectKeysPipe } from '../../../utils/object-keys-pipe';
import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
import { SearchServiceStub } from '../../../testing/search-service.stub';
import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
import { SearchService } from '../../../../core/shared/search/search.service';
@@ -16,6 +15,7 @@ import { PaginationService } from '../../../../core/pagination/pagination.servic
import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
import { PaginationServiceStub } from '../../../testing/pagination-service.stub';
import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub';
import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-configuration.service';
describe('SearchLabelComponent', () => {
let comp: SearchLabelComponent;

2
src/app/shared/search/search-labels/search-labels.component.spec.ts
View File

@@ -9,8 +9,8 @@ import { SearchService } from '../../../core/shared/search/search.service';
import { RouterTestingModule } from '@angular/router/testing';
import { ObjectKeysPipe } from '../../utils/object-keys-pipe';
import { SearchServiceStub } from '../../testing/search-service.stub';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
import { SearchLabelComponent } from './search-label/search-label.component';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
describe('SearchLabelsComponent', () => {
let comp: SearchLabelsComponent;

2
src/app/shared/search/search-labels/search-labels.component.ts
View File

@@ -1,5 +1,4 @@
import { Component, Inject, Input } from '@angular/core';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
import { Observable } from 'rxjs';
import { Params, Router } from '@angular/router';
import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
@@ -7,6 +6,7 @@ import { map } from 'rxjs/operators';
import { ObjectKeysPipe } from '../../utils/object-keys-pipe';
import { SearchLabelComponent } from './search-label/search-label.component';
import { NgFor, AsyncPipe } from '@angular/common';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search-labels',

2
src/app/shared/search/search-settings/search-settings.component.spec.ts
View File

@@ -12,11 +12,11 @@ import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
import { By } from '@angular/platform-browser';
import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
import { VarDirective } from '../../utils/var.directive';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
import { SidebarService } from '../../sidebar/sidebar.service';
import { SidebarServiceStub } from '../../testing/sidebar-service.stub';
import { PaginationService } from '../../../core/pagination/pagination.service';
import { PaginationServiceStub } from '../../testing/pagination-service.stub';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
describe('SearchSettingsComponent', () => {

2
src/app/shared/search/search-settings/search-settings.component.ts
View File

@@ -3,13 +3,13 @@ import { SearchService } from '../../../core/shared/search/search.service';
import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
import { ActivatedRoute, Router } from '@angular/router';
import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
import { PaginationService } from '../../../core/pagination/pagination.service';
import { TranslateModule } from '@ngx-translate/core';
import { PageSizeSelectorComponent } from '../../page-size-selector/page-size-selector.component';
import { FormsModule } from '@angular/forms';
import { SidebarDropdownComponent } from '../../sidebar/sidebar-dropdown.component';
import { NgIf, NgFor } from '@angular/common';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search-settings',

3
src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
View File

@@ -10,10 +10,11 @@ import { NavigationExtras, Router } from '@angular/router';
import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
import { RouterStub } from '../../testing/router.stub';
import { SearchService } from '../../../core/shared/search/search.service';
import { MYDSPACE_ROUTE, SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
import { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component';
import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type';
import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
import { Context } from '../../../core/shared/context.model';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
describe('SearchSwitchConfigurationComponent', () => {

2
src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
View File

@@ -4,7 +4,6 @@ import { NavigationExtras, Router } from '@angular/router';
import { Subscription } from 'rxjs';
import { hasValue } from '../../empty.util';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type';
import { SearchConfigurationOption } from './search-configuration-option.model';
@@ -14,6 +13,7 @@ import findIndex from 'lodash/findIndex';
import { TranslateModule } from '@ngx-translate/core';
import { FormsModule } from '@angular/forms';
import { NgIf, NgFor } from '@angular/common';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search-switch-configuration',

2
src/app/shared/search/search.component.spec.ts
View File

@@ -19,7 +19,6 @@ import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
import { SidebarService } from '../sidebar/sidebar.service';
import { SearchFilterService } from '../../core/shared/search/search-filter.service';
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
import { RouteService } from '../../core/services/route.service';
import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
import { PaginatedSearchOptions } from './models/paginated-search-options.model';
@@ -39,6 +38,7 @@ import { ThemedSearchResultsComponent } from './search-results/themed-search-res
import { ThemedSearchSidebarComponent } from './search-sidebar/themed-search-sidebar.component';
import { ThemedSearchFormComponent } from '../search-form/themed-search-form.component';
import { SearchLabelsComponent } from './search-labels/search-labels.component';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
let comp: SearchComponent;
let fixture: ComponentFixture<SearchComponent>;

4
src/app/shared/search/search.component.ts
View File

@@ -13,7 +13,6 @@ import { HostWindowService } from '../host-window.service';
import { SidebarService } from '../sidebar/sidebar.service';
import { hasValue, hasValueOperator, isNotEmpty } from '../empty.util';
import { RouteService } from '../../core/services/route.service';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
import { PaginatedSearchOptions } from './models/paginated-search-options.model';
import { SearchResult } from './models/search-result.model';
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
@@ -34,7 +33,7 @@ import { CollectionElementLinkType } from '../object-collection/collection-eleme
import { environment } from 'src/environments/environment';
import { SubmissionObject } from '../../core/submission/models/submission-object.model';
import { SearchFilterConfig } from './models/search-filter-config.model';
import { WorkspaceItem } from '../..//core/submission/models/workspaceitem.model';
import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
@@ -46,6 +45,7 @@ import { ThemedSearchResultsComponent } from './search-results/themed-search-res
import { ViewModeSwitchComponent } from '../view-mode-switch/view-mode-switch.component';
import { PageWithSidebarComponent } from '../sidebar/page-with-sidebar.component';
import { NgIf, NgTemplateOutlet, AsyncPipe } from '@angular/common';
import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search',

2
src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
View File

@@ -13,7 +13,6 @@ import { FormBuilderService } from '../../../../../shared/form/builder/form-buil
import { SubmissionServiceStub } from '../../../../../shared/testing/submission-service.stub';
import { SubmissionService } from '../../../../submission.service';
import { SubmissionSectionUploadFileEditComponent } from './section-upload-file-edit.component';
import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
import {
mockFileFormData,
mockSubmissionCollectionId,
@@ -53,6 +52,7 @@ import {
import { APP_CONFIG } from '../../../../../../config/app-config.interface';
import { environment } from '../../../../../../environments/environment.test';
import { NgxMaskModule } from 'ngx-mask';
import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload-constants';
function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {

2
src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
View File

@@ -31,7 +31,6 @@ import {
BITSTREAM_METADATA_FORM_GROUP_CONFIG,
BITSTREAM_METADATA_FORM_GROUP_LAYOUT
} from './section-upload-file-edit.model';
import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
import { hasNoValue, hasValue, isNotEmpty, isNotNull } from '../../../../../shared/empty.util';
import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model';
import { FormFieldModel } from '../../../../../shared/form/builder/models/form-field.model';
@@ -59,6 +58,7 @@ import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/mi
import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
import { NgIf } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload-constants';
/**
* This component represents the edit form for bitstream

2
src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
View File

@@ -27,7 +27,6 @@ import { SubmissionService } from '../../../submission.service';
import { SectionUploadService } from '../section-upload.service';
import { createTestComponent } from '../../../../shared/testing/utils.test';
import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
import { POLICY_DEFAULT_WITH_LIST } from '../section-upload.component';
import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
import { getMockSectionUploadService } from '../../../../shared/mocks/section-upload.service.mock';
import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
@@ -35,6 +34,7 @@ import { FormBuilderService } from '../../../../shared/form/builder/form-builder
import { SubmissionSectionUploadFileViewComponent } from './view/section-upload-file-view.component';
import { ThemeService } from '../../../../shared/theme-support/theme.service';
import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
import { POLICY_DEFAULT_WITH_LIST } from '../section-upload-constants';

2
src/app/submission/sections/upload/section-upload-constants.ts Normal file
View File

@@ -0,0 +1,2 @@
export const POLICY_DEFAULT_NO_LIST = 1; // Banner1
export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2

4
src/app/submission/sections/upload/section-upload.component.ts
View File

@@ -31,9 +31,7 @@ import {
import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
import { AlertComponent } from '../../../shared/alert/alert.component';
import { TranslateModule } from '@ngx-translate/core';
export const POLICY_DEFAULT_NO_LIST = 1; // Banner1
export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2
import { POLICY_DEFAULT_NO_LIST, POLICY_DEFAULT_WITH_LIST } from './section-upload-constants';
export interface AccessConditionGroupsMapEntry {
accessCondition: string;

8
src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
View File

@@ -1,10 +1,12 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { pushInOut } from '../../../../app/shared/animations/push';
import {
MyDSpacePageComponent as BaseComponent,
SEARCH_CONFIG_SERVICE
MyDSpacePageComponent as BaseComponent
} from '../../../../app/my-dspace-page/my-dspace-page.component';
import { MyDSpaceConfigurationService } from '../../../../app/my-dspace-page/my-dspace-configuration.service';
import {
MyDSpaceConfigurationService,
SEARCH_CONFIG_SERVICE
} from '../../../../app/my-dspace-page/my-dspace-configuration.service';
import { ThemedSearchComponent } from '../../../../app/shared/search/themed-search.component';
import {
MyDSpaceNewSubmissionComponent

2
src/themes/custom/app/search-page/configuration-search-page.component.ts
View File

@@ -1,6 +1,5 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { pushInOut } from '../../../../app/shared/animations/push';
import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service';
import {
ConfigurationSearchPageComponent as BaseComponent
@@ -17,6 +16,7 @@ import {
import { ThemedSearchFormComponent } from '../../../../app/shared/search-form/themed-search-form.component';
import { SearchLabelsComponent } from '../../../../app/shared/search/search-labels/search-labels.component';
import { TranslateModule } from '@ngx-translate/core';
import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-configuration-search-page',

2
src/themes/custom/app/search-page/search-page.component.ts
View File

@@ -1,8 +1,8 @@
import { Component } from '@angular/core';
import { SearchPageComponent as BaseComponent } from '../../../../app/search-page/search-page.component';
import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service';
import { ThemedSearchComponent } from '../../../../app/shared/search/themed-search.component';
import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-search-page',

2
src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
View File

@@ -2,7 +2,6 @@ import {
DsDynamicLookupRelationExternalSourceTabComponent as BaseComponent
} from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
import { Component } from '@angular/core';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component';
import {
SearchConfigurationService
} from '../../../../../../../../../app/core/shared/search/search-configuration.service';
@@ -21,6 +20,7 @@ import { AsyncPipe, NgIf } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core';
import { ErrorComponent } from '../../../../../../../../../app/shared/error/error.component';
import { ThemedLoadingComponent } from '../../../../../../../../../app/shared/loading/themed-loading.component';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-dynamic-lookup-relation-external-source-tab',

2
src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
View File

@@ -2,7 +2,6 @@ import {
DsDynamicLookupRelationSearchTabComponent as BaseComponent
} from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
import { Component } from '@angular/core';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component';
import {
SearchConfigurationService
} from '../../../../../../../../../app/core/shared/search/search-configuration.service';
@@ -11,6 +10,7 @@ import { VarDirective } from '../../../../../../../../../app/shared/utils/var.di
import { TranslateModule } from '@ngx-translate/core';
import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
import { ThemedSearchComponent } from '../../../../../../../../../app/shared/search/themed-search.component';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-configuration.service';
@Component({
selector: 'ds-dynamic-lookup-relation-search-tab',

2
src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
View File

@@ -9,7 +9,6 @@ import { Component } from '@angular/core';
import {
SearchFiltersComponent as BaseComponent,
} from '../../../../../../app/shared/search/search-filters/search-filters.component';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
import { AsyncPipe, NgFor, NgIf } from '@angular/common';
import {
@@ -17,6 +16,7 @@ import {
} from '../../../../../../app/shared/search/search-filters/search-filter/search-filter.component';
import { RouterLink } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service';
@Component({

2
src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
View File

@@ -9,7 +9,6 @@ import { Component } from '@angular/core';
import {
SearchSettingsComponent as BaseComponent,
} from '../../../../../../app/shared/search/search-settings/search-settings.component';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
import { NgFor, NgIf } from '@angular/common';
import { SidebarDropdownComponent } from '../../../../../../app/shared/sidebar/sidebar-dropdown.component';
@@ -18,6 +17,7 @@ import {
PageSizeSelectorComponent
} from '../../../../../../app/shared/page-size-selector/page-size-selector.component';
import { TranslateModule } from '@ngx-translate/core';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service';
@Component({

2
src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
View File

@@ -9,7 +9,6 @@ import { Component } from '@angular/core';
import {
SearchSidebarComponent as BaseComponent,
} from '../../../../../../app/shared/search/search-sidebar/search-sidebar.component';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
import { NgIf } from '@angular/common';
import { ViewModeSwitchComponent } from '../../../../../../app/shared/view-mode-switch/view-mode-switch.component';
@@ -23,6 +22,7 @@ import {
ThemedSearchSettingsComponent
} from '../../../../../../app/shared/search/search-settings/themed-search-settings.component';
import { TranslateModule } from '@ngx-translate/core';
import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service';
@Component({