diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
index 190eb0d409..1092443436 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
@@ -20,10 +20,15 @@
-
+
+ {{'admin.batch-import.page.toggle.help' | translate}}
+
+
{
proceed.click();
fixture.detectChanges();
}));
- it('metadata-import script is invoked with --u and the file url', () => {
+ it('metadata-import script is invoked with --url and the file url', () => {
const parameterValues: ProcessParameter[] = [
Object.assign(new ProcessParameter(), { name: '--add' }),
- Object.assign(new ProcessParameter(), { name: '--u', value: 'example.fileURL.com' })
+ Object.assign(new ProcessParameter(), { name: '--url', value: 'example.fileURL.com' })
];
expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [null]);
});
@@ -200,10 +200,10 @@ describe('BatchImportPageComponent', () => {
proceed.click();
fixture.detectChanges();
}));
- it('metadata-import script is invoked with --u and the file url and -v validate-only', () => {
+ it('metadata-import script is invoked with --url and the file url and -v validate-only', () => {
const parameterValues: ProcessParameter[] = [
Object.assign(new ProcessParameter(), { name: '--add' }),
- Object.assign(new ProcessParameter(), { name: '--u', value: 'example.fileURL.com' }),
+ Object.assign(new ProcessParameter(), { name: '--url', value: 'example.fileURL.com' }),
Object.assign(new ProcessParameter(), { name: '-v', value: true }),
];
expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [null]);
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
index 79da641cc6..744b3aecce 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
@@ -84,7 +84,11 @@ export class BatchImportPageComponent {
*/
public importMetadata() {
if (this.fileObject == null && isEmpty(this.fileURL)) {
- this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFile'));
+ if (this.isUpload) {
+ this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFile'));
+ } else {
+ this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFileUrl'));
+ }
} else {
const parameterValues: ProcessParameter[] = [
Object.assign(new ProcessParameter(), { name: '--add' })
@@ -93,7 +97,7 @@ export class BatchImportPageComponent {
parameterValues.push(Object.assign(new ProcessParameter(), { name: '--zip', value: this.fileObject.name }));
} else {
this.fileObject = null;
- parameterValues.push(Object.assign(new ProcessParameter(), { name: '--u', value: this.fileURL }));
+ parameterValues.push(Object.assign(new ProcessParameter(), { name: '--url', value: this.fileURL }));
}
if (this.dso) {
parameterValues.push(Object.assign(new ProcessParameter(), { name: '--collection', value: this.dso.uuid }));
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5eb069c804..6d7ce0b884 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -568,6 +568,8 @@
"admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
+ "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+
"admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
"admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
@@ -584,6 +586,8 @@
"admin.metadata-import.page.error.addFile": "Select file first!",
+ "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+
"admin.batch-import.page.error.addFile": "Select Zip file first!",
"admin.metadata-import.page.toggle.upload": "Upload",