Fix edit/new

sebt3 · Mar 6, 2024 · 6033cbf · 6033cbf
1 parent d838cb9
commit 6033cbf
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 16 deletions.
diff --git a/utils/generator/front/obj.pages.edit.vue.hbs b/utils/generator/front/obj.pages.edit.vue.hbs
@@ -110,7 +110,7 @@ function onSubmit(obj:object) {
   notifyWorking('Update in progress');
   patch{{ short }}({
     ...obj,
-    "metadata": result.value{{#if namespaced}}.k8sNamespace[0]{{/if}}.{{ group }}{{ short }}[0].metadata,
+    "metadata": Object.fromEntries(Object.entries(result.value{{#if namespaced}}.k8sNamespace[0]{{/if}}.{{ group }}{{ short }}[0].metadata).filter(([name])=>name!='__typename')),
   });
 }
 onError(onErrorHandler);onPatch{{ short }}(patchDone);onPatchError(patchError);

diff --git a/utils/generator/front/obj.pages.new.vue.hbs b/utils/generator/front/obj.pages.new.vue.hbs
@@ -27,10 +27,12 @@ onError((err) => {
 function onFinalSubmit() {
   notifyWorking('Create in progress');
   mutate({
+    "metadata": {
 {{#if namespaced}}
     "namespace": navigation.currentNamespace.value,
 {{/if}}
-    "name": name.value,
+    "name": name.value
+    },
 {{#each writeProperties}}
     "{{this}}": sanitizeData(obj.value.{{this}}),
 {{/each}}

diff --git a/utils/generator/front/obj.query.mutation.graphql.hbs b/utils/generator/front/obj.query.mutation.graphql.hbs
@@ -1,4 +1,4 @@
-mutation {{ group }}{{ short }}({{#if (isDelete mutationType)}}{{#if namespaced}}$namespace: String!, {{/if}}$name: String!{{else}}$metadata: metadataInput{{#each writeProperties}}, ${{this}}: {{getGQLType this ../gqlDefs}}{{/each}}{{/if}}) {
+mutation {{ group }}{{ short }}({{#if (isDelete mutationType)}}{{#if namespaced}}$namespace: String!, {{/if}}$name: String!{{else}}$metadata: metadataInput!{{#each writeProperties}}, ${{this}}: {{getGQLType this ../gqlDefs}}{{/each}}{{/if}}) {
   {{ group }}{{ short }}{{ mutationType }}({{#if (isDelete mutationType)}}{{#if namespaced}}namespace: $namespace, {{/if}}name: $name{{else}}metadata: $metadata{{#each writeProperties}}, {{this}}: ${{this}}{{/each}}{{/if}}) {
       metadata {
         name

diff --git a/utils/generator/partials/back/create.resolver.ts.hbs b/utils/generator/partials/back/create.resolver.ts.hbs
@@ -19,20 +19,24 @@
         try {
 {{#if (defined crd)}}
   {{#if namespaced}}
-            const res = await k8sApi.createNamespacedCustomObject('{{apiGroup}}','{{apiVersion}}',args['namespace'],'{{crd.status.acceptedNames.plural}}', payload)
+            const res = await k8sApi.createNamespacedCustomObject('{{apiGroup}}','{{apiVersion}}',args['metadata']['namespace'],'{{crd.status.acceptedNames.plural}}', payload)
   {{else}}
             const res = await k8sApi.createClusterCustomObject('{{apiGroup}}','{{apiVersion}}','{{crd.status.acceptedNames.plural}}', payload)
   {{/if}}
 {{else}}
   {{#if namespaced}}
-            const res = await k8sApi.createNamespaced{{ short }}(args['namespace'], payload)
+            const res = await k8sApi.createNamespaced{{ short }}(args['metadata']['namespace'], payload)
   {{else}}
             const res = await k8sApi.create{{ short }}(payload)
   {{/if}}
 {{/if}}
             return res.body
         } catch (err) {
-            console.error((err as object)['body']);
+          if (typeof err === 'object' && (err as object)['body'] !=undefined && (err as object)['statusCode'] !=undefined) {
+            if ((err as object)['statusCode'] != 404 && (err as object)['body']['reason']!='Forbidden') {
+              console.error('error', (err as object)['body']);
+            }
+          } else {console.error('error', err)}
         }
         return null
     },

diff --git a/utils/generator/partials/back/delete.resolver.ts.hbs b/utils/generator/partials/back/delete.resolver.ts.hbs
@@ -12,7 +12,11 @@
 {{/if}}
             return res.body
         } catch (err) {
-            console.error((err as object)['body']);
+          if (typeof err === 'object' && (err as object)['body'] !=undefined && (err as object)['statusCode'] !=undefined) {
+            if ((err as object)['statusCode'] != 404 && (err as object)['body']['reason']!='Forbidden') {
+              console.error('error', (err as object)['body']);
+            }
+          } else {console.error('error', err)}
         }
         return null
     },

diff --git a/utils/generator/partials/back/patch.resolver.ts.hbs b/utils/generator/partials/back/patch.resolver.ts.hbs
@@ -20,35 +20,39 @@
         try {
 {{#if (defined crd)}}
   {{#if namespaced}}
-            const resGet = await k8sApi.getNamespacedCustomObject('{{apiGroup}}','{{apiVersion}}',args['namespace'],'{{crd.status.acceptedNames.plural}}', args['name'])
+            const resGet = await k8sApi.getNamespacedCustomObject('{{apiGroup}}','{{apiVersion}}',args['metadata']['namespace'],'{{crd.status.acceptedNames.plural}}', args['metadata']['name'])
   {{else}}
-            const resGet = await k8sApi.getClusterCustomObject('{{apiGroup}}','{{apiVersion}}','{{crd.status.acceptedNames.plural}}', args['name'])
+            const resGet = await k8sApi.getClusterCustomObject('{{apiGroup}}','{{apiVersion}}','{{crd.status.acceptedNames.plural}}', args['metadata']['name'])
   {{/if}}
 {{else}}
   {{#if namespaced}}
-            const resGet = await k8sApi.readNamespaced{{ short }}(args['name'], args['namespace'])
+            const resGet = await k8sApi.readNamespaced{{ short }}(args['metadata']['name'], args['metadata']['namespace'])
   {{else}}
-            const resGet = await k8sApi.read{{ short }}(args['name'])
+            const resGet = await k8sApi.read{{ short }}(args['metadata']['name'])
   {{/if}}
 {{/if}}
             const payload = rfc6902.createPatch(resGet.body,request).filter(rule => !rule.path.startsWith('/status') && !['/metadata/creationTimestamp', '/metadata/finalizers', '/metadata/generation', '/metadata/managedFields', '/metadata/resourceVersion','/metadata/uid'].includes(rule.path) )
             const options = { "headers": { "Content-type": k8s.PatchUtils.PATCH_FORMAT_JSON_PATCH}};
 {{#if (defined crd)}}
   {{#if namespaced}}
-            const res = await k8sApi.patchNamespacedCustomObject('{{apiGroup}}','{{apiVersion}}',args['namespace'],'{{crd.status.acceptedNames.plural}}', args['name'], payload, undefined, undefined, undefined, options)
+            const res = await k8sApi.patchNamespacedCustomObject('{{apiGroup}}','{{apiVersion}}',args['metadata']['namespace'],'{{crd.status.acceptedNames.plural}}', args['metadata']['name'], payload, undefined, undefined, undefined, options)
   {{else}}
-            const res = await k8sApi.patchClusterCustomObject('{{apiGroup}}','{{apiVersion}}','{{crd.status.acceptedNames.plural}}', args['name'], payload, undefined, undefined, undefined, options)
+            const res = await k8sApi.patchClusterCustomObject('{{apiGroup}}','{{apiVersion}}','{{crd.status.acceptedNames.plural}}', args['metadata']['name'], payload, undefined, undefined, undefined, options)
   {{/if}}
 {{else}}
   {{#if namespaced}}
-            const res = await k8sApi.patchNamespaced{{ short }}(args['name'], args['namespace'], payload, undefined, undefined, undefined, undefined, undefined, options)
+            const res = await k8sApi.patchNamespaced{{ short }}(args['metadata']['name'], args['metadata']['namespace'], payload, undefined, undefined, undefined, undefined, undefined, options)
   {{else}}
-            const res = await k8sApi.patch{{ short }}(args['name'], payload, undefined, undefined, undefined, undefined, undefined, options)
+            const res = await k8sApi.patch{{ short }}(args['metadata']['name'], payload, undefined, undefined, undefined, undefined, undefined, options)
   {{/if}}
 {{/if}}
             return res.body
         } catch (err) {
-            console.error((err as object)['body']);
+          if (typeof err === 'object' && (err as object)['body'] !=undefined && (err as object)['statusCode'] !=undefined) {
+            if ((err as object)['statusCode'] != 404 && (err as object)['body']['reason']!='Forbidden') {
+              console.error('error', (err as object)['body']);
+            }
+          } else {console.error('error', err)}
         }
         return null
     },