Merge branch 'master' into w2p-70136_workflow-search-ui

This commit is contained in:
lotte
2020-04-09 11:42:09 +02:00
160 changed files with 8941 additions and 871 deletions

View File

@@ -184,9 +184,14 @@ import { LogInContainerComponent } from './log-in/container/log-in-container.com
import { LogInShibbolethComponent } from './log-in/methods/shibboleth/log-in-shibboleth.component';
import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
import { LogInComponent } from './log-in/log-in.component';
import { CustomSwitchComponent } from './form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component';
import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
import { MissingTranslationHelper } from './translate/missing-translation.helper';
import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-versions-notice.component';
import { ModifyItemOverviewComponent } from '../+item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
import { ClaimedTaskActionsLoaderComponent } from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
import { ClaimedTaskActionsEditMetadataComponent } from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
const MODULES = [
// Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -292,6 +297,8 @@ const COMPONENTS = [
ClaimedTaskActionsApproveComponent,
ClaimedTaskActionsRejectComponent,
ClaimedTaskActionsReturnToPoolComponent,
ClaimedTaskActionsEditMetadataComponent,
ClaimedTaskActionsLoaderComponent,
ItemActionsComponent,
PoolTaskActionsComponent,
WorkflowitemActionsComponent,
@@ -346,6 +353,9 @@ const COMPONENTS = [
AbstractTrackableComponent,
ComcolMetadataComponent,
ItemTypeBadgeComponent,
BrowseByComponent,
AbstractTrackableComponent,
CustomSwitchComponent,
ItemSelectComponent,
CollectionSelectComponent,
MetadataRepresentationLoaderComponent,
@@ -406,6 +416,7 @@ const ENTRY_COMPONENTS = [
PlainTextMetadataListElementComponent,
ItemMetadataListElementComponent,
MetadataRepresentationListElementComponent,
CustomSwitchComponent,
ItemMetadataRepresentationListElementComponent,
SearchResultsComponent,
CollectionSearchResultGridElementComponent,
@@ -426,7 +437,12 @@ const ENTRY_COMPONENTS = [
LogInPasswordComponent,
LogInShibbolethComponent,
ItemVersionsComponent,
ItemVersionsNoticeComponent
BundleListElementComponent,
ItemVersionsNoticeComponent,
ClaimedTaskActionsApproveComponent,
ClaimedTaskActionsRejectComponent,
ClaimedTaskActionsReturnToPoolComponent,
ClaimedTaskActionsEditMetadataComponent
];
const SHARED_ITEM_PAGE_COMPONENTS = [
@@ -454,7 +470,8 @@ const DIRECTIVES = [
AutoFocusDirective,
RoleDirective,
MetadataRepresentationDirective,
ListableObjectDirective
ListableObjectDirective,
ClaimedTaskActionsDirective
];
@NgModule({