From 98f1d5a3c10dfdb82fcadb323ffbcdd1530dba9d Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 9 Nov 2018 12:24:25 -0700
Subject: [PATCH] SHIBUI-701 Integrated file system provider with backend

---
 .../container/provider-edit-step.component.ts |  2 +-
 .../model/file-system.provider.form.ts        | 50 +++++++++++++++++--
 ui/src/app/wizard/model/wizard.ts             |  1 +
 ui/src/app/wizard/reducer/index.ts            |  9 ++++
 4 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/ui/src/app/metadata/provider/container/provider-edit-step.component.ts b/ui/src/app/metadata/provider/container/provider-edit-step.component.ts
index ec83223fd..2a32d925d 100644
--- a/ui/src/app/metadata/provider/container/provider-edit-step.component.ts
+++ b/ui/src/app/metadata/provider/container/provider-edit-step.component.ts
@@ -49,7 +49,7 @@ export class ProviderEditStepComponent implements OnDestroy {
         this.changes$ = this.store.select(fromProvider.getEntityChanges);
         this.provider$ = this.store.select(fromProvider.getSelectedProvider);
         this.step$ = this.store.select(fromWizard.getCurrent);
-        this.schema$ = this.store.select(fromWizard.getParsedSchema);
+        this.schema$ = this.store.select(fromWizard.getSchema);
 
         this.step$.subscribe(s => {
             if (s && s.locked) {
diff --git a/ui/src/app/metadata/provider/model/file-system.provider.form.ts b/ui/src/app/metadata/provider/model/file-system.provider.form.ts
index 52fa78bdb..9c5e2536b 100644
--- a/ui/src/app/metadata/provider/model/file-system.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/file-system.provider.form.ts
@@ -28,7 +28,8 @@ export const FileSystemMetadataProviderWizard: Wizard<FileSystemMetadataProvider
             schema: '/api/ui/MetadataResolver/FilesystemMetadataResolver',
             fields: [
                 'xmlId',
-                'metadataFile'
+                'metadataFile',
+                'doInitialization'
             ],
             fieldsets: [
                 {
@@ -36,7 +37,8 @@ export const FileSystemMetadataProviderWizard: Wizard<FileSystemMetadataProvider
                     class: ['col-12'],
                     fields: [
                         'xmlId',
-                        'metadataFile'
+                        'metadataFile',
+                        'doInitialization'
                     ]
                 }
             ]
@@ -93,9 +95,40 @@ export const FileSystemMetadataProviderEditor: Wizard<FileSystemMetadataProvider
             initialValues: [],
             schema: '/api/ui/MetadataResolver/FilesystemMetadataResolver',
             fields: [
-                'enabled',
+                'name',
                 'xmlId',
-                'metadataFile'
+                '@type',
+                'metadataFile',
+                'enabled',
+                'doInitialization'
+            ],
+            override: {
+                '@type': {
+                    type: 'string',
+                    readOnly: true,
+                    widget: 'string',
+                    oneOf: [{ enum: ['FilesystemMetadataResolver'], description: 'value.file-system-metadata-provider'}]
+                }
+            },
+            fieldsets: [
+                {
+                    type: 'section',
+                    class: ['mb-3'],
+                    fields: [
+                        'name',
+                        '@type',
+                        'enabled'
+                    ]
+                },
+                {
+                    type: 'group-lg',
+                    class: ['col-12'],
+                    fields: [
+                        'xmlId',
+                        'metadataFile',
+                        'doInitialization'
+                    ]
+                }
             ]
         },
         {
@@ -106,6 +139,15 @@ export const FileSystemMetadataProviderEditor: Wizard<FileSystemMetadataProvider
             schema: '/api/ui/MetadataResolver/FilesystemMetadataResolver',
             fields: [
                 'reloadableMetadataResolverAttributes'
+            ],
+            fieldsets: [
+                {
+                    type: 'group-lg',
+                    class: ['col-12'],
+                    fields: [
+                        'reloadableMetadataResolverAttributes'
+                    ]
+                }
             ]
         }
     ]
diff --git a/ui/src/app/wizard/model/wizard.ts b/ui/src/app/wizard/model/wizard.ts
index 35ae220c6..48c73aef4 100644
--- a/ui/src/app/wizard/model/wizard.ts
+++ b/ui/src/app/wizard/model/wizard.ts
@@ -14,6 +14,7 @@ export interface WizardStep {
     fields?: string[];
     fieldsets?: WizardFieldset[];
     summary?: boolean;
+    override?: any;
 }
 
 export interface WizardFieldset {
diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts
index 30f00b18d..b07ed3cd4 100644
--- a/ui/src/app/wizard/reducer/index.ts
+++ b/ui/src/app/wizard/reducer/index.ts
@@ -66,6 +66,15 @@ export const getSplitSchema = (schema: any, step: WizardStep) => {
         }
     };
 
+    if (step.override) {
+        Object.keys(step.override).forEach(key => {
+            let override = step.override[key];
+            if (s.properties.hasOwnProperty(key)) {
+                s.properties[key] = { ...s.properties[key], ...override };
+            }
+        });
+    }
+
     if (schema.definitions) {
         s.definitions = schema.definitions;
     }