Use JSON Schema oneOf schematic instead of enum & enumNames [#183287493]

package.json

@@ -131,8 +131,8 @@
     "intl": "^1.2.5",
     "jsonpath-plus": "^6.0.1",
     "jw-bootstrap-switch-ng2": "^2.0.5",
-    "label-designer": "^4.0.6",
-    "laji-form": "^12.5.17",
+    "label-designer": "^4.0.7",
+    "laji-form": "^14.0.4",
     "laji-map": "^3.16.17",
     "leaflet.sync": "^0.2.4",
     "localforage": "^1.10.0",

projects/label-designer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "label-designer",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "author": "Ville-Matti Riihikoski",
   "contributors": [
     "Ville-Matti Riihikoski <ville-matti.riihikoski@helsinki.fi>",

projects/label-designer/src/lib/label-designer/label-designer.component.ts

@@ -56,7 +56,7 @@ export class LabelDesignerComponent implements OnInit, OnDestroy {
   /**
    * @internal
    */
-  version = '4.0.5';
+  version = '4.0.7';
 
   /**
    * @internal

projects/label-designer/src/lib/schema.service.ts

@@ -197,16 +197,16 @@ export class SchemaService {
   private getValueMap(item): undefined|{[value: string]: string} {
     function pick(from) {
       const result = {};
-      for (let i = 0; i < from.enum.length; i++) {
-        result[from.enum[i]] = from.enumNames[i];
+      for (const one of from.oneOf) {
+        result[one.const] = one.title;
       }
       return result;
     }
 
-    if (Array.isArray(item.enum) && Array.isArray(item.enumNames)) {
+    if (Array.isArray(item.oneOf)) {
       return pick(item);
     }
-    if (item.items && Array.isArray(item.items.enum) && Array.isArray(item.items.enumNames)) {
+    if (item.items && Array.isArray(item.items.oneOf)) {
       return pick(item.items);
     }
 

projects/laji-api-client/src/lib/models/UISchemaContext.ts

@@ -27,8 +27,7 @@ export interface UISchemaContext {
 export namespace UISchemaContext {
 
   export interface ListEnum {
-    enum: string[];
-    enumNames: string[];
+    oneOf: {const: string, title: string}[];
   }
   export interface AnnotationMap {
     [targetID: string]: Annotation[];

projects/laji/src/app/+project-form/form/named-place/np-edit-form/np-edit-form.component.ts

@@ -232,11 +232,10 @@ export class NpEditFormComponent implements OnInit {
     const getAreaEnum = (
       type: keyof Pick<AreaService, 'getMunicipalities' | 'getBiogeographicalProvinces' | 'getBirdAssociationAreas'>
     ): Observable<Form.IEnum> => (this.areaService[type](this.translate.currentLang)).pipe(
-      map(areas => areas.reduce((enums, area) => {
-        enums.enum.push(area.id);
-        enums.enumNames.push(area.value);
-        return enums;
-      }, { enum: [], enumNames: [] }))
+      map(areas => areas.reduce((schema, area) => {
+        schema.oneOf.push({const: area.id, title: area.value});
+        return schema;
+      }, {oneOf: []}))
     );
     return this.projectFormService.getPlaceForm$(data.documentForm).pipe(switchMap(placeForm => forkJoin([
       placeForm.schema.properties.municipality ? getAreaEnum('getMunicipalities') : of(null),

projects/laji/src/app/shared-modules/spreadsheet/importer/cell-value-mapping/cell-value-select/cell-value-select.component.ts

@@ -25,7 +25,7 @@ export class CellValueSelectComponent {
     this.labels = [];
 
     if (field.enum) {
-      this.labels = [VALUE_IGNORE, ...field.enumNames];
+      this.labels = [VALUE_IGNORE, ...field.enum.map(item => item.title)];
     }
   }
 
@@ -45,10 +45,10 @@ export class CellValueSelectComponent {
 
     if (to === VALUE_IGNORE) {
       mapping[value] = to;
-    } else if (this._field.enumNames) {
-      const idx = this._field.enumNames.indexOf(to);
-      if (idx > -1) {
-        mapping[value] = this._field.enum[idx];
+    } else if (this._field.enum) {
+      const enu = this._field.enum.find(item => item.title === to);
+      if (enu) {
+        mapping[value] = enu.const;
       }
     } else if (this._field.type === 'integer') {
       mapping[value] = +to;

projects/laji/src/app/shared-modules/spreadsheet/model/excel.ts

@@ -22,8 +22,7 @@ export interface IFormField {
   type: string;
   splitType?: SplitType;
   subGroup?: string;
-  enum?: string[];
-  enumNames?: string[];
+  enum?: {title: string; const: string}[];
   default?: any;
   col?: string;
   previousValue?: any;

projects/laji/src/app/shared-modules/spreadsheet/service/generator.service.ts

@@ -110,8 +110,7 @@ export class GeneratorService {
       }
 
       if (useLabels && field.enum && field.default) {
-        const valueIdx = field.enum.indexOf(field.default);
-        value = field.enumNames[valueIdx];
+        value = field.enum.find(item => item.const === field.default).title;
       } else if (field.type === 'boolean') {
         value = this.mappingService.reverseMap(value, field);
       }
@@ -191,7 +190,7 @@ export class GeneratorService {
       }
 
       if (field.enum) {
-        validValues = (useLabels ? field.enumNames : field.enum).filter(val => val !== '');
+        validValues = field.enum.map(item => useLabels ? item.title : item.const).filter(val => val !== '');
       } else if (field.type === 'boolean') {
         validValues = [this.mappingService.mapFromBoolean(true), this.mappingService.mapFromBoolean(false)];
       } else if (special) {

projects/laji/src/app/shared-modules/spreadsheet/service/mapping.service.ts

@@ -209,10 +209,10 @@ export class MappingService {
     }
     switch (field.type) {
       case 'string':
-        if (field.enum && field.enumNames) {
-          const idx = field.enum.indexOf(value);
-          if (idx !== -1) {
-            return field.enumNames[idx];
+        if (field.enum) {
+          const enu = field.enum.find(item => item.const === value);
+          if (enu !== undefined) {
+            return enu.title;
           }
         }
         break;
@@ -270,11 +270,12 @@ export class MappingService {
       return;
     }
     this.mapping.string[field.key] = {};
-    field.enum.map((value, idx) => {
+    field.enum.map((item) => {
+      const value = item.const;
       if (value === '') {
         return;
       }
-      const label = field.enumNames[idx].toLowerCase();
+      const label = item.title.toLowerCase();
       this.mapping.string[field.key][value.toLowerCase()] = value;
       this.mapping.string[field.key][label.toLowerCase()] = value;
 

projects/laji/src/app/shared-modules/spreadsheet/service/spreadsheet.service.ts

@@ -374,8 +374,7 @@ export class SpreadsheetService {
         isArray: root.endsWith('[*]'),
         required: this.hasRequiredValidator(schema.id, lastKey, validators, required, root),
         subGroup: this.analyzeSubGroup(root, parent, unitSubGroups),
-        enum: schema.enum,
-        enumNames: schema.enumNames,
+        enum: schema.oneOf,
         default: schema.default
       });
 

projects/laji/src/app/shared/model/Form.ts

@@ -38,9 +38,8 @@ export namespace Form {
   }
 
   export interface IEnum {
-    enum: string[];
-    enumNames: string[];
-  }
+    oneOf: {const: string; title: string}[];
+  };
 
   export interface IAnnotationMap {
     [targetID: string]: Annotation[];