refac

src/app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { VocabularyTreeviewComponent } from '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component';
+import { VocabularyTreeviewComponent } from '../vocabulary-treeview/vocabulary-treeview.component';
 import { filter, map, startWith } from 'rxjs/operators';
-import { PageInfo } from '../../../../../app/core/shared/page-info.model';
+import { PageInfo } from '../../core/shared/page-info.model';
 import { lowerCase } from 'lodash';
 
 /**
@@ -10,10 +10,10 @@ import { lowerCase } from 'lodash';
  */
 @Component({
   selector: 'ds-okr-vocabulary-treeview',
-  templateUrl: '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.html',
+  templateUrl: '../vocabulary-treeview/vocabulary-treeview.component.html',
   styleUrls: [
     './okr-vocabulary-treeview.component.scss',
-    '../../../../../app/shared/vocabulary-treeview/vocabulary-treeview.component.scss',
+    '../vocabulary-treeview/vocabulary-treeview.component.scss',
   ]
 })
 export class OkrVocabularyTreeviewComponent extends VocabularyTreeviewComponent {

src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.spec.ts

@@ -2,27 +2,27 @@ import { OkrSearchHierarchyFilterComponent } from './okr-search-hierarchy-filter
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { DebugElement, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
-import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service';
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../../../../../../app/core/data/remote-data';
+import { RemoteData } from '../../../../../core/data/remote-data';
-import { RequestEntryState } from '../../../../../../../../app/core/data/request.reducer';
+import { RequestEntryState } from '../../../../../core/data/request.reducer';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterStub } from '../../../../../../../../app/shared/testing/router.stub';
+import { RouterStub } from '../../../../testing/router.stub';
-import { buildPaginatedList } from '../../../../../../../../app/core/data/paginated-list.model';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { CommonModule } from '@angular/common';
-import { SearchService } from '../../../../../../../../app/core/shared/search/search.service';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   SearchFilterService
-} from '../../../../../../../../app/core/shared/search/search-filter.service';
+} from '../../../../../core/shared/search/search-filter.service';
-import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service';
+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 '../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationServiceStub } from '../../../../../../../../app/shared/testing/search-configuration-service.stub';
+import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
-import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model';
 import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model';
 

src/app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component.ts

@@ -1,28 +1,28 @@
 import { Component, Inject } from '@angular/core';
-import { renderFacetFor } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-filter-type-decorator';
+import { renderFacetFor } from '../search-filter-type-decorator';
-import { FilterType } from '../../../../../../../../app/shared/search/filter-type.model';
+import { FilterType } from '../../../models/filter-type.model';
-import { facetLoad } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component';
+import { facetLoad } from '../search-facet-filter/search-facet-filter.component';
-import { SearchHierarchyFilterComponent } from '../../../../../../../../app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
+import { SearchHierarchyFilterComponent } from '../search-hierarchy-filter/search-hierarchy-filter.component';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { OkrVocabularyTreeviewComponent } from '../../../../okr-vocabulary-treeview/okr-vocabulary-treeview.component';
-import { VocabularyEntryDetail } from '../../../../../../../../app/core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { SearchService } from '../../../../../../../../app/core/shared/search/search.service';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   SearchFilterService
-} from '../../../../../../../../app/core/shared/search/search-filter.service';
+} from '../../../../../core/shared/search/search-filter.service';
 import { Router } from '@angular/router';
-import { RemoteDataBuildService } from '../../../../../../../../app/core/cache/builders/remote-data-build.service';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../../../../app/core/shared/search/search-configuration.service';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { SearchFilterConfig } from '../../../../../../../../app/shared/search/search-filter-config.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { FacetValue } from '../../../../../../../../app/shared/search/facet-value.model';
+import { FacetValue } from '../../../models/facet-value.model';
-import { getFacetValueForType } from '../../../../../../../../app/shared/search/search.utils';
+import { getFacetValueForType } from '../../../search.utils';
 import { filter, map, take } from 'rxjs/operators';
-import { VocabularyService } from '../../../../../../../../app/core/submission/vocabularies/vocabulary.service';
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { Observable } from 'rxjs';
-import { PageInfo } from '../../../../../../../../app/core/shared/page-info.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 
 /**
  * Component that represents a hierarchy facet for a specific filter configuration.

src/app/shared/search/search.module.ts

@@ -28,6 +28,9 @@ import { MissingTranslationHelper } from '../translate/missing-translation.helpe
 import { SharedModule } from '../shared.module';
 import { SearchResultsComponent } from './search-results/search-results.component';
 import { SearchComponent } from './search.component';
+import {
+  OkrSearchHierarchyFilterComponent
+} from './search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component';
 
 const COMPONENTS = [
   SearchComponent,
@@ -50,7 +53,8 @@ const COMPONENTS = [
   SearchAuthorityFilterComponent,
   SearchSwitchConfigurationComponent,
   ConfigurationSearchPageComponent,
-  ThemedConfigurationSearchPageComponent
+  ThemedConfigurationSearchPageComponent,
+  OkrSearchHierarchyFilterComponent
 ];
 
 const ENTRY_COMPONENTS = [

src/app/shared/shared.module.ts

@@ -177,6 +177,10 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/
 import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
 import { DsSelectComponent } from './ds-select/ds-select.component';
 import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
+import { OkrVocabularyTreeviewComponent } from './okr-vocabulary-treeview/okr-vocabulary-treeview.component';
+import {
+  OkrSearchHierarchyFilterComponent
+} from './search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -346,6 +350,7 @@ const COMPONENTS = [
   CommunitySidebarSearchListElementComponent,
   SearchNavbarComponent,
   ScopeSelectorModalComponent,
+  OkrVocabularyTreeviewComponent
 ];
 
 const ENTRY_COMPONENTS = [

src/assets/i18n/en.json5

@@ -4162,5 +4162,29 @@
 
   "idle-modal.log-out": "Log out",
 
-  "idle-modal.extend-session": "Extend session"
+  "idle-modal.extend-session": "Extend session",
+
+  "search.filters.filter.show-tree": "Browse {{ name }} tree",
+
+  "search.filters.filter.supportedlanguage.placeholder": "Supported Language",
+
+  "search.filters.filter.supportedlanguage.label": "Search supported Language",
+
+  "search.filters.filter.topic.placeholder": "Topic",
+
+  "search.filters.filter.topic.label": "Search topic",
+
+  "search.filters.filter.doctype.placeholder": "Document type",
+
+  "search.filters.filter.doctype.label": "Search document type",
+
+  "search.filters.filter.region.placeholder": "Region",
+
+  "search.filters.filter.region.label": "Search region",
+
+  "search.filters.filter.country.placeholder": "Country",
+
+  "search.filters.filter.country.label": "Search country",
+
+  "okr-vocabulary-treeview.info": "Click a {{ type }} to add a search filter",
 }

src/themes/okr/entry-components.ts

@@ -1,63 +0,0 @@
-import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
-import { ItemSearchResultListElementComponent } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { PersonSearchResultListElementComponent } from './app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component';
-import { JournalSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component';
-import { JournalIssueSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component';
-import { JournalVolumeSearchResultListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component';
-import { CitationsSectionComponent } from './app/item-page/field-components/citation/citations-section.component';
-import { CcIconsComponent } from './app/item-page/field-components/cc-icons/cc-icons.component';
-import { AltmetricDonutComponent } from './app/item-page/field-components/citation/altmetric-donut/altmetric-donut.component';
-import { ItemPageWbDateFieldComponent } from './app/item-page/field-components/specific-field/wb-date/item-page-wb-date-field.component';
-import { ItemPageWbGenericWithFallbackComponent } from './app/item-page/field-components/specific-field/wb-generic-with-fallback/item-page-wb-generic-with-fallback.component';
-import { ItemPageWbExternalContentComponent } from './app/item-page/field-components/specific-field/wb-external-content/item-page-wb-external-content.component';
-import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
-import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
-import { JournalIssueComponent } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
-import { JournalVolumeComponent } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
-import { JournalVolumeGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component';
-import { JournalVolumeSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
-import { JournalIssueSearchResultGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
-import { JournalIssueGridElementComponent } from './app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component';
-import { JournalVolumeSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
-import { JournalIssueSidebarSearchListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
-import { JournalIssueListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component';
-import { JournalVolumeListElementComponent } from './app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component';
-import { FeaturedPublicationsListElementComponent } from './app/featured-publications/featured-publications-list-element/featured-publications-list-element.component';
-import { ClaimedTaskActionsMarkDuplicateComponent } from './app/shared/mydspace-actions/claimed-task/mark-duplicate/claimed-task-actions-mark-duplicate.component';
-import { ClaimedTaskActionsReportProblemComponent } from './app/shared/mydspace-actions/claimed-task/report-problem/claimed-task-actions-report-problem.component';
-import { SingleStatletTableComponent } from './app/atmire-cua/statlets/shared/single-statlet/graph-types/single-statlet-table/single-statlet-table.component';
-import { OkrSearchHierarchyFilterComponent } from './app/shared/search/search-filters/search-filter/okr-search-hierarchy-filter/okr-search-hierarchy-filter.component';
-import { OkrVocabularyTreeviewComponent } from './app/shared/okr-vocabulary-treeview/okr-vocabulary-treeview.component';
-
-export const ENTRY_COMPONENTS = [
-  PublicationComponent,
-  ItemSearchResultListElementComponent,
-  PersonSearchResultListElementComponent,
-  JournalSearchResultListElementComponent,
-  JournalVolumeSearchResultListElementComponent,
-  JournalIssueSearchResultListElementComponent,
-  UntypedItemComponent,
-  AltmetricDonutComponent,
-  CitationsSectionComponent,
-  CcIconsComponent,
-  ItemPageWbDateFieldComponent,
-  ItemPageWbGenericWithFallbackComponent,
-  ItemPageWbExternalContentComponent,
-  JournalComponent,
-  JournalIssueComponent,
-  JournalVolumeComponent,
-  JournalVolumeGridElementComponent,
-  JournalVolumeSearchResultGridElementComponent,
-  JournalIssueSearchResultGridElementComponent,
-  JournalIssueGridElementComponent,
-  JournalVolumeSidebarSearchListElementComponent,
-  JournalIssueSidebarSearchListElementComponent,
-  JournalIssueListElementComponent,
-  JournalVolumeListElementComponent,
-  FeaturedPublicationsListElementComponent,
-  ClaimedTaskActionsMarkDuplicateComponent,
-  ClaimedTaskActionsReportProblemComponent,
-  SingleStatletTableComponent,
-  OkrSearchHierarchyFilterComponent,
-  OkrVocabularyTreeviewComponent,
-];