diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts index eecf05f543..6c9d84123b 100644 --- a/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts +++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts @@ -101,6 +101,7 @@ describe('BatchImportPageComponent', () => { const parameterValues: ProcessParameter[] = [ Object.assign(new ProcessParameter(), { name: '--zip', value: 'filename.zip' }), ]; + parameterValues.push(Object.assign(new ProcessParameter(), { name: '--add', value: 'filename.zip' })); expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]); }); it('success notification is shown', () => { @@ -121,6 +122,7 @@ describe('BatchImportPageComponent', () => { it('metadata-import script is invoked with --zip fileName and the mockFile and -v validate-only', () => { const parameterValues: ProcessParameter[] = [ Object.assign(new ProcessParameter(), { name: '--zip', value: 'filename.zip' }), + Object.assign(new ProcessParameter(), { name: '--add', value: 'filename.zip' }), Object.assign(new ProcessParameter(), { name: '-v', value: true }), ]; expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]); 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 2985aff3aa..8f49ed64b6 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 @@ -78,6 +78,7 @@ export class BatchImportPageComponent { const parameterValues: ProcessParameter[] = [ Object.assign(new ProcessParameter(), { name: '--zip', value: this.fileObject.name }), ]; + parameterValues.push(Object.assign(new ProcessParameter(), { name: '--add', value: this.fileObject.name })); if (this.dso) { parameterValues.push(Object.assign(new ProcessParameter(), { name: '--collection', value: this.dso.uuid })); } diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts index f362a9c676..58674d4005 100644 --- a/src/app/core/data/processes/script-data.service.ts +++ b/src/app/core/data/processes/script-data.service.ts @@ -24,7 +24,7 @@ import { dataService } from '../base/data-service.decorator'; export const METADATA_IMPORT_SCRIPT_NAME = 'metadata-import'; export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export'; -export const BATCH_IMPORT_SCRIPT_NAME = 'batch-import'; +export const BATCH_IMPORT_SCRIPT_NAME = 'import'; @Injectable() @dataService(SCRIPT) diff --git a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts index 2fdae23388..a88aeaff3c 100644 --- a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts +++ b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts @@ -18,7 +18,7 @@ import { Observable, of } from 'rxjs'; }) export class ImportBatchSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit { objectType = DSpaceObjectType.DSPACEOBJECT; - selectorTypes = [DSpaceObjectType.COLLECTION, DSpaceObjectType.COMMUNITY]; + selectorTypes = [DSpaceObjectType.COLLECTION]; action = SelectorActionType.IMPORT_BATCH; /** * An event fired when the modal is closed diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 4dd963a5fe..3e48254a6e 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -554,7 +554,7 @@ "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here", - "admin.batch-import.page.help": "You can drop or browse ZIP files that contain batch operations on files here", + "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.metadata-import.page.dropMsg": "Drop a metadata CSV to import",