[DURACOM-413] update labels, fix sync script, adapt section handling

Author: FrancescoMolinaro

scripts/sync-i18n-files.ts

@@ -37,12 +37,11 @@ function parseCliInput() {
     .option('-o, --output-file <output>', 'where output of script ends up; mutually exclusive with -i')
     .usage('([-d <output-dir>] [-s <source-file>]) || (-t <target-file> (-i | -o <output>) [-s <source-file>])')
     .parse(process.argv);
-
   if (!program.targetFile) {
     fs.readdirSync(projectRoot(LANGUAGE_FILES_LOCATION)).forEach(file => {
-      if (!program.sourceFile.toString().endsWith(file)) {
+      if (program.opts().sourceFile && !program.opts().sourceFile.toString().endsWith(file)) {
         const targetFileLocation = projectRoot(LANGUAGE_FILES_LOCATION + "/" + file);
-        console.log('Syncing file at: ' + targetFileLocation + ' with source file at: ' + program.sourceFile);
+        console.log('Syncing file at: ' + targetFileLocation + ' with source file at: ' + program.opts().sourceFile);
         if (program.outputDir) {
           if (!fs.existsSync(program.outputDir)) {
             fs.mkdirSync(program.outputDir);
@@ -67,7 +66,7 @@ function parseCliInput() {
       console.log(program.outputHelp());
       process.exit(1);
     }
-    if (!checkIfFileExists(program.sourceFile)) {
+    if (!checkIfFileExists(program.opts().sourceFile)) {
       console.error('Path of source file is not valid.');
       console.log(program.outputHelp());
       process.exit(1);
@@ -101,7 +100,7 @@ function syncFileWithSource(pathToTargetFile, pathToOutputFile) {
     targetLines.push(line.trim());
   }));
   progressBar.update(10);
-  const sourceFile = readFileIfExists(program.sourceFile);
+  const sourceFile = readFileIfExists(program.opts().sourceFile);
   sourceFile.toString().split("\n").forEach((function (line) {
     sourceLines.push(line.trim());
   }));

src/app/core/provide-core.ts

@@ -4,6 +4,7 @@ import {
   makeEnvironmentProviders,
 } from '@angular/core';
 import { APP_CONFIG } from '@dspace/config/app-config.interface';
+import { SubmissionCustomUrl } from '@dspace/core/submission/models/submission-custom-url.model';
 
 import { AuthStatus } from './auth/models/auth-status.model';
 import { ShortLivedToken } from './auth/models/short-lived-token.model';
@@ -228,4 +229,5 @@ export const models =
     StatisticsEndpoint,
     CorrectionType,
     SupervisionOrder,
+    SubmissionCustomUrl,
   ];

src/app/core/router/utils/dso-route.utils.ts

@@ -33,8 +33,8 @@ export function getItemPageRoute(item: Item) {
   const type = item.firstMetadataValue('dspace.entity.type');
   let url = item.uuid;
 
-  if (isNotEmpty(item.metadata) && item.hasMetadata('cris.customurl')) {
-    url = item.firstMetadataValue('cris.customurl');
+  if (isNotEmpty(item.metadata) && item.hasMetadata('dspace.customurl')) {
+    url = item.firstMetadataValue('dspace.customurl');
   }
 
   return getEntityPageRoute(type, url);

src/app/core/submission/models/submission-custom-url.model.ts

@@ -0,0 +1,27 @@
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { HALResource } from '../../shared/hal-resource.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SUBMISSION_CUSTOM_URL } from './submission-custom-url.resource-type';
+
+@typedObject
+@inheritSerialization(HALResource)
+export class SubmissionCustomUrl extends HALResource {
+
+  static type = SUBMISSION_CUSTOM_URL;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  @autoserialize
+  url: string;
+}

src/app/core/submission/models/submission-custom-url.resource-type.ts

@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for License
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUBMISSION_CUSTOM_URL = new ResourceType('submissioncustomcurl');

src/app/item-page/item-page.resolver.spec.ts

@@ -102,7 +102,7 @@ describe('itemPageResolver', () => {
 
   });
 
-  describe('when item has cris.customurl metadata', () => {
+  describe('when item has dspace.customurl metadata', () => {
 
 
     const customUrl = 'my-custom-item';
@@ -126,7 +126,7 @@ describe('itemPageResolver', () => {
           return true;
         },
         metadata: {
-          'cris.customurl': customUrl,
+          'dspace.customurl': customUrl,
         },
       });
       itemService = {
@@ -139,7 +139,7 @@ describe('itemPageResolver', () => {
       resolver = itemPageResolver;
     });
 
-    it('should navigate to the new custom URL if cris.customurl is defined and different from route param', (done) => {
+    it('should navigate to the new custom URL if dspace.customurl is defined and different from route param', (done) => {
       spyOn(router, 'navigateByUrl').and.callThrough();
 
       const route = { params: { id: uuid } } as any;
@@ -154,7 +154,7 @@ describe('itemPageResolver', () => {
         });
     });
 
-    it('should not navigate if cris.customurl matches the current route id', (done) => {
+    it('should not navigate if dspace.customurl matches the current route id', (done) => {
       spyOn(router, 'navigateByUrl').and.callThrough();
 
       const route = { params: { id: customUrl } } as any;

src/app/item-page/item-page.resolver.ts

@@ -61,9 +61,9 @@ export const itemPageResolver: ResolveFn<RemoteData<Item>> = (
       if (rd.hasSucceeded && hasValue(rd.payload)) {
         const isItemEditPage = state.url.includes('/edit');
         let itemRoute = isItemEditPage ? state.url : router.parseUrl(getItemPageRoute(rd.payload)).toString();
-        if (hasValue(rd.payload.metadata) && rd.payload.hasMetadata('cris.customurl')) {
-          if (route.params.id !== rd.payload.firstMetadataValue('cris.customurl')) {
-            const newUrl = itemRoute.replace(route.params.id,rd.payload.firstMetadataValue('cris.customurl'));
+        if (hasValue(rd.payload.metadata) && rd.payload.hasMetadata('dspace.customurl')) {
+          if (route.params.id !== rd.payload.firstMetadataValue('dspace.customurl')) {
+            const newUrl = itemRoute.replace(route.params.id,rd.payload.firstMetadataValue('dspace.customurl'));
             router.navigateByUrl(newUrl);
           }
         } else  {

src/app/submission/edit/submission-edit.component.html

@@ -6,5 +6,6 @@
                       [submissionErrors]="submissionErrors"
                       [item]="item"
                       [collectionModifiable]="collectionModifiable"
-                      [submissionId]="submissionId"></ds-submission-form>
+                      [submissionId]="submissionId"
+                      [entityType]="entityType"></ds-submission-form>
 </div>

src/app/submission/edit/submission-edit.component.ts

@@ -67,6 +67,11 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
    */
   public collectionModifiable: boolean | null = null;
 
+  /**
+   * The entity type of the submission
+   * @type {string}
+   */
+  public entityType: string;
 
   /**
    * The list of submission's sections
@@ -155,6 +160,11 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
             this.notificationsService.info(null, this.translate.get('submission.general.cannot_submit'));
             this.router.navigate(['/mydspace']);
           } else {
+            const collection = submissionObjectRD.payload.collection as Collection;
+            const entityType = collection.hasMetadata('dspace.entity.type') ? collection.firstMetadataValue('dspace.entity.type') : null;
+            if (hasValue(entityType)) {
+              this.entityType = entityType;
+            }
             const { errors } = submissionObjectRD.payload;
             this.submissionErrors = parseSectionErrors(errors);
             this.submissionId = submissionObjectRD.payload.id.toString();

src/app/submission/form/submission-form.component.html

@@ -36,6 +36,7 @@
     @for (object of $any(submissionSections | async); track object) {
       <ds-submission-section-container [collectionId]="collectionId"
         [submissionId]="submissionId"
+        [entityType]="entityType"
         [sectionData]="$any(object)">
       </ds-submission-section-container>
     }