Add allowOther support to enum string type

Author: danielfdsilva

packages/data-core/lib/schema/types.ts

@@ -1,35 +1,30 @@
-export interface SchemaFieldString {
-  type: 'string';
+interface FieldBase<T> {
+  type: T;
   'ui:widget'?: string;
   label?: string | string[];
-  enum?: [string, string][];
 }
 
-export interface SchemaFieldNumber {
-  type: 'number';
-  'ui:widget'?: string;
-  label?: string | string[];
-}
+export type SchemaFieldString =
+  | (FieldBase<'string'> & { enum?: never; allowOther?: never })
+  | (FieldBase<'string'> & {
+      allowOther?: {
+        type: 'string';
+      };
+      enum: [string, string][];
+    });
 
-export interface SchemaFieldJson {
-  type: 'json';
-  'ui:widget'?: string;
-  label?: string;
-}
+export type SchemaFieldNumber = FieldBase<'number'>;
 
-export interface SchemaFieldArray<I extends SchemaField = SchemaField> {
-  type: 'array';
-  'ui:widget'?: string;
-  label?: string | string[];
+export type SchemaFieldJson = FieldBase<'json'>;
+
+export interface SchemaFieldArray<I extends SchemaField = SchemaField>
+  extends FieldBase<'array'> {
   minItems?: number;
   maxItems?: number;
   items: I;
 }
 
-export interface SchemaFieldObject {
-  type: 'object' | 'root';
-  'ui:widget'?: string;
-  label?: string | string[];
+export interface SchemaFieldObject extends FieldBase<'object' | 'root'> {
   properties: Record<string, SchemaField>;
   additionalProperties?: boolean;
   required?: string[];

packages/data-plugins/lib/collections/core.ts

@@ -1,4 +1,4 @@
-import { Plugin, SchemaFieldObject } from '@stac-manager/data-core';
+import { Plugin, PluginEditSchema } from '@stac-manager/data-core';
 import { emptyString2Null, fieldIf, null2EmptyString } from '../utils';
 
 export class PluginCore extends Plugin {
@@ -10,7 +10,7 @@ export class PluginCore extends Plugin {
     this.isNew = !data?.id;
   }
 
-  editSchema(): SchemaFieldObject {
+  editSchema(): PluginEditSchema {
     return {
       type: 'root',
       required: [
@@ -47,6 +47,9 @@ export class PluginCore extends Plugin {
           label: 'License',
           type: 'string',
           'ui:widget': 'tagger',
+          allowOther: {
+            type: 'string'
+          },
           enum: [
             ['Apache-2.0', 'Apache License 2.0'],
             ['MIT', 'MIT License'],
@@ -136,7 +139,7 @@ export class PluginCore extends Plugin {
           minItems: 1,
           items: {
             type: 'object',
-            required: ['rel', 'href'],
+            required: ['rel', 'href', 'type'],
             properties: {
               href: {
                 label: 'URL',

packages/data-plugins/lib/collections/kitchen-sink.ts

@@ -1,9 +1,9 @@
-import { Plugin, SchemaFieldObject } from '@stac-manager/data-core';
+import { Plugin, PluginEditSchema } from '@stac-manager/data-core';
 
 export class PluginKitchenSink extends Plugin {
   name = 'Kitchen Sink';
 
-  editSchema(): SchemaFieldObject {
+  editSchema(): PluginEditSchema {
     return {
       type: 'root',
       properties: {

packages/data-plugins/lib/collections/meta.ts

@@ -1,4 +1,4 @@
-import { Plugin, SchemaFieldObject } from '@stac-manager/data-core';
+import { Plugin, PluginEditSchema } from '@stac-manager/data-core';
 
 export class PluginMeta extends Plugin {
   name = 'CollectionsMeta';
@@ -7,7 +7,7 @@ export class PluginMeta extends Plugin {
   //   await new Promise((resolve) => setTimeout(resolve, 100));
   // }
 
-  editSchema(): SchemaFieldObject {
+  editSchema(): PluginEditSchema {
     return {
       type: 'root',
       properties: {