@solidstarters/solid-core-ui 1.1.10 → 1.1.11

package/src/components/core/form/SolidFormView.tsx

@@ -141,7 +141,7 @@ const SolidField = ({ formik, field, fieldMetadata, initialEntityData, solidForm
         solidFormViewMetaData: solidFormViewMetaData,
         modelName: modelName,
     }
-    const solidField = fieldFactory(fieldMetadata.type, fieldContext);
+    const solidField = fieldFactory(fieldMetadata?.type, fieldContext);
 
     return solidField?.render(formik);
 };
@@ -281,6 +281,8 @@ const SolidFormView = (params: SolidFormViewProps) => {
 
     const [actionsAllowed, setActionsAllowed] = useState<string[]>([]);
 
+    const errorFields: string[] = [];
+
     const [triggerCheckIfPermissionExists] = useLazyCheckIfPermissionExistsQuery();
     useEffect(() => {
 
@@ -456,7 +458,7 @@ const SolidFormView = (params: SolidFormViewProps) => {
                     modelName: params.modelName,
                 }
 
-                let solidField = fieldFactory(fieldMetadata.type, fieldContext);
+                let solidField = fieldFactory(fieldMetadata?.type, fieldContext);
 
                 // Append each field to the FormData
                 if (value !== undefined && value !== null && solidField) {
@@ -480,6 +482,26 @@ const SolidFormView = (params: SolidFormViewProps) => {
         }
     }
 
+    const showFieldError = () => {
+        if (errorFields.length === 0) return;
+        errorFields.forEach((error) => {
+            toast?.current?.show({
+                severity: "error",
+                summary: "Metadata Error",
+                detail: error,
+                life: 3000,
+            });
+
+        });
+    
+        // errorFields.length = 0;
+    };
+    useEffect(() => {
+        if (errorFields.length > 0) {
+            showFieldError();
+        }
+    }, [errorFields])
+
     // - - - - - - - - - - - -- - - - - - - - - - - - DATA here
     // Fetch the actual data here. 
     // This is the initial value of this form, will come from an API call in the case of edit. 
@@ -493,10 +515,10 @@ const SolidFormView = (params: SolidFormViewProps) => {
         for (let i = 0; i < layoutFields.length; i++) {
             const formLayoutField = layoutFields[i];
             const fieldMetadata = solidFieldsMetadata[formLayoutField.attrs.name];
-            if (fieldMetadata.type === 'relation') {
+            if (fieldMetadata?.type === 'relation') {
                 toPopulate.push(fieldMetadata.name);
             }
-            if (fieldMetadata.type === 'mediaSingle' || fieldMetadata.type === 'mediaMultiple') {
+            if (fieldMetadata?.type === 'mediaSingle' || fieldMetadata?.type === 'mediaMultiple') {
                 toPopulateMedia.push(fieldMetadata.name);
             }
         }
@@ -550,7 +572,13 @@ const SolidFormView = (params: SolidFormViewProps) => {
                 solidFormViewMetaData: solidFormViewMetaData,
                 modelName: params.modelName,
             }
-            let solidField = fieldFactory(fieldMetadata.type, fieldContext);
+            let solidField = fieldFactory(fieldMetadata?.type, fieldContext);
+            if (!fieldMetadata?.type) {
+                const errorMessage = formLayoutField.attrs.label;
+                if (!errorFields.includes(errorMessage)) {
+                    errorFields.push(errorMessage);
+                }
+            }
             if (solidField) {
                 // @ts-ignore
                 validationSchema[formLayoutField.attrs.name] = solidField.validationSchema();

package/src/components/core/form/fields/SolidBooleanField.tsx

@@ -23,7 +23,12 @@ export class SolidBooleanField implements ISolidField {
     }
 
     initialValue(): any {
-        return this.fieldContext.data[this.fieldContext.field.attrs.name];
+        const fieldName = this.fieldContext.field.attrs.name;
+        const fieldDefaultValue = this.fieldContext?.fieldMetadata?.defaultValue;
+    
+        const existingValue = this.fieldContext.data[fieldName];
+    
+        return existingValue !== undefined && existingValue !== null ? existingValue : fieldDefaultValue || '';
     }
 
     validationSchema(): Schema {

package/src/components/core/form/fields/SolidDateField.tsx

@@ -22,7 +22,12 @@ export class SolidDateField implements ISolidField {
     }
 
     initialValue(): any {
-        return this.fieldContext.data[this.fieldContext.field.attrs.name];
+        const fieldName = this.fieldContext.field.attrs.name;
+        const fieldDefaultValue = this.fieldContext?.fieldMetadata?.defaultValue;
+    
+        const existingValue = this.fieldContext.data[fieldName];
+    
+        return existingValue !== undefined && existingValue !== null ? existingValue : fieldDefaultValue || '';
     }
 
     validationSchema(): Schema {

package/src/components/core/form/fields/SolidDateTimeField.tsx

@@ -22,7 +22,12 @@ export class SolidDateTimeField implements ISolidField {
     }
 
     initialValue(): any {
-        return this.fieldContext.data[this.fieldContext.field.attrs.name];
+        const fieldName = this.fieldContext.field.attrs.name;
+        const fieldDefaultValue = this.fieldContext?.fieldMetadata?.defaultValue;
+    
+        const existingValue = this.fieldContext.data[fieldName];
+    
+        return existingValue !== undefined && existingValue !== null ? existingValue : fieldDefaultValue || '';
     }
 
     validationSchema(): Schema {

package/src/components/core/form/fields/SolidDecimalField.tsx

@@ -21,7 +21,12 @@ export class SolidDecimalField implements ISolidField {
     }
 
     initialValue(): any {
-        return this.fieldContext.data[this.fieldContext.field.attrs.name];
+        const fieldName = this.fieldContext.field.attrs.name;
+        const fieldDefaultValue = this.fieldContext?.fieldMetadata?.defaultValue;
+    
+        const existingValue = this.fieldContext.data[fieldName];
+    
+        return existingValue !== undefined && existingValue !== null ? existingValue : fieldDefaultValue || '';
     }
 
     validationSchema(): Schema {

package/src/components/core/form/fields/SolidIntegerField.tsx

@@ -21,7 +21,12 @@ export class SolidIntegerField implements ISolidField {
     }
 
     initialValue(): any {
-        return this.fieldContext.data[this.fieldContext.field.attrs.name];
+        const fieldName = this.fieldContext.field.attrs.name;
+        const fieldDefaultValue = this.fieldContext?.fieldMetadata?.defaultValue;
+    
+        const existingValue = this.fieldContext.data[fieldName];
+    
+        return existingValue !== undefined && existingValue !== null ? existingValue : fieldDefaultValue || '';
     }
 
     validationSchema(): Schema {

package/src/components/core/form/fields/SolidLongTextField.tsx

@@ -21,7 +21,12 @@ export class SolidLongTextField implements ISolidField {
     }
 
     initialValue(): any {
-        return this.fieldContext.data[this.fieldContext.field.attrs.name];
+        const fieldName = this.fieldContext.field.attrs.name;
+        const fieldDefaultValue = this.fieldContext?.fieldMetadata?.defaultValue;
+    
+        const existingValue = this.fieldContext.data[fieldName];
+    
+        return existingValue !== undefined && existingValue !== null ? existingValue : fieldDefaultValue || '';
     }
 
     validationSchema(): Schema {

package/src/components/core/form/fields/SolidSelectionStaticField.tsx

@@ -22,12 +22,17 @@ export class SolidSelectionStaticField implements ISolidField {
     }
 
     initialValue(): any {
-        // TODO: Use the field metadata to re-create the object in the valid format 
-        // {label: '', value: ''}
-        const optionValue = this.fieldContext.data[this.fieldContext.field.attrs.name];
+        // Get field name and metadata
+        const fieldName = this.fieldContext.field.attrs.name;
         const fieldMetadata = this.fieldContext.fieldMetadata;
-
-        const getDisplayValue = (value: string): string | null => {
+        const fieldDefaultValue = fieldMetadata?.defaultValue;
+    
+        // Get existing value from form data
+        const existingValue = this.fieldContext.data[fieldName];
+    
+        // Function to get display value based on selectionStaticValues
+        const getDisplayValue = (value: string | null): string | null => {
+            if (!value) return null;
             for (const item of fieldMetadata.selectionStaticValues) {
                 const [lhs, rhs] = item.split(':');
                 if (lhs === value) {
@@ -36,11 +41,16 @@ export class SolidSelectionStaticField implements ISolidField {
             }
             return null;
         };
-
-        const displayValue = getDisplayValue(optionValue)
-
-        return { label: displayValue ?? '', value: optionValue };
+    
+        // Determine the final value to use (existing value or default value)
+        const finalValue = existingValue ?? fieldDefaultValue ?? '';
+    
+        // Get display value for the final value
+        const displayValue = getDisplayValue(finalValue);
+    
+        return { label: displayValue ?? '', value: finalValue };
     }
+    
 
     validationSchema(): Schema {
 

package/src/components/core/form/fields/SolidShortTextField.tsx

@@ -21,8 +21,14 @@ export class SolidShortTextField implements ISolidField {
     }
 
     initialValue(): any {
-        return this.fieldContext.data[this.fieldContext.field.attrs.name];
+        const fieldName = this.fieldContext.field.attrs.name;
+        const fieldDefaultValue = this.fieldContext?.fieldMetadata?.defaultValue;
+    
+        const existingValue = this.fieldContext.data[fieldName];
+    
+        return existingValue !== undefined && existingValue !== null ? existingValue : fieldDefaultValue || '';
     }
+    
 
     validationSchema(): Schema {
         let schema: Yup.StringSchema<string | null | undefined> = Yup.string();
@@ -62,7 +68,6 @@ export class SolidShortTextField implements ISolidField {
         const fieldLabel = fieldLayoutInfo.attrs.label ?? fieldMetadata.displayName;
         const fieldDescription = fieldLayoutInfo.attrs.description ?? fieldMetadata.description;
         const solidFormViewMetaData = this.fieldContext.solidFormViewMetaData;
-
         const isFormFieldValid = (formik: any, fieldName: string) => formik.touched[fieldName] && formik.errors[fieldName];
 
         const fieldDisabled = fieldLayoutInfo.attrs?.disabled;

package/src/components/core/form/fields/SolidTimeField.tsx

@@ -22,7 +22,12 @@ export class SolidTimeField implements ISolidField {
     }
 
     initialValue(): any {
-        return this.fieldContext.data[this.fieldContext.field.attrs.name];
+        const fieldName = this.fieldContext.field.attrs.name;
+        const fieldDefaultValue = this.fieldContext?.fieldMetadata?.defaultValue;
+    
+        const existingValue = this.fieldContext.data[fieldName];
+    
+        return existingValue !== undefined && existingValue !== null ? existingValue : fieldDefaultValue || '';
     }
 
     validationSchema(): Schema {

package/src/components/core/form/fields/relations/SolidRelationManyToManyField.tsx

@@ -29,7 +29,7 @@ export class SolidRelationManyToManyField implements ISolidField {
 
         const manyToManyFieldData = this.fieldContext.data[this.fieldContext.field.attrs.name];
         const fieldMetadata = this.fieldContext.fieldMetadata;
-        const userKeyField = fieldMetadata.relationModel.userKeyField.name;
+        const userKeyField = fieldMetadata?.relationModel?.userKeyField?.name;
         if (manyToManyFieldData) {
             return manyToManyFieldData.map((e: any) => {
                 const manyToManyColVal = e[userKeyField] || '';
@@ -150,7 +150,7 @@ export class SolidRelationManyToManyField implements ISolidField {
             let filterQuery;
             if (query) {
                 filterQuery = {
-                    [fieldMetadata.relationModel.userKeyField.name]: {
+                    [fieldMetadata?.relationModel?.userKeyField?.name]: {
                         '$containsi': query
                     }
                 }
@@ -175,7 +175,7 @@ export class SolidRelationManyToManyField implements ISolidField {
             if (autocompleteData) {
                 const autoCompleteItems = autocompleteData.records.map((item: any) => {
                     return {
-                        label: item[fieldMetadata.relationModel.userKeyField.name],
+                        label: item[fieldMetadata?.relationModel?.userKeyField?.name],
                         value: item['id'],
                         original: item
                     }
@@ -205,7 +205,7 @@ export class SolidRelationManyToManyField implements ISolidField {
             const updatedRelationData = [
                 ...currentRelationData,
                 {
-                    label: jsonValues[fieldMetadata.relationModel.userKeyField.name],
+                    label: jsonValues[fieldMetadata?.relationModel?.userKeyField?.name],
                     value: "new",
                     original: jsonValues,
                 },
@@ -309,7 +309,7 @@ export class SolidRelationManyToManyField implements ISolidField {
                 offset: 0,
                 limit: 10,
                 filters: {
-                    [fieldMetadata.relationModel.userKeyField.name]: {
+                    [fieldMetadata?.relationModel?.userKeyField?.name]: {
                         '$containsi': event.query
                     }
                 }
@@ -328,7 +328,7 @@ export class SolidRelationManyToManyField implements ISolidField {
             if (autocompleteData) {
                 const autoCompleteItems = autocompleteData.records.map((item: any) => {
                     return {
-                        label: item[fieldMetadata.relationModel.userKeyField.name],
+                        label: item[fieldMetadata?.relationModel?.userKeyField?.name],
                         value: item['id'],
                         original: item
 
@@ -344,7 +344,7 @@ export class SolidRelationManyToManyField implements ISolidField {
             const updatedRelationData = [
                 ...currentRelationData,
                 {
-                    label: jsonValues[fieldMetadata.relationModel.userKeyField.name],
+                    label: jsonValues[fieldMetadata?.relationModel?.userKeyField?.name],
                     value: "new",
                     original: jsonValues,
                 },

package/src/components/core/form/fields/relations/SolidRelationManyToOneField.tsx

@@ -21,7 +21,7 @@ export class SolidRelationManyToOneField implements ISolidField {
 
         const manyToOneFieldData = this.fieldContext.data[this.fieldContext.field.attrs.name];
         const fieldMetadata = this.fieldContext.fieldMetadata;
-        const userKeyField = fieldMetadata.relationModel.userKeyField.name;
+        const userKeyField = fieldMetadata?.relationModel?.userKeyField?.name;
         const manyToOneColVal = manyToOneFieldData ? manyToOneFieldData[userKeyField] : '';
         if (manyToOneColVal) {
             return { label: manyToOneColVal || '', value: manyToOneFieldData?.id || '' };
@@ -77,7 +77,7 @@ export class SolidRelationManyToOneField implements ISolidField {
                 offset: 0,
                 limit: 10,
                 filters: {
-                    [fieldMetadata.relationModel.userKeyField.name]: {
+                    [fieldMetadata?.relationModel?.userKeyField?.name]: {
                         '$containsi': event.query
                     }
                 }
@@ -96,7 +96,7 @@ export class SolidRelationManyToOneField implements ISolidField {
             if (autocompleteData) {
                 const autoCompleteItems = autocompleteData.records.map((item: any) => {
                     return {
-                        label: item[fieldMetadata.relationModel.userKeyField.name],
+                        label: item[fieldMetadata?.relationModel?.userKeyField?.name],
                         value: item['id']
                     }
                 });

package/src/components/core/list/SolidListView.tsx

@@ -121,20 +121,23 @@ export const SolidListView = (params: SolidListViewParams) => {
 
     const initialFilters: any = {};
     const toPopulate: string[] = [];
-    for (let i = 0; i < solidView.layout.children.length; i++) {
+    for (let i = 0; i < solidView.layout.children?.length; i++) {
       const column = solidView.layout.children[i];
       const fieldMetadata = solidFieldsMetadata[column.attrs.name];
-
+      if (!fieldMetadata?.type) {
+        showFieldError(`${column.attrs.label} is not present in metadata`)
+        return;
+      }
       // Form the initial filters after iterating over the columns and field metadata. 
-      if (['int', 'bigint', 'float', 'decimal'].includes(fieldMetadata.type)) {
+      if (['int', 'bigint', 'float', 'decimal'].includes(fieldMetadata?.type)) {
         // initialFilters[column.attrs.name] = { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.EQUALS }] }
         initialFilters[column.attrs.name] = { value: null, matchMode: FilterMatchMode.EQUALS }
       }
-      else if (['date', 'datetime', 'time', 'boolean'].includes(fieldMetadata.type)) {
+      else if (['date', 'datetime', 'time', 'boolean'].includes(fieldMetadata?.type)) {
         // initialFilters[column.attrs.name] = { operator: FilterOperator.OR, constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }] }
         initialFilters[column.attrs.name] = { value: null, matchMode: FilterMatchMode.EQUALS }
       }
-      else if (['relation', 'selectionStatic', 'selectionDynamic'].includes(fieldMetadata.type)) {
+      else if (['relation', 'selectionStatic', 'selectionDynamic'].includes(fieldMetadata?.type)) {
         initialFilters[column.attrs.name] = { value: null, matchMode: FilterMatchMode.IN }
       }
       else {
@@ -402,7 +405,7 @@ export const SolidListView = (params: SolidListViewParams) => {
     if (sortField) {
       const sortFieldMetadata = solidFieldsMetadata[sortField];
       if (sortFieldMetadata.type === 'relation' && sortFieldMetadata.relationType === 'many-to-one') {
-        sortField = `${sortField}.${sortFieldMetadata.relationModel.userKeyField.name}`;
+        sortField = `${sortField}.${sortFieldMetadata?.relationModel?.userKeyField?.name}`;
       }
       queryData.sort = [
         `${sortField}:${sortOrder == 0 ? null : sortOrder == 1 ? "asc" : "desc"}`,
@@ -556,6 +559,28 @@ export const SolidListView = (params: SolidListViewParams) => {
     }
   };
 
+  const showFieldError = async (error) => {
+    if (error) {
+      toast?.current?.show({
+        severity: "error",
+        summary: "Can you send me the report?",
+        // sticky: true,
+        life: 3000,
+        //@ts-ignore
+        content: (props) => (
+          <div
+            className="flex flex-column align-items-left"
+            style={{ flex: "1" }}
+          >
+            <div className="flex align-items-center gap-2" >
+              <span className="font-bold text-900">{String(error)}</span>
+            </div>
+          </div>
+        ),
+      });
+    }
+  };
+
   // handle bulk deletion
   const deleteBulk = () => {
     let deleteList: any = [];
@@ -587,7 +612,7 @@ export const SolidListView = (params: SolidListViewParams) => {
     if (!solidView || !solidFieldsMetadata) {
       return;
     }
-    return solidView.layout.children.map((column: any) => {
+    return solidView.layout.children?.map((column: any) => {
       const fieldMetadata = solidFieldsMetadata[column.attrs.name];
       if (!fieldMetadata) {
         return;

package/src/components/core/list/SolidManyToOneFilterElement.tsx

@@ -19,7 +19,7 @@ export const SolidManyToOneFilterElement = ({ value, updateInputs, index, fieldM
             offset: 0,
             limit: 10,
             filters: {
-                [fieldMetadata.relationModel.userKeyField.name]: {
+                [fieldMetadata?.relationModel?.userKeyField?.name]: {
                     $containsi: event.query
                 }
             }
@@ -38,7 +38,7 @@ export const SolidManyToOneFilterElement = ({ value, updateInputs, index, fieldM
         if (autocompleteData) {
             const autoCompleteItems = autocompleteData.records.map((item: any) => {
                 return {
-                    label: item[fieldMetadata.relationModel.userKeyField.name],
+                    label: item[fieldMetadata?.relationModel?.userKeyField?.name],
                     value: item['id']
                 }
             });

package/src/components/core/list/columns/SolidBooleanColumn.tsx

@@ -30,12 +30,12 @@ const SolidBooleanColumn = ({ solidListViewMetaData, fieldMetadata, column }: So
 
     // Custom body template for Boolean column
     const bodyTemplate = (rowData: any) => {
-        return rowData.isActive ? 'Yes' : 'No';
+        const fieldKey = column.attrs.label ?? fieldMetadata.name;
+        return rowData[fieldKey] ? 'Yes' : 'No';
     };
 
     const header = column.attrs.label ?? fieldMetadata.displayName;
 
-
     // TODO: filterTemplate, bodyTemplate & filterMatchModeOptions to be provided.
 
     return (

package/src/components/core/list/columns/relations/SolidRelationManyToOneColumn.tsx

@@ -34,7 +34,7 @@ const SolidRelationManyToOneColumn = ({ solidListViewMetaData, fieldMetadata, co
         // This is the userkey that will be present within the rowData.
         if (manyToOneFieldData) {
             // Since this is a many-to-one field, we fetch the user key field of the associated model.
-            const userKeyField = fieldMetadata.relationModel.userKeyField.name;
+            const userKeyField = fieldMetadata?.relationModel?.userKeyField?.name;
 
             const manyToOneColVal = manyToOneFieldData[userKeyField];