Fix Data generation

front/components/navigation/MainMenu.vue

@@ -52,7 +52,7 @@ function toggleLeftDrawer() {
   <q-drawer show-if-above v-model="leftDrawerOpen" side="left" bordered :mini="miniState" :width="400" :breakpoint="500" @mouseover="miniState = false" @mouseout="miniState = true" mini-to-overlay>
     <q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: '0' }">
       <q-list padding v-if="router.currentRoute.value.matched.length>1">
-        <MainMenuLinks
+        <MainMenuLinks class="q-mr-xs"
           v-for="link in links"
           :key="`${link.title}-${router.currentRoute.value.matched[router.currentRoute.value.matched.length-1].path}`"
           v-bind="link">

front/libs/k8s/custom.ts

@@ -1,21 +1,21 @@
 // noGramoGenerator
 import { QTableColumn } from 'quasar'
 import { tableColumnAlign } from '../core'
-export const k8sIcon = 'apps';
+export const k8sIcon = 'fas fa-dharmachakra';
 export const k8sTitle = 'Standard';
-export const iconConfigMap = 'album';
+export const iconConfigMap = 'settings_suggest';
 export const colorConfigMap = '';
 export const descriptionConfigMap = '';
 export const shortConfigMap = '';
-export const iconEndpoints = 'album';
+export const iconEndpoints = 'fas fa-network-wired';
 export const colorEndpoints = '';
 export const descriptionEndpoints = '';
 export const shortEndpoints = '';
 export const iconLimitRange = 'album';
 export const colorLimitRange = '';
 export const descriptionLimitRange = '';
 export const shortLimitRange = '';
-export const iconNamespace = 'album';
+export const iconNamespace = 'fas fa-object-ungroup';
 export const colorNamespace = '';
 export const descriptionNamespace = '';
 export const shortNamespace = '';
@@ -63,6 +63,10 @@ export const iconAPIService = 'album';
 export const colorAPIService = '';
 export const descriptionAPIService = '';
 export const shortAPIService = '';
+export const iconControllerRevision = 'album';
+export const colorControllerRevision = '';
+export const descriptionControllerRevision = '';
+export const shortControllerRevision = 'ControllerRevision';
 export const iconDaemonSet = 'album';
 export const colorDaemonSet = '';
 export const descriptionDaemonSet = '';
@@ -216,6 +220,9 @@ export const extraServiceAccountColumns:Array<QTableColumn> = [
 export const extraAPIServiceColumns:Array<QTableColumn> = [
 //  {name: 'Name', label: 'Name', field: row => row.metadata.name, sortable: true, align: tableColumnAlign.left},
 ];
+export const extraControllerRevisionColumns:Array<QTableColumn> = [
+//  {name: 'Name', label: 'Name', field: row => row.metadata.name, sortable: true, align: tableColumnAlign.left},
+];
 export const extraDaemonSetColumns:Array<QTableColumn> = [
 //  {name: 'Name', label: 'Name', field: row => row.metadata.name, sortable: true, align: tableColumnAlign.left},
 ];
@@ -387,6 +394,12 @@ export const APIServiceReadExcludes = [
 ];
 export const APIServiceSimpleExcludes = [
 ];
+export const ControllerRevisionListExcludes = [
+];
+export const ControllerRevisionReadExcludes = [
+];
+export const ControllerRevisionSimpleExcludes = [
+];
 export const DaemonSetListExcludes = [
 ];
 export const DaemonSetReadExcludes = [

front/libs/vynil/custom.ts

@@ -1,9 +1,9 @@
 // noGramoGenerator
 import { QTableColumn } from 'quasar'
 import { tableColumnAlign } from '../core'
-export const vynilIcon = 'apps';
+export const vynilIcon = 'album';
 export const vynilTitle = 'Vynil';
-export const iconDistrib = 'album';
+export const iconDistrib = 'speaker_group';
 export const colorDistrib = '';
 export const descriptionDistrib = '';
 export const shortDistrib = '';

utils/generator/front/grp.pages.list.vue.hbs

@@ -47,7 +47,7 @@ onResult((res) => {
 })
 </script>
 <template>
-  <div class="row q-mb-sm q-ml-sm" v-if="isNamespaced()">
+  <div class="row q-mb-sm q-ml-sm" v-if="!isNamespaced()">
 {{#each objects}}
 {{#if namespaced}}
     <div class="col-lg-4" v-if="ready && {{ short }}ByTs.length>1" >

utils/generator/hb.ts

@@ -25,7 +25,7 @@ HB.registerHelper('haveQueries', (objects)=>(objects.filter(o=>!o['namespaced'])
 HB.registerHelper('capitalizeFirstLetter', (str)=>new HB.SafeString(capitalizeFirstLetter(str)))
 HB.registerHelper('lower', (str)=>new HB.SafeString(str.toLowerCase()))
 HB.registerHelper('minimizeFirstLetter', (str)=>new HB.SafeString(minimizeFirstLetter(str)))
-HB.registerHelper('toJson', v => new HB.SafeString(JSON.stringify(v)));
+HB.registerHelper('toJson', v => new HB.SafeString(JSON.stringify(v, null,2)));
 HB.registerHelper('getGQLType', (name,obj)=>new HB.SafeString(Object.entries(obj).filter(([n])=>name==n).map(([_,v])=>v)[0] as string))
 HB.registerHelper('genParameterQuery', (obj)=>new HB.SafeString(
     Object.entries(obj['gqlDefs'])

utils/generator/utils.ts

@@ -32,8 +32,8 @@ export function rmdir(directory:string){
         fs.rmdirSync(directory)
     }
 }
-export function saveTo(filename:string,content:any){
-    fs.writeFileSync(filename, JSON.stringify(content));
+export function saveTo(filename:string,content:object){
+    fs.writeFileSync(filename, JSON.stringify(content, null, 2));
 }
 export function LoadFrom(filename:string){
     return JSON.parse(fs.readFileSync(filename).toLocaleString())
@@ -119,35 +119,26 @@ export const enhenceObject = (group:string, obj:unspeciedObject) => {
 export const finalizeObject = (obj:k8sObject, all:k8sObject[]) => {
     return {
         ...obj,
+        alternatives: obj['alternatives'].length>1?obj['alternatives']:[],
         category: categoryMappingShort[obj.short]!=undefined?categoryMappingShort[obj.short]:categoryMappingGroup[obj.group]!=undefined?categoryMappingGroup[obj.group]:'varia',
         resolvers: obj.resolvers.map(r=>{return {...r, properties: all.filter(o=>o.group==r['resultGroup']&&o.short==r['resultShort']).map(o=>o.readProperties)[0]}})
     }
 }
 export const getObjFQN = (c: k8sDefinitionProperties) => c.spec.group.split('.').reverse().join('.')+'.'+getTargetVersion(c.spec.versions)+'.'+c.spec.names.kind
 
 export const replaceRefWithDef = (defs: [string, openapiDefinition][]) => {
-    const excluded = [
-        'io.k8s.apimachinery.pkg.apis.meta.v1.Time',
-        'io.k8s.apimachinery.pkg.util.intstr.IntOrString',
-        'io.k8s.apimachinery.pkg.api.resource.Quantity',
-        'io.k8s.api.core.v1.ConfigMapVolumeSource',
-        'io.k8s.api.core.v1.ConfigMapProjection',
-        'io.k8s.api.core.v1.DownwardAPIVolumeSource',
-        'io.k8s.api.core.v1.DownwardAPIProjection',
-        'io.k8s.api.core.v1.SecretProjection',
-        'io.k8s.api.core.v1.SecretVolumeSource',
-        'io.k8s.apimachinery.pkg.apis.meta.v1.MicroTime',
-        'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.CustomResourceSubresourceStatus',
-        'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSONSchemaProps']
+    const excluded: string[] = [
+        'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.JSONSchemaProps'
+    ]
     const queue = structuredClone(defs);
     const ret:Map<string, openapiDefinitionPropertiesDef> = new Map();
     const deref = (data) => {
         const res = structuredClone(data);
-        for (const [key, val] of Object.entries(data.properties as HashMap<openapiDefinitionPropertiesDef>)) {
-            if (val['$ref'] != undefined && !excluded.includes(val['$ref'].split('/')[2])) {
+        if (data.properties != undefined) {for (const [key, val] of Object.entries(data.properties as HashMap<openapiDefinitionPropertiesDef>)) {
+            if (val['$ref'] != undefined && val['$ref'].split('/').length>2 && !excluded.includes(val['$ref'].split('/')[2])) {
                 res.properties[key] = ret[val['$ref'].split('/')[2]]
             }
-            if (val['type'] == 'array' && val['items'] != undefined && val['items']['$ref'] != undefined && !excluded.includes(val['items']['$ref'].split('/')[2])) {
+            if (val['type'] == 'array' && val['items'] != undefined && val['items']['$ref'] != undefined && val['items']['$ref'].split('/').length>2 && !excluded.includes(val['items']['$ref'].split('/')[2])) {
                 res.properties[key]['items'] = ret[val['items']['$ref'].split('/')[2]]
             }
             if (val['type'] == 'object' && val.properties != undefined) {
@@ -157,37 +148,48 @@ export const replaceRefWithDef = (defs: [string, openapiDefinition][]) => {
                     }
                 }
             }
-        }
+        }}
         return res
     }
     let counter=0;
     while (queue.length>0) {
         const item = queue.shift();
         if (item===undefined) continue;
         let missing = false;
-        for (const [key, val] of Object.entries(item[1].properties)) {
+        if (item[1].properties != undefined) {for (const [key, val] of Object.entries(item[1].properties)) {
             missing = missing || (val['$ref'] != undefined && key !='metadata' && !excluded.includes(val['$ref'].split('/')[2]) && !Object.keys(ret).includes(val['$ref'].split('/')[2]));
+            //if ((val['$ref'] != undefined && key !='metadata' && !excluded.includes(val['$ref'].split('/')[2]) && !Object.keys(ret).includes(val['$ref'].split('/')[2]))) console.log('missing',val['$ref'].split('/')[2])
             if (val['type'] == 'array') {
                 missing = missing || (val['items']['$ref'] != undefined && !excluded.includes(val['items']['$ref'].split('/')[2]) && !Object.keys(ret).includes(val['items']['$ref'].split('/')[2]));
+                //if (val['items']['$ref'] != undefined && !excluded.includes(val['items']['$ref'].split('/')[2]) && !Object.keys(ret).includes(val['items']['$ref'].split('/')[2])) console.log('missing',val['items']['$ref'].split('/')[2])
             }
             if (val['type'] == 'object' && typeof val.properties == 'object') {
                 for (const [, v2] of Object.entries(val.properties)) {
                     missing = missing || ((v2 as object)['$ref'] != undefined && !excluded.includes((v2 as object)['$ref'].split('/')[2]) && !Object.keys(ret).includes((v2 as object)['$ref'].split('/')[2]));
+                    //if ((v2 as object)['$ref'] != undefined && !excluded.includes((v2 as object)['$ref'].split('/')[2]) && !Object.keys(ret).includes((v2 as object)['$ref'].split('/')[2]))console.log('missing',(v2 as object)['$ref'].split('/')[2]);
                 }
             }
             if (missing) break;
-        }
+        }}
         if (missing) {
             queue.push(item)
             counter++;
             if (counter>queue.length) {
+                console.log('leaving with',
+                    Object.fromEntries(queue.map(([n,v])=>[n,
+                        Object.fromEntries(
+                                    Object.entries(v['properties']).filter(([_,val])=>val['$ref']!=null).map(([name,val])=>[name,val['$ref']])
+                            .concat(Object.entries(v['properties']).filter(([_,val])=>val['type'] == 'array'&& val['items'] != null && val['items']['$ref']!=null).map(([name,val])=>[name,val['items']['$ref']]))
+                        )
+                    ])),
+                    queue.length)
                 break;
             }
-            //console.log(queue.length,Object.keys(ret).length)
             continue;
         }
         counter=0;
         ret[item[0]] = deref(item[1])
+        //if (item[0]=='io.k8s.api.core.v1.ServiceSpec') console.log(ret[item[0]]["properties"])
     }
     return ret
 }

utils/prepareData.ts

@@ -16,7 +16,7 @@ Promise.all([getClusterByPath('openapi/v2'), getClusterByPath('apis'), getCluste
 // and group them according to their defined apiGroup and final super group
     // Group all swagger definitions marked as a kubernetes object into their apiGroup,
     // add its CRD if found and start to refine the object properties
-    const definitions = replaceRefWithDef(Object.entries((data_in as openapi).definitions).filter(e => e[1].properties!=undefined && e[1].properties['items']==undefined))
+    const definitions = replaceRefWithDef(Object.entries((data_in as openapi).definitions))//.filter(e => e[1].properties!=undefined && e[1].properties['items']==undefined))
     const known_data = ((apis_in as object)['groups'] as Array<object>).map(i => { return {
         name: i['name'],
         ...getShort(i['name']),
@@ -29,7 +29,7 @@ Promise.all([getClusterByPath('openapi/v2'), getClusterByPath('apis'), getCluste
         })})
     }});
     // List the remaining objects not matched in a defined apiGroup (they belong to the group '' which is kubernetes main objects)
-    const excluded_objects = Object.entries((data_in as openapi).definitions).filter(([n, i]) =>
+    const excluded_objects = Object.entries(definitions).filter(([n, i]) =>
         Object.keys(i).includes('x-kubernetes-group-version-kind') && i['x-kubernetes-group-version-kind'].length==1 &&
         !known_data.map(d=>d.name).includes(i['x-kubernetes-group-version-kind'][0]['group']) &&
         !/List$/.test(n) && !/^io.k8s.apimachinery.pkg.apis/.test(n)
@@ -46,7 +46,6 @@ Promise.all([getClusterByPath('openapi/v2'), getClusterByPath('apis'), getCluste
     // Deduplicate same objects in distinct apiGroup and mark the alternative options
     return subgroups.map(s=>s.group).filter(uniq).map(g => { return {
         name: g,
-        subs: subgroups.filter(s=>s.group==g && s.objects.length>0),
         objects: subgroups.filter(s=>s.group==g && s.objects.length>0).map(s=>s.objects).flat().map(o=>o.short).filter(uniq).map((short) => {return {
             alternatives: subgroups.filter(s=>s.group==g && s.objects.length>0).map(s=>s.objects.filter(o=>o.short==short)).flat()
         }}).map(tmp=>{return finalizeObject({...tmp,...tmp.alternatives.sort((a,b)=>a.apiVersion.length>b.apiVersion.length?-1:a.apiVersion.length==b.apiVersion.length?a.apiVersion<b.apiVersion?-1:1:1).reverse()[0]} as k8sObject,allObjects)})