diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 8bda44b11c..4553ba16bf 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -17,7 +17,6 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
import { PaginationService } from '../../core/pagination/pagination.service';
import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
import {
ListableObjectComponentLoaderComponent
} from '../object-collection/shared/listable-object/listable-object-component-loader.component';
@@ -37,7 +36,6 @@ import { HostWindowServiceStub } from '../testing/host-window-service.stub';
import { HostWindowService } from '../host-window.service';
import { RouteService } from '../../core/services/route.service';
import { routeServiceStub } from '../testing/route-service.stub';
-import SpyObj = jasmine.SpyObj;
import { GroupDataService } from '../../core/eperson/group-data.service';
import { createPaginatedList } from '../testing/utils.test';
import { LinkHeadService } from '../../core/services/link-head.service';
@@ -45,6 +43,7 @@ import { ConfigurationDataService } from '../../core/data/configuration-data.ser
import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { getMockThemeService } from '../mocks/theme-service.mock';
@listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'custom')
@Component({
@@ -107,13 +106,10 @@ describe('BrowseByComponent', () => {
});
const paginationService = new PaginationServiceStub(paginationConfig);
- let themeService: SpyObj;
+ let themeService;
beforeEach(waitForAsync(() => {
- themeService = jasmine.createSpyObj('themeService', {
- getThemeName: 'dspace',
- getThemeName$: observableOf('dspace'),
- });
+ themeService = getMockThemeService('dspace');
TestBed.configureTestingModule({
imports: [
CommonModule,
@@ -142,19 +138,16 @@ describe('BrowseByComponent', () => {
],
schemas: [NO_ERRORS_SCHEMA]
}).compileComponents();
- }));
-
- beforeEach(() => {
fixture = TestBed.createComponent(BrowseByComponent);
comp = fixture.componentInstance;
comp.paginationConfig = paginationConfig;
fixture.detectChanges();
- });
+ }));
it('should display a loading message when objects is empty', () => {
(comp as any).objects = undefined;
fixture.detectChanges();
- expect(fixture.debugElement.query(By.css('ds-loading'))).toBeDefined();
+ expect(fixture.debugElement.query(By.css('ds-themed-loading'))).toBeDefined();
});
it('should display results when objects is not empty', () => {
@@ -247,10 +240,12 @@ describe('BrowseByComponent', () => {
});
describe('back', () => {
it('should navigate back to the main browse page', () => {
+ const id = 'test-pagination';
comp.back();
- expect(paginationService.updateRoute).toHaveBeenCalledWith('test-pagination', {page: 1}, {
+ expect(paginationService.updateRoute).toHaveBeenCalledWith(id, {page: 1}, {
value: null,
- startsWith: null
+ startsWith: null,
+ [id + '.return']: null
});
});
});
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 1132b41124..79edf39096 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -1,10 +1,10 @@
-import { Component, EventEmitter, Injector, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output } from '@angular/core';
import { RemoteData } from '../../core/data/remote-data';
import { PaginatedList } from '../../core/data/paginated-list.model';
import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
import { fadeIn, fadeInOut } from '../animations/fade';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
import { ListableObject } from '../object-collection/shared/listable-object.model';
import { getStartsWithComponent, StartsWithType } from '../starts-with/starts-with-decorator';
import { PaginationService } from '../../core/pagination/pagination.service';
@@ -25,7 +25,7 @@ import { hasValue } from '../empty.util';
/**
* Component to display a browse-by page for any ListableObject
*/
-export class BrowseByComponent implements OnInit {
+export class BrowseByComponent implements OnInit, OnDestroy {
/**
* ViewMode that should be passed to {@link ListableObjectComponentLoaderComponent}.
@@ -112,6 +112,16 @@ export class BrowseByComponent implements OnInit {
*/
shouldDisplayResetButton$: Observable;
+ /**
+ * Page number of the previous page
+ */
+ previousPage$ = new BehaviorSubject('1');
+
+ /**
+ * Subscription that has to be unsubscribed from on destroy
+ */
+ sub: Subscription;
+
public constructor(private injector: Injector,
protected paginationService: PaginationService,
private routeService: RouteService,
@@ -171,9 +181,20 @@ export class BrowseByComponent implements OnInit {
this.shouldDisplayResetButton$ = observableCombineLatest([startsWith$, value$]).pipe(
map(([startsWith, value]) => hasValue(startsWith) || hasValue(value))
);
+ this.sub = this.routeService.getQueryParameterValue(this.paginationConfig.id + '.return').subscribe(this.previousPage$);
}
+ /**
+ * Navigate back to the previous browse by page
+ */
back() {
- this.paginationService.updateRoute(this.paginationConfig.id, {page: 1}, {value: null, startsWith: null});
+ const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
+ this.paginationService.updateRoute(this.paginationConfig.id, {page: page}, {[this.paginationConfig.id + '.return']: null, value: null, startsWith: null});
+ }
+
+ ngOnDestroy(): void {
+ if (this.sub) {
+ this.sub.unsubscribe();
+ }
}
}
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 87337d9084..db6c1fb41d 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -35,8 +35,8 @@
-
-
+
+
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index 905186a232..1b21521d95 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -13,7 +13,7 @@
-
+
{{'comcol-role.edit.no-group' | translate}}
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
index b3ca75bf94..552854a0c0 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
@@ -1,4 +1,4 @@
{{ title | translate }}
-
+
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index 4e6370f179..638d465864 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -63,6 +63,11 @@ export class BrowserKlaroService extends KlaroService {
* - Add and translate klaro configuration messages
*/
initialize() {
+ if (!environment.info.enablePrivacyStatement) {
+ delete this.klaroConfig.privacyPolicy;
+ this.klaroConfig.translations.en.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
+ }
+
this.translateService.setDefaultLang(environment.defaultLanguage);
const user$: Observable
= this.getUser$();
@@ -90,7 +95,6 @@ export class BrowserKlaroService extends KlaroService {
this.translateConfiguration();
Klaro.setup(this.klaroConfig);
});
-
}
/**
diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index 1c87e46309..659583ad87 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -24,7 +24,7 @@ export const klaroConfiguration: any = {
/*
Setting 'hideLearnMore' to 'true' will hide the "learn more / customize" link in
the consent notice. We strongly advise against using this under most
- circumstances, as it keeps the user from customizing his/her consent choices.
+ circumstances, as it keeps the user from customizing their consent choices.
*/
hideLearnMore: false,
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
index e8b7d689a3..8b13789179 100644
--- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
+++ b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
@@ -1,3 +1 @@
-.btn-dark {
- background-color: var(--ds-admin-sidebar-bg);
-}
+
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html
new file mode 100644
index 0000000000..305900ae33
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html
@@ -0,0 +1,6 @@
+;
+
+ let authorizationService: AuthorizationDataService;
+ let dso: DSpaceObject;
+
+ beforeEach(waitForAsync(() => {
+ dso = Object.assign(new Item(), {
+ id: 'test-item',
+ _links: {
+ self: { href: 'test-item-selflink' }
+ }
+ });
+ authorizationService = jasmine.createSpyObj('authorizationService', {
+ isAuthorized: observableOf(true)
+ });
+ TestBed.configureTestingModule({
+ declarations: [DsoPageOrcidButtonComponent],
+ imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
+ providers: [
+ { provide: AuthorizationDataService, useValue: authorizationService }
+ ]
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DsoPageOrcidButtonComponent);
+ component = fixture.componentInstance;
+ component.dso = dso;
+ component.pageRoute = 'test';
+ fixture.detectChanges();
+ });
+
+ it('should check the authorization of the current user', () => {
+ expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanSynchronizeWithORCID, dso.self);
+ });
+
+ describe('when the user is authorized', () => {
+ beforeEach(() => {
+ (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true));
+ component.ngOnInit();
+ fixture.detectChanges();
+ });
+
+ it('should render a link', () => {
+ const link = fixture.debugElement.query(By.css('a'));
+ expect(link).not.toBeNull();
+ });
+ });
+
+ describe('when the user is not authorized', () => {
+ beforeEach(() => {
+ (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+ component.ngOnInit();
+ fixture.detectChanges();
+ });
+
+ it('should not render a link', () => {
+ const link = fixture.debugElement.query(By.css('a'));
+ expect(link).toBeNull();
+ });
+ });
+});
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts
new file mode 100644
index 0000000000..c345d8cbdc
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts
@@ -0,0 +1,39 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+import { BehaviorSubject } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+
+@Component({
+ selector: 'ds-dso-page-orcid-button',
+ templateUrl: './dso-page-orcid-button.component.html',
+ styleUrls: ['./dso-page-orcid-button.component.scss']
+})
+export class DsoPageOrcidButtonComponent implements OnInit {
+ /**
+ * The DSpaceObject to display a button to the edit page for
+ */
+ @Input() dso: DSpaceObject;
+
+ /**
+ * The prefix of the route to the edit page (before the object's UUID, e.g. "items")
+ */
+ @Input() pageRoute: string;
+
+ /**
+ * Whether or not the current user is authorized to edit the DSpaceObject
+ */
+ isAuthorized: BehaviorSubject = new BehaviorSubject(false);
+
+ constructor(protected authorizationService: AuthorizationDataService) { }
+
+ ngOnInit() {
+ this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, this.dso.self).pipe(take(1)).subscribe((isAuthorized: boolean) => {
+ this.isAuthorized.next(isAuthorized);
+ });
+ }
+
+}
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html
index 12d5d2b47d..c4bba286bf 100644
--- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html
+++ b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html
@@ -1 +1,7 @@
- {{"item.page.claim.button" | translate }}
+
+ {{'item.page.claim.button' | translate }}
+
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index 198da8d3ed..8abb8ad558 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -31,7 +31,7 @@
-
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
index f6b3581df5..df3e4f095c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
@@ -20,6 +20,7 @@ import {
createSuccessfulRemoteDataObject$
} from '../../../remote-data.utils';
import { ExportMetadataSelectorComponent } from './export-metadata-selector.component';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
// No way to add entryComponents yet to testbed; alternative implemented; source: https://stackoverflow.com/questions/41689468/how-to-shallow-test-a-component-with-an-entrycomponents
@NgModule({
@@ -47,6 +48,7 @@ describe('ExportMetadataSelectorComponent', () => {
let router;
let notificationService: NotificationsServiceStub;
let scriptService;
+ let authorizationDataService;
const mockItem = Object.assign(new Item(), {
id: 'fake-id',
@@ -95,6 +97,9 @@ describe('ExportMetadataSelectorComponent', () => {
invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
}
);
+ authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
+ isAuthorized: observableOf(true)
+ });
TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ModelTestModule],
declarations: [ExportMetadataSelectorComponent],
@@ -102,6 +107,7 @@ describe('ExportMetadataSelectorComponent', () => {
{ provide: NgbActiveModal, useValue: modalStub },
{ provide: NotificationsService, useValue: notificationService },
{ provide: ScriptDataService, useValue: scriptService },
+ { provide: AuthorizationDataService, useValue: authorizationDataService },
{
provide: ActivatedRoute,
useValue: {
@@ -150,7 +156,7 @@ describe('ExportMetadataSelectorComponent', () => {
});
});
- describe('if collection is selected', () => {
+ describe('if collection is selected and is admin', () => {
let scriptRequestSucceeded;
beforeEach((done) => {
spyOn((component as any).modalService, 'open').and.returnValue(modalRef);
@@ -159,7 +165,32 @@ describe('ExportMetadataSelectorComponent', () => {
done();
});
});
- it('should invoke the metadata-export script with option -i uuid', () => {
+ it('should invoke the metadata-export script with option -i uuid and -a option', () => {
+ const parameterValues: ProcessParameter[] = [
+ Object.assign(new ProcessParameter(), { name: '-i', value: mockCollection.uuid }),
+ Object.assign(new ProcessParameter(), { name: '-a' }),
+ ];
+ expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_EXPORT_SCRIPT_NAME, parameterValues, []);
+ });
+ it('success notification is shown', () => {
+ expect(scriptRequestSucceeded).toBeTrue();
+ expect(notificationService.success).toHaveBeenCalled();
+ });
+ it('redirected to process page', () => {
+ expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/45');
+ });
+ });
+ describe('if collection is selected and is not admin', () => {
+ let scriptRequestSucceeded;
+ beforeEach((done) => {
+ (authorizationDataService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+ spyOn((component as any).modalService, 'open').and.returnValue(modalRef);
+ component.navigate(mockCollection).subscribe((succeeded: boolean) => {
+ scriptRequestSucceeded = succeeded;
+ done();
+ });
+ });
+ it('should invoke the metadata-export script with option -i uuid without the -a option', () => {
const parameterValues: ProcessParameter[] = [
Object.assign(new ProcessParameter(), { name: '-i', value: mockCollection.uuid }),
];
@@ -174,7 +205,7 @@ describe('ExportMetadataSelectorComponent', () => {
});
});
- describe('if community is selected', () => {
+ describe('if community is selected and is an admin', () => {
let scriptRequestSucceeded;
beforeEach((done) => {
spyOn((component as any).modalService, 'open').and.returnValue(modalRef);
@@ -183,7 +214,32 @@ describe('ExportMetadataSelectorComponent', () => {
done();
});
});
- it('should invoke the metadata-export script with option -i uuid', () => {
+ it('should invoke the metadata-export script with option -i uuid and -a option if the user is an admin', () => {
+ const parameterValues: ProcessParameter[] = [
+ Object.assign(new ProcessParameter(), { name: '-i', value: mockCommunity.uuid }),
+ Object.assign(new ProcessParameter(), { name: '-a' }),
+ ];
+ expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_EXPORT_SCRIPT_NAME, parameterValues, []);
+ });
+ it('success notification is shown', () => {
+ expect(scriptRequestSucceeded).toBeTrue();
+ expect(notificationService.success).toHaveBeenCalled();
+ });
+ it('redirected to process page', () => {
+ expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/45');
+ });
+ });
+ describe('if community is selected and is not an admin', () => {
+ let scriptRequestSucceeded;
+ beforeEach((done) => {
+ (authorizationDataService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+ spyOn((component as any).modalService, 'open').and.returnValue(modalRef);
+ component.navigate(mockCommunity).subscribe((succeeded: boolean) => {
+ scriptRequestSucceeded = succeeded;
+ done();
+ });
+ });
+ it('should invoke the metadata-export script with option -i uuid without the -a option', () => {
const parameterValues: ProcessParameter[] = [
Object.assign(new ProcessParameter(), { name: '-i', value: mockCommunity.uuid }),
];
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
index a04fc0a1cd..d4b4314a99 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
@@ -19,6 +19,8 @@ import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
import { Process } from '../../../../process-page/processes/process.model';
import { RemoteData } from '../../../../core/data/remote-data';
import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
/**
* Component to wrap a list of existing dso's inside a modal
@@ -36,6 +38,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router,
protected notificationsService: NotificationsService, protected translationService: TranslateService,
protected scriptDataService: ScriptDataService,
+ protected authorizationDataService: AuthorizationDataService,
private modalService: NgbModal) {
super(activeModal, route);
}
@@ -82,24 +85,29 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
const parameterValues: ProcessParameter[] = [
Object.assign(new ProcessParameter(), { name: '-i', value: dso.uuid }),
];
- return this.scriptDataService.invoke(METADATA_EXPORT_SCRIPT_NAME, parameterValues, [])
- .pipe(
- getFirstCompletedRemoteData(),
- map((rd: RemoteData
) => {
- if (rd.hasSucceeded) {
- const title = this.translationService.get('process.new.notification.success.title');
- const content = this.translationService.get('process.new.notification.success.content');
- this.notificationsService.success(title, content);
- if (isNotEmpty(rd.payload)) {
- this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
- }
- return true;
- } else {
- const title = this.translationService.get('process.new.notification.error.title');
- const content = this.translationService.get('process.new.notification.error.content');
- this.notificationsService.error(title, content);
- return false;
+ return this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
+ switchMap((isAdmin) => {
+ if (isAdmin) {
+ parameterValues.push(Object.assign(new ProcessParameter(), {name: '-a'}));
+ }
+ return this.scriptDataService.invoke(METADATA_EXPORT_SCRIPT_NAME, parameterValues, []);
+ }),
+ getFirstCompletedRemoteData(),
+ map((rd: RemoteData) => {
+ if (rd.hasSucceeded) {
+ const title = this.translationService.get('process.new.notification.success.title');
+ const content = this.translationService.get('process.new.notification.success.content');
+ this.notificationsService.success(title, content);
+ if (isNotEmpty(rd.payload)) {
+ this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
}
- }));
+ return true;
+ } else {
+ const title = this.translationService.get('process.new.notification.error.title');
+ const content = this.translationService.get('process.new.notification.error.content');
+ this.notificationsService.error(title, content);
+ return false;
+ }
+ }));
}
}
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index 59c242ef97..a4d539625f 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.html
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index 07ea131a00..62d34a8625 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,7 +1,7 @@