hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

ESLint: fix dangling commas

Browse Source
This commit is contained in:
Yury Bondarenko
2023-06-27 16:23:06 +02:00
parent 725dbc3743
commit 917c36dbe7
1789 changed files with 12452 additions and 12452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/submission/objects/submission-objects.actions.ts
View File

@@ -5,7 +5,7 @@ import { type } from '../../shared/ngrx/type';
import { WorkspaceitemSectionUploadFileObject } from '../../core/submission/models/workspaceitem-section-upload-file.model';
import {
WorkspaceitemSectionDataType,
WorkspaceitemSectionsObject
WorkspaceitemSectionsObject,
} from '../../core/submission/models/workspaceitem-sections.model';
import { SubmissionObject } from '../../core/submission/models/submission-object.model';
import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';

418
src/app/submission/objects/submission-objects.effects.spec.ts
View File

File diff suppressed because it is too large Load Diff

18
src/app/submission/objects/submission-objects.effects.ts
View File

@@ -43,7 +43,7 @@ import {
SubmissionObjectAction,
SubmissionObjectActionTypes,
UpdateSectionDataAction,
UpdateSectionDataSuccessAction
UpdateSectionDataSuccessAction,
} from './submission-objects.actions';
import { SubmissionObjectEntry } from './submission-objects.reducer';
import { Item } from '../../core/shared/item.model';
@@ -90,8 +90,8 @@ export class SubmissionObjectEffects {
sectionDefinition.visibility,
enabled,
sectionData,
sectionErrors
)
sectionErrors,
),
);
});
return { action: action, definition: definition, mappedActions: mappedActions };
@@ -99,7 +99,7 @@ export class SubmissionObjectEffects {
mergeMap((result) => {
return observableFrom(
result.mappedActions.concat(
new CompleteInitSubmissionFormAction(result.action.payload.submissionId)
new CompleteInitSubmissionFormAction(result.action.payload.submissionId),
));
})));
@@ -116,7 +116,7 @@ export class SubmissionObjectEffects {
action.payload.submissionDefinition,
action.payload.sections,
action.payload.item,
null
null,
))));
/**
@@ -212,7 +212,7 @@ export class SubmissionObjectEffects {
} else {
response$ = this.submissionObjectService.findById(action.payload.submissionId, false, true).pipe(
getFirstSucceededRemoteDataPayload(),
map((submissionObject: SubmissionObject) => [submissionObject])
map((submissionObject: SubmissionObject) => [submissionObject]),
);
}
return response$.pipe(
@@ -224,7 +224,7 @@ export class SubmissionObjectEffects {
null,
this.translate.instant('submission.sections.general.cannot_deposit'),
null,
true
true,
);
return new SaveSubmissionFormSuccessAction(action.payload.submissionId, response, false, true);
}
@@ -292,7 +292,7 @@ export class SubmissionObjectEffects {
if (section.sectionType === SectionsType.SubmissionForm) {
const submissionObject$ = this.submissionObjectService
.findById(action.payload.submissionId, true, false, followLink('item')).pipe(
getFirstSucceededRemoteDataPayload()
getFirstSucceededRemoteDataPayload(),
);
const item$ = submissionObject$.pipe(
@@ -303,7 +303,7 @@ export class SubmissionObjectEffects {
return item$.pipe(
map((item: Item) => item.metadata),
filter((metadata) => !isEqual(action.payload.data, metadata)),
map((metadata: any) => new UpdateSectionDataAction(action.payload.submissionId, action.payload.sectionId, metadata, action.payload.errorsToShow, action.payload.serverValidationErrors, action.payload.metadata))
map((metadata: any) => new UpdateSectionDataAction(action.payload.submissionId, action.payload.sectionId, metadata, action.payload.errorsToShow, action.payload.serverValidationErrors, action.payload.metadata)),
);
} else {
return observableOf(new UpdateSectionDataSuccessAction());

134
src/app/submission/objects/submission-objects.reducer.spec.ts
View File

@@ -30,7 +30,7 @@ import {
SaveSubmissionSectionFormSuccessAction,
SectionStatusChangeAction,
SubmissionObjectAction,
UpdateSectionDataAction
UpdateSectionDataAction,
} from './submission-objects.actions';
import { SectionsType } from '../sections/sections-type';
import {
@@ -38,7 +38,7 @@ import {
mockSubmissionDefinitionResponse,
mockSubmissionId,
mockSubmissionSelfUrl,
mockSubmissionState
mockSubmissionState,
} from '../../shared/mocks/submission.mock';
import { Item } from '../../core/shared/item.model';
@@ -66,7 +66,7 @@ describe('submissionReducer test suite', () => {
isLoading: true,
savePending: false,
depositPending: false,
}
},
};
const action = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
@@ -78,8 +78,8 @@ describe('submissionReducer test suite', () => {
it('should complete submission initialization', () => {
const state = Object.assign({}, initState, {
[submissionId]: Object.assign({}, initState[submissionId], {
isLoading: true
})
isLoading: true,
}),
});
const action = new CompleteInitSubmissionFormAction(submissionId);
@@ -99,7 +99,7 @@ describe('submissionReducer test suite', () => {
isLoading: true,
savePending: false,
depositPending: false,
}
},
};
const action = new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, {}, submissionDefinition, new Item());
@@ -143,7 +143,7 @@ describe('submissionReducer test suite', () => {
const state = Object.assign({}, initState, {
[submissionId]: Object.assign({}, initState[submissionId], {
savePending: true,
})
}),
});
let action: any = new SaveSubmissionFormSuccessAction(submissionId, []);
@@ -191,7 +191,7 @@ describe('submissionReducer test suite', () => {
const state = Object.assign({}, initState, {
[submissionId]: Object.assign({}, initState[submissionId], {
depositPending: true,
})
}),
});
const action: any = new DepositSubmissionSuccessAction(submissionId);
@@ -241,7 +241,7 @@ describe('submissionReducer test suite', () => {
errorsToShow: [],
serverValidationErrors: [],
isLoading: false,
isValid: true
isValid: true,
} as any;
let action: any = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
@@ -306,8 +306,8 @@ describe('submissionReducer test suite', () => {
authority: null,
display: 'Author, Test',
confidence: -1,
place: 0
}
place: 0,
},
],
'dc.title': [
{
@@ -316,8 +316,8 @@ describe('submissionReducer test suite', () => {
authority: null,
display: 'Title Test',
confidence: -1,
place: 0
}
place: 0,
},
],
'dc.date.issued': [
{
@@ -326,9 +326,9 @@ describe('submissionReducer test suite', () => {
authority: null,
display: '2015',
confidence: -1,
place: 0
}
]
place: 0,
},
],
} as any;
const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', data, [], []);
@@ -352,8 +352,8 @@ describe('submissionReducer test suite', () => {
const errors = [
{
path: '/sections/license',
message: 'error.validation.license.notgranted'
}
message: 'error.validation.license.notgranted',
},
];
const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors, errors);
@@ -374,7 +374,7 @@ describe('submissionReducer test suite', () => {
it('should add submission section error properly', () => {
const error = {
path: '/sections/traditionalpageone/dc.title/0',
message: 'error.validation.traditionalpageone.required'
message: 'error.validation.traditionalpageone.required',
};
const action = new InertSectionErrorsAction(submissionId, 'traditionalpageone', error);
@@ -387,21 +387,21 @@ describe('submissionReducer test suite', () => {
const errors = [
{
path: '/sections/traditionalpageone/dc.contributor.author',
message: 'error.validation.required'
message: 'error.validation.required',
},
{
path: '/sections/traditionalpageone/dc.date.issued',
message: 'error.validation.required'
}
message: 'error.validation.required',
},
];
const error = {
path: '/sections/traditionalpageone/dc.contributor.author',
message: 'error.validation.required'
message: 'error.validation.required',
};
const expectedErrors = [{
path: '/sections/traditionalpageone/dc.date.issued',
message: 'error.validation.required'
message: 'error.validation.required',
}];
let action: any = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors, errors);
@@ -433,9 +433,9 @@ describe('submissionReducer test suite', () => {
authority: null,
display: '28297_389341539060_6452876_n.jpg',
confidence: -1,
place: 0
}
]
place: 0,
},
],
},
accessConditions: [],
format: {
@@ -446,17 +446,17 @@ describe('submissionReducer test suite', () => {
supportLevel: 0,
internal: false,
extensions: null,
type: 'bitstreamformat'
type: 'bitstreamformat',
},
sizeBytes: 22737,
checkSum: {
checkSumAlgorithm: 'MD5',
value: '8722864dd671912f94a999ac7c4949d2'
value: '8722864dd671912f94a999ac7c4949d2',
},
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content'
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content',
};
const expectedState = {
files: [fileData]
files: [fileData],
};
const action = new NewUploadedFileAction(submissionId, 'upload', uuid, fileData);
@@ -478,9 +478,9 @@ describe('submissionReducer test suite', () => {
authority: null,
display: 'image_test.jpg',
confidence: -1,
place: 0
}
]
place: 0,
},
],
},
accessConditions: [],
format: {
@@ -491,14 +491,14 @@ describe('submissionReducer test suite', () => {
supportLevel: 0,
internal: false,
extensions: null,
type: 'bitstreamformat'
type: 'bitstreamformat',
},
sizeBytes: 22737,
checkSum: {
checkSumAlgorithm: 'MD5',
value: '8722864dd671912f94a999ac7c4949d2'
value: '8722864dd671912f94a999ac7c4949d2',
},
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content'
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content',
};
const fileData2: any = {
uuid: uuid2,
@@ -510,9 +510,9 @@ describe('submissionReducer test suite', () => {
authority: null,
display: 'image_test.jpg',
confidence: -1,
place: 0
}
]
place: 0,
},
],
},
accessConditions: [],
format: {
@@ -523,14 +523,14 @@ describe('submissionReducer test suite', () => {
supportLevel: 0,
internal: false,
extensions: null,
type: 'bitstreamformat'
type: 'bitstreamformat',
},
sizeBytes: 22737,
checkSum: {
checkSumAlgorithm: 'MD5',
value: '8722864dd671912f94a999ac7c4949d2'
value: '8722864dd671912f94a999ac7c4949d2',
},
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content'
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content',
};
const state: SubmissionObjectState = Object.assign({}, initState, {
@@ -538,15 +538,15 @@ describe('submissionReducer test suite', () => {
sections: Object.assign({}, initState[submissionId].sections, {
upload: Object.assign({}, initState[submissionId].sections.upload, {
data: {
files: [fileData, fileData2]
}
})
})
})
files: [fileData, fileData2],
},
}),
}),
}),
});
const expectedState = {
files: [fileData]
files: [fileData],
};
const action = new DeleteUploadedFileAction(submissionId, 'upload', uuid2);
@@ -567,9 +567,9 @@ describe('submissionReducer test suite', () => {
authority: null,
display: 'image_test.jpg',
confidence: -1,
place: 0
}
]
place: 0,
},
],
},
accessConditions: [],
format: {
@@ -580,14 +580,14 @@ describe('submissionReducer test suite', () => {
supportLevel: 0,
internal: false,
extensions: null,
type: 'bitstreamformat'
type: 'bitstreamformat',
},
sizeBytes: 22737,
checkSum: {
checkSumAlgorithm: 'MD5',
value: '8722864dd671912f94a999ac7c4949d2'
value: '8722864dd671912f94a999ac7c4949d2',
},
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content'
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content',
};
const fileData2: any = {
uuid: uuid,
@@ -599,9 +599,9 @@ describe('submissionReducer test suite', () => {
authority: null,
display: 'New title',
confidence: -1,
place: 0
}
]
place: 0,
},
],
},
accessConditions: [],
format: {
@@ -612,14 +612,14 @@ describe('submissionReducer test suite', () => {
supportLevel: 0,
internal: false,
extensions: null,
type: 'bitstreamformat'
type: 'bitstreamformat',
},
sizeBytes: 22737,
checkSum: {
checkSumAlgorithm: 'MD5',
value: '8722864dd671912f94a999ac7c4949d2'
value: '8722864dd671912f94a999ac7c4949d2',
},
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content'
url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content',
};
const state: SubmissionObjectState = Object.assign({}, initState, {
@@ -627,15 +627,15 @@ describe('submissionReducer test suite', () => {
sections: Object.assign({}, initState[submissionId].sections, {
upload: Object.assign({}, initState[submissionId].sections.upload, {
data: {
files: [fileData]
}
})
})
})
files: [fileData],
},
}),
}),
}),
});
const expectedState = {
files: [fileData2]
files: [fileData2],
};
const action = new EditFileDataAction(submissionId, 'upload', uuid, fileData2);

120
src/app/submission/objects/submission-objects.reducer.ts
View File

@@ -36,7 +36,7 @@ import {
SetSectionFormId,
SubmissionObjectAction,
SubmissionObjectActionTypes,
UpdateSectionDataAction
UpdateSectionDataAction,
} from './submission-objects.actions';
import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
import { SubmissionSectionObject } from './submission-section-object.model';
@@ -249,10 +249,10 @@ const removeError = (state: SubmissionObjectState, action: DeleteSectionErrorsAc
[ submissionId ]: Object.assign({}, state[ submissionId ], {
sections: Object.assign({}, state[ submissionId ].sections, {
[ sectionId ]: Object.assign({}, state[ submissionId ].sections [ sectionId ], {
errorsToShow: filteredErrors
})
})
})
errorsToShow: filteredErrors,
}),
}),
}),
});
} else {
return state;
@@ -269,10 +269,10 @@ const addError = (state: SubmissionObjectState, action: InertSectionErrorsAction
[ submissionId ]: Object.assign({}, state[ submissionId ], {
activeSection: state[ action.payload.submissionId ].activeSection, sections: Object.assign({}, state[ submissionId ].sections, {
[ sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
errorsToShow
})
errorsToShow,
}),
}),
})
}),
});
} else {
return state;
@@ -296,10 +296,10 @@ function removeSectionErrors(state: SubmissionObjectState, action: RemoveSection
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
[ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
errorsToShow: []
})
})
})
errorsToShow: [],
}),
}),
}),
});
} else {
return state;
@@ -349,8 +349,8 @@ function resetSubmission(state: SubmissionObjectState, action: ResetSubmissionFo
return Object.assign({}, state, {
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
sections: Object.create(null),
isLoading: true
})
isLoading: true,
}),
});
} else {
return state;
@@ -371,8 +371,8 @@ function completeInit(state: SubmissionObjectState, action: CompleteInitSubmissi
if (hasValue(state[ action.payload.submissionId ])) {
return Object.assign({}, state, {
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
isLoading: false
})
isLoading: false,
}),
});
} else {
return state;
@@ -402,7 +402,7 @@ function saveSubmission(state: SubmissionObjectState,
sections: state[ action.payload.submissionId ].sections,
isLoading: state[ action.payload.submissionId ].isLoading,
savePending: true,
})
}),
});
} else {
return state;
@@ -432,7 +432,7 @@ function completeSave(state: SubmissionObjectState,
return Object.assign({}, state, {
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
savePending: false,
})
}),
});
} else {
return state;
@@ -455,7 +455,7 @@ function startDeposit(state: SubmissionObjectState, action: DepositSubmissionAct
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
savePending: false,
depositPending: true,
})
}),
});
} else {
return state;
@@ -477,7 +477,7 @@ function endDeposit(state: SubmissionObjectState, action: DepositSubmissionSucce
return Object.assign({}, state, {
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
depositPending: false,
})
}),
});
} else {
return state;
@@ -497,8 +497,8 @@ function endDeposit(state: SubmissionObjectState, action: DepositSubmissionSucce
function changeCollection(state: SubmissionObjectState, action: ChangeSubmissionCollectionAction): SubmissionObjectState {
return Object.assign({}, state, {
[ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
collection: action.payload.collectionId
})
collection: action.payload.collectionId,
}),
});
}
@@ -522,7 +522,7 @@ function setActiveSection(state: SubmissionObjectState, action: SetActiveSection
sections: state[ action.payload.submissionId ].sections,
isLoading: state[ action.payload.submissionId ].isLoading,
savePending: state[ action.payload.submissionId ].savePending,
})
}),
});
} else {
return state;
@@ -556,10 +556,10 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
errorsToShow: [],
serverValidationErrors: action.payload.errors || [],
isLoading: false,
isValid: isEmpty(action.payload.errors)
}
})
})
isValid: isEmpty(action.payload.errors),
},
}),
}),
});
} else {
return state;
@@ -583,10 +583,10 @@ function setSectionFormId(state: SubmissionObjectState, action: SetSectionFormId
sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
[ action.payload.sectionId ]: {
...state[ action.payload.submissionId ].sections [action.payload.sectionId],
formId: action.payload.formId
}
})
})
formId: action.payload.formId,
},
}),
}),
});
} else {
return state;
@@ -614,10 +614,10 @@ function updateSectionData(state: SubmissionObjectState, action: UpdateSectionDa
data: action.payload.data,
errorsToShow: action.payload.errorsToShow,
serverValidationErrors: action.payload.serverValidationErrors,
metadata: reduceSectionMetadata(action.payload.metadata, state[ action.payload.submissionId ].sections [ action.payload.sectionId ].metadata)
})
})
})
metadata: reduceSectionMetadata(action.payload.metadata, state[ action.payload.submissionId ].sections [ action.payload.sectionId ].metadata),
}),
}),
}),
});
} else {
return state;
@@ -661,10 +661,10 @@ function changeSectionState(state: SubmissionObjectState, action: EnableSectionA
// sections: deleteProperty(state[ action.payload.submissionId ].sections, action.payload.sectionId),
sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
[ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
enabled
})
})
})
enabled,
}),
}),
}),
});
} else {
return state;
@@ -688,11 +688,11 @@ function setIsValid(state: SubmissionObjectState, action: SectionStatusChangeAct
sections: Object.assign({}, state[ action.payload.submissionId ].sections,
Object.assign({}, {
[ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
isValid: action.payload.status
})
})
)
})
isValid: action.payload.status,
}),
}),
),
}),
});
} else {
return state;
@@ -716,7 +716,7 @@ function newFile(state: SubmissionObjectState, action: NewUploadedFileAction): S
let newData;
if (isUndefined(filesData.files)) {
newData = {
files: [action.payload.data]
files: [action.payload.data],
};
} else {
newData = filesData;
@@ -728,10 +728,10 @@ function newFile(state: SubmissionObjectState, action: NewUploadedFileAction): S
sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
[ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
enabled: true,
data: newData
})
})
})
data: newData,
}),
}),
}),
});
}
@@ -761,14 +761,14 @@ function editFileData(state: SubmissionObjectState, action: EditFileDataAction):
Object.assign({}, {
[ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
data: Object.assign({}, state[ action.payload.submissionId ].sections[ action.payload.sectionId ].data, {
files: newData
})
})
})
files: newData,
}),
}),
}),
),
isLoading: state[ action.payload.submissionId ].isLoading,
savePending: state[ action.payload.submissionId ].savePending,
})
}),
});
}
}
@@ -800,12 +800,12 @@ function deleteFile(state: SubmissionObjectState, action: DeleteUploadedFileActi
Object.assign({}, {
[ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections[ action.payload.sectionId ], {
data: Object.assign({}, state[ action.payload.submissionId ].sections[ action.payload.sectionId ].data, {
files: newData
})
})
})
)
})
files: newData,
}),
}),
}),
),
}),
});
}
}