Finished removing results button from shared.module

This commit is contained in:
Michael Spalti
2022-12-21 12:54:31 -08:00
parent 10841aac90
commit 6a1f81280b
6 changed files with 14 additions and 11 deletions

View File

@@ -20,6 +20,7 @@ import { JournalVolumeSidebarSearchListElementComponent } from './item-list-elem
import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component'; import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
import { JournalSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component'; import { JournalSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component';
import { ItemSharedModule } from '../../item-page/item-shared.module'; import { ItemSharedModule } from '../../item-page/item-shared.module';
import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
const ENTRY_COMPONENTS = [ const ENTRY_COMPONENTS = [
// put only entry components that use custom decorator // put only entry components that use custom decorator
@@ -47,7 +48,8 @@ const ENTRY_COMPONENTS = [
imports: [ imports: [
CommonModule, CommonModule,
ItemSharedModule, ItemSharedModule,
SharedModule SharedModule,
ResultsBackButtonModule
], ],
declarations: [ declarations: [
...ENTRY_COMPONENTS ...ENTRY_COMPONENTS

View File

@@ -29,6 +29,7 @@ import { OrgUnitSidebarSearchListElementComponent } from './item-list-elements/s
import { PersonSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component'; import { PersonSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component';
import { ProjectSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component'; import { ProjectSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component';
import { ItemSharedModule } from '../../item-page/item-shared.module'; import { ItemSharedModule } from '../../item-page/item-shared.module';
import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
const ENTRY_COMPONENTS = [ const ENTRY_COMPONENTS = [
// put only entry components that use custom decorator // put only entry components that use custom decorator
@@ -69,7 +70,8 @@ const COMPONENTS = [
CommonModule, CommonModule,
ItemSharedModule, ItemSharedModule,
SharedModule, SharedModule,
NgbTooltipModule NgbTooltipModule,
ResultsBackButtonModule
], ],
declarations: [ declarations: [
...COMPONENTS, ...COMPONENTS,

View File

@@ -47,6 +47,7 @@ import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component'; import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
import { OrcidQueueComponent } from './orcid-page/orcid-queue/orcid-queue.component'; import { OrcidQueueComponent } from './orcid-page/orcid-queue/orcid-queue.component';
import { UploadModule } from '../shared/upload/upload.module'; import { UploadModule } from '../shared/upload/upload.module';
import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
const ENTRY_COMPONENTS = [ const ENTRY_COMPONENTS = [
@@ -96,6 +97,7 @@ const DECLARATIONS = [
ResearchEntitiesModule.withEntryComponents(), ResearchEntitiesModule.withEntryComponents(),
NgxGalleryModule, NgxGalleryModule,
NgbAccordionModule, NgbAccordionModule,
ResultsBackButtonModule,
UploadModule UploadModule
], ],
declarations: [ declarations: [

View File

@@ -7,7 +7,6 @@ import { TranslateModule } from '@ngx-translate/core';
import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/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 { 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 { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
const COMPONENTS = [ const COMPONENTS = [
RelatedEntitiesSearchComponent, RelatedEntitiesSearchComponent,
@@ -22,8 +21,7 @@ const COMPONENTS = [
CommonModule, CommonModule,
SearchModule, SearchModule,
SharedModule, SharedModule,
TranslateModule, TranslateModule
ResultsBackButtonModule
], ],
exports: [ exports: [
...COMPONENTS ...COMPONENTS

View File

@@ -2,18 +2,20 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { ResultsBackButtonComponent } from './results-back-button.component'; import { ResultsBackButtonComponent } from './results-back-button.component';
import { ThemedResultsBackButtonComponent } from './themed-results-back-button.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
ResultsBackButtonComponent ResultsBackButtonComponent,
ThemedResultsBackButtonComponent
], ],
imports: [ imports: [
CommonModule, CommonModule,
TranslateModule TranslateModule
], ],
exports: [ exports: [
ResultsBackButtonComponent ResultsBackButtonComponent,
ThemedResultsBackButtonComponent
] ]
}) })
export class ResultsBackButtonModule { export class ResultsBackButtonModule {

View File

@@ -314,7 +314,6 @@ import { MenuModule } from './menu/menu.module';
import { import {
ListableNotificationObjectComponent ListableNotificationObjectComponent
} from './object-list/listable-notification-object/listable-notification-object.component'; } from './object-list/listable-notification-object/listable-notification-object.component';
import { ThemedResultsBackButtonComponent } from './results-back-button/themed-results-back-button.component';
import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component'; import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
@@ -396,7 +395,6 @@ const COMPONENTS = [
ItemSubmitterComponent, ItemSubmitterComponent,
ItemDetailPreviewComponent, ItemDetailPreviewComponent,
ItemDetailPreviewFieldComponent, ItemDetailPreviewFieldComponent,
ThemedResultsBackButtonComponent,
ClaimedTaskActionsComponent, ClaimedTaskActionsComponent,
ClaimedTaskActionsLoaderComponent, ClaimedTaskActionsLoaderComponent,
ItemActionsComponent, ItemActionsComponent,
@@ -406,7 +404,6 @@ const COMPONENTS = [
ViewModeSwitchComponent, ViewModeSwitchComponent,
TruncatableComponent, TruncatableComponent,
TruncatablePartComponent, TruncatablePartComponent,
// BrowseByComponent,
InputSuggestionsComponent, InputSuggestionsComponent,
FilterInputSuggestionsComponent, FilterInputSuggestionsComponent,
ValidationSuggestionsComponent, ValidationSuggestionsComponent,