impaktapps-ui-builder 0.0.279 → 0.0.281

package/dist/src/impaktapps-ui-builder/builder/build/buildUiSchema.d.ts

@@ -3,5 +3,10 @@ export declare let schema: {
     properties: {};
     required: any[];
 };
+export declare const buildSchema: (config: any, tableName?: string) => {
+    type: string;
+    properties: {};
+    required: any[];
+};
 declare const buildUiSchema: (config: any) => any;
 export default buildUiSchema;

package/dist/src/impaktapps-ui-builder/builder/build/uischema/validationSections.d.ts

@@ -24,8 +24,8 @@ export declare const ValidationSection: {
                         main: {
                             label: string;
                             options: {
-                                title: string;
                                 const: string;
+                                title: string;
                             }[];
                         };
                     };

package/dist/src/impaktapps-ui-builder/lib/index.d.ts

@@ -5,5 +5,5 @@ export { default as pageService } from "../runtime/services/service";
 export { schema } from "../builder/build/buildUiSchema";
 export { default as buildConfig } from "../builder/build/buildConfig";
 export { default as buildUiSchema } from "../builder/build/buildUiSchema";
-export { default as buildSchema } from "../builder/build/buildSchema";
+export { buildSchema } from "../builder/build/buildUiSchema";
 export { default as clearPreviousCache } from "../builder/services/clearLocalStorage";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "impaktapps-ui-builder",
-    "version": "0.0.279",
+    "version": "0.0.281",
     "scripts": {
         "dev": "vite",
         "build": "tsc && vite build",

package/src/impaktapps-ui-builder/builder/build/buildUiSchema.ts

@@ -34,29 +34,78 @@ import { buildCheckbox } from "./buildCheckbox";
 import { buildLineGraph } from "./buildLineGraph";
 import { buildRadio } from "./buildRadio";
 import { buildEmptyBox } from "./buildEmptyBox";
-export let schema =  {
+export let schema = {
   type: "object",
   properties: {},
   required: []
 };
-function buildRule(configObj: any) {
+
+function buildRule(configObj: any, tableName?: string) {
   if (configObj.validation) {
     configObj.validation.forEach((rule: any) => {
-      if (!schema.properties[configObj.name]) {
-        schema.properties[configObj.name] = {};
-      }
-      if (rule.validationType === "required") {
-        schema.required.push(configObj.name)
+      if (tableName) {
+        if (schema.properties?.[tableName]?.items?.properties) {
+          if (!schema.properties?.[tableName]?.items?.properties?.[configObj.name]) {
+            schema.properties[tableName].items.properties[configObj.name] = {};
+          }
+          if (rule.validationType === "required") {
+            schema.properties?.[tableName]?.items?.required.push(configObj.name)
+          } else {
+            schema.properties[tableName].items.properties[configObj.name]["type"] = "string"
+            schema.properties[tableName].items.properties[configObj.name][rule.validationType] =
+              isNaN(rule.validationValue) ?
+                rule.validationValue : Number(rule.validationValue)
+          }
+
+        }
       } else {
-        schema.properties[configObj.name]["type"] = "string"
-        schema.properties[configObj.name][rule.validationType] =
-          isNaN(rule.validationValue) ?
-            rule.validationValue : Number(rule.validationValue)
+
+        if (!schema.properties[configObj.name]) {
+          schema.properties[configObj.name] = {};
+        }
+        if (rule.validationType === "required") {
+          schema.required.push(configObj.name)
+        } else {
+          schema.properties[configObj.name]["type"] = "string"
+          schema.properties[configObj.name][rule.validationType] =
+            isNaN(rule.validationValue) ?
+              rule.validationValue : Number(rule.validationValue)
+        }
+
+
+
       }
     });
   }
 
 }
+export const buildSchema = (config: any, tableName?: string) => {
+  buildRule(config, tableName);
+  if (config?.elements) {
+
+    if (config.type == "Table") {
+      if (!schema.properties[config.name]) {
+        schema.properties[config.name] = {
+          type: "array",
+          items: {
+            type: "object",
+            properties: {},
+            required: []
+          }
+        }
+      }
+      config.elements.map((e, elemInd) => {
+        buildSchema(e, config.name)
+      })
+    }
+    else {
+      config.elements.map((e, elemInd) => {
+        buildSchema(e)
+      })
+    }
+  }
+  return schema;
+}
 
 
 const buildUiSchema = (config: any) => {
@@ -75,48 +124,37 @@ const buildUiSchema = (config: any) => {
       break;
     case "Text":
       elements = buildTextField(config, componentScope);
-      buildRule(config);
       break;
     case "TextArea":
       elements = buildTextArea(config, componentScope)
-      buildRule(config);
       break;
     case "Date":
       elements = buildDate(config, componentScope);
-      buildRule(config);
       break;
     case "Select":
       elements = buildSelect(config, componentScope);
-      buildRule(config);
       break;
     case "Radio":
       elements = buildRadio(config, componentScope);
-      buildRule(config);
       break;
     case "Button":
 
       elements = buildButton(config, componentScope);
-      buildRule(config);
       break;
     case "Table":
       elements = buildTable(config, componentScope);
-      buildRule(config);
       break;
     case "Box":
       elements = buildLabel(config, componentScope);
-      buildRule(config);
       break;
     case "CheckBox":
       elements = buildCheckbox(config, componentScope);
-      buildRule(config);
       break;
     case "UploadFile":
       elements = buildUploadFile(config, componentScope);
-      buildRule(config);
       break;
     case "DownloadFile":
       elements = buildDownloadFile(config, componentScope);
-      buildRule(config);
       break;
     case "EmptyBox":
       elements = buildEmptyBox(config, componentScope);
@@ -165,7 +203,6 @@ const buildUiSchema = (config: any) => {
 
     case "MultipleSelect":
       elements = buildMultiSelect(config, componentScope);
-      buildRule(config);
       break;
     case "LeaderBoard":
       elements = buildLeaderBoard(config);
@@ -204,7 +241,6 @@ const buildUiSchema = (config: any) => {
       });
     }
   }
-  localStorage.setItem("libSchema", JSON.stringify(schema || {}))
   return elements;
 }
 

package/src/impaktapps-ui-builder/builder/build/uischema/validationSections.ts

@@ -1,7 +1,7 @@
 export const ValidationSection = {
   type: "HorizontalLayout",
   elements: [
-    {
+   {
       type: "Control",
       scope: "#/properties/validation",
       layout: 11.5,
@@ -27,10 +27,10 @@ export const ValidationSection = {
                 main: {
                   label: "Validation Type",
                   options: [
-                    { title: "required", const: "Required" },
-                    { title: "minLength", const: "Minimum Length" },
-                    { title: "maxLength", const: "Maximum Length" },
-                    { title: "pattern", const: "Pattern" },
+                    { const: "required", title: "Required" },
+                    { const: "minLength", title: "Minimum Length" },
+                    { const: "maxLength", title: "Maximum Length" },
+                    { const: "pattern", title: "Pattern" },
                   ]
                 },
               },

package/src/impaktapps-ui-builder/lib/index.ts

@@ -6,5 +6,5 @@ export {default as pageService} from "../runtime/services/service"
 export { schema} from "../builder/build/buildUiSchema"
 export {default as buildConfig} from "../builder/build/buildConfig"
 export  {default as buildUiSchema} from "../builder/build/buildUiSchema"
-export  {default as buildSchema} from "../builder/build/buildSchema"
+export  {buildSchema} from "../builder/build/buildUiSchema"
 export {default as clearPreviousCache} from "../builder/services/clearLocalStorage"

package/dist/src/impaktapps-ui-builder/builder/build/buildSchema.d.ts

@@ -1,6 +0,0 @@
-export declare const buildSchema: (config: any) => {
-    type: string;
-    properties: {};
-    required: any[];
-};
-export default buildSchema;