@solidstarters/solid-core-ui 1.1.66 → 1.1.68

package/src/components/core/users/CreateUser.tsx

@@ -70,11 +70,15 @@ const CreateUser = ({ data, params }: any) => {
   }, [data]);
 
   const handleCheckboxChange = (roleName: string) => {
+    let updatedRoles;
     if (selectedRoles.includes(roleName)) {
-      setSelectedRoles(selectedRoles.filter((name) => name !== roleName));
+      updatedRoles = selectedRoles.filter((name) => name !== roleName);
     } else {
-      setSelectedRoles([...selectedRoles, roleName]);
+      updatedRoles = [...selectedRoles, roleName];
     }
+    setSelectedRoles(updatedRoles);
+    formik.setFieldTouched('roles', true); // fake "touched"
+    formik.setFieldValue('roles', updatedRoles);
   };
 
   const initialValues = {
@@ -244,9 +248,9 @@ const CreateUser = ({ data, params }: any) => {
                 <div className="form-wrapper-title">Create User</div>
               </div>
               <div className="gap-3 flex">
-                {/* {formik.dirty && */}
+                {formik.dirty &&
                   <Button label="Save" size="small" type="submit" />
-                {/* } */}
+                }
                 <CancelButton />
               </div>
             </>
@@ -258,9 +262,9 @@ const CreateUser = ({ data, params }: any) => {
               </div>
               <div>
                 <div className="gap-3 flex">
-                  {/* {formik.dirty && */}
+                  {formik.dirty &&
                     <Button label="Save" size="small" type="submit" />
-                  {/* } */}
+                  }
                   {data &&
                     <Button outlined label="Delete" size="small" severity="danger" type="button" onClick={() => deleteUser(data.id)} />
                   }

package/src/helpers/registry.ts

@@ -9,7 +9,7 @@ import { SolidBooleanFieldCheckboxWidget } from "@/components/core/form/fields/w
 import { SolidBooleanFieldSelectWidget } from "@/components/core/form/fields/widgets/SolidBooleanSelectFieldWidget";
 import { SolidSelectionStaticAutocompleteWidget } from "@/components/core/form/fields/widgets/SolidSelectionStaticAutocompleteFieldWidget";
 import { SolidSelectionStaticRadioWidget } from "@/components/core/form/fields/widgets/SolidSelectionStaticRadioFieldWidget";
-import { SolidShortTextFieldTextRenderModeWidget } from "@/components/core/list/widgets/SolidShortTextFieldTextRenderModeWidget copy";
+import { SolidShortTextFieldTextRenderModeWidget } from "@/components/core/list/widgets/SolidShortTextFieldTextRenderModeWidget";
 import { SolidShortTextFieldImageRenderModeWidget } from "@/components/core/list/widgets/SolidShortTextFieldImageRenderModeWidget";
 import { SolidFormFieldViewModeWidget } from "@/components/core/form/fields/widgets/SolidFormFieldViewModeWidget";
 import { SolidFormFieldJsonViewModeWidget } from "@/components/core/form/fields/widgets/SolidFormFieldJsonViewModeWidget";
@@ -19,6 +19,9 @@ import { SolidFormFieldMediaViewModeWidget } from "@/components/core/form/fields
 import { SolidFormFieldRelationViewModeWidget } from "@/components/core/form/fields/widgets/SolidFormFieldRelationViewModeWidget";
 import { SolidFormFieldViewMediaSingleWidget } from "@/components/core/form/fields/widgets/SolidFormFieldViewMediaSingleWidget";
 import { SolidFormFieldViewMediaMultipleWidget } from "@/components/core/form/fields/widgets/SolidFormFieldViewMediaMultipleWidget";
+import { SolidUserNameAvatarWidget } from "@/components/core/list/widgets/SolidUserNameAvatarWidget";
+import GenerateModelCodeRowAction from "@/components/core/extension/solid-core/modelMetadata/list/GenerateModelCodeRowAction";
+import GenerateModuleCodeRowAction from "@/components/core/extension/solid-core/moduleMetadata/list/GenerateModuleCodeRowAction";
 
 type ExtensionRegistry = {
     components: Record<string, React.ComponentType<any>>;
@@ -79,6 +82,11 @@ export const getExtensionFunction = (name: string) => {
 // Register all the dynamic widget & functions from inside solid-core-ui
 // Common
 registerExtensionComponent("CustomHtml", CustomHtml, []);
+
+
+
+registerExtensionComponent("GenerateModelCodeRowAction", GenerateModelCodeRowAction, []);
+registerExtensionComponent("GenerateModuleCodeRowAction", GenerateModuleCodeRowAction, []);
 registerExtensionComponent("SolidRelationManyToManyCheckboxWidget", SolidRelationManyToManyCheckboxWidget, ["checkbox"]);
 registerExtensionComponent("SolidRelationManyToManyAutocompleteWidget", SolidRelationManyToManyAutocompleteWidget, ["autocomplete"]);
 registerExtensionComponent("SolidBooleanFieldCheckboxWidget", SolidBooleanFieldCheckboxWidget, ["field-checkbox"]);
@@ -95,6 +103,8 @@ registerExtensionComponent("SolidFormFieldMediaViewModeWidget", SolidFormFieldMe
 registerExtensionComponent("SolidFormFieldRelationViewModeWidget", SolidFormFieldRelationViewModeWidget, []);
 registerExtensionComponent("SolidFormFieldViewMediaSingleWidget", SolidFormFieldViewMediaSingleWidget, []);
 registerExtensionComponent("SolidFormFieldViewMediaMultipleWidget", SolidFormFieldViewMediaMultipleWidget, []);
+registerExtensionComponent("SolidFormFieldViewMediaMultipleWidget", SolidFormFieldViewMediaMultipleWidget, []);
+registerExtensionComponent("SolidUserNameAvatarWidget", SolidUserNameAvatarWidget, []);
 
 
 // ModuleMetadata

package/src/redux/api/modelApi.ts

@@ -20,7 +20,7 @@ export const modelsApi = createApi({
             }
         }),
         getmodelById: builder.query({
-            query: (id) => `/model-metadata/${id}?populate[0]=fields&populate[1]=module&populate[2]=fields.mediaStorageProvider`,
+            query: (id) => `/model-metadata/${id}?populate[0]=fields&populate[1]=module&&populate[2]=fields.mediaStorageProvider&populate[3]=parentModel`,
         }),
         createmodel: builder.mutation({
             query: (model) => ({

package/src/resources/globals.css

@@ -224,6 +224,11 @@ a {
 }
 
 /* Navbar - left sidebar */
+
+.active-menu-image {
+  border-radius: 4px;
+}
+
 .navbar-brand {
   display: inline-block;
   margin-bottom: 30px;
@@ -436,7 +441,6 @@ a {
 
 .form-field-label {
   font-weight: 400;
-  color: rgba(0, 0, 0, 0.88) !important;
 }
 
 .form-wrapper-subtitle {
@@ -1650,10 +1654,17 @@ li.header-li-px {
 
 .solid-form-wrapper {
   overflow: hidden;
+  display: flex;
+}
+
+.solid-form-section {
+  position: relative;
+  flex-grow: 1;
+  transition: width 0.3s ease;
 }
 
 .solid-form-wrapper .solid-form-content {
-  height: calc(100vh - 115px);
+  height: calc(100vh - 116px);
   /* height: calc(100vh - 111px); */
   /* If No Breadcrumb */
   /* height: calc(100vh - 64px); */
@@ -1668,6 +1679,7 @@ li.header-li-px {
   align-items: center;
   justify-content: space-between;
   background: var(--solid-light-grey);
+  border-bottom: 1px solid var(--primary-light-color);
 }
 
 .solid-form-stepper {
@@ -1709,7 +1721,7 @@ li.header-li-px {
 .solid-dropzone {
   border-radius: 0.5rem;
   border: 1px dashed var(--solid-primary-border);
-  background: rgba(255, 255, 255, 0.60);
+  background: var(--solid-dropzone-bg);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -1724,7 +1736,7 @@ li.header-li-px {
 
 .solid-file-upload-wrapper {
   border-radius: 8px;
-  border: 1px solid #E0E0E0;
+  border: 1px solid var(--solid-file-wrapper);
   padding: 10px;
   margin-top: 10px;
 }
@@ -1741,7 +1753,7 @@ li.header-li-px {
 
 .active-step-arrow {
   left: -21px;
-  z-index: 9999;
+  z-index: 2;
   top: 50%;
   transform: translateY(-38%);
 }
@@ -1819,7 +1831,6 @@ li.header-li-px {
 
 .solid-step-button.p-button.p-button-text {
   background-color: transparent;
-  color: #0D0B26;
   border: 0;
   min-width: 130px;
   /* padding-left: 0; */
@@ -1832,23 +1843,19 @@ li.header-li-px {
 
 .solid-step-button.p-button.p-button-text:not(:disabled):active {
   background-color: transparent;
-  color: #0D0B26;
 }
 
 .solid-step-button.p-button.p-button-text:not(:disabled):hover {
   background-color: transparent;
-  color: #0D0B26;
 }
 
 .solid-step-button.btn-step-first {
   /* border: 1px solid var(--solid-stepper-border) !important; */
   background-color: #EAEDF1;
-  color: #0D0B26;
 }
 
 .solid-step-button.btn-step-last {
   background-color: transparent;
-  color: #0D0B26;
 }
 
 .solid-step-button.btn-step {
@@ -2448,7 +2455,6 @@ li.header-li-px {
 }
 
 .solid-global-search-element {
-  border: 1px solid #d1d5db;
   border-radius: 8px;
   display: flex;
   align-items: center;
@@ -2468,7 +2474,6 @@ li.header-li-px {
   right: 0;
   top: 50%;
   transform: translateY(-50%);
-  border-left: 1px solid #d1d5db;
   border-radius: 0;
   height: 35.5px;
 }
@@ -2538,14 +2543,6 @@ li.header-li-px {
   font-size: 0.625rem !important;
 }
 
-.primary-filter-fieldset {
-  background-color: #F8F7FC;
-}
-
-.nested-custom-filter .primary-filter-fieldset {
-  background-color: #FFF;
-}
-
 .custom-filter-chip .p-chips-token {
   padding: 0.25rem 0.5rem !important;
   color: var(--primary-color) !important;
@@ -2622,7 +2619,6 @@ li.header-li-px {
 }
 
 .solid-layout-accordion label {
-  color: #000;
   font-weight: 400;
 }
 
@@ -2631,10 +2627,7 @@ li.header-li-px {
 }
 
 .solid-standard-autocomplete .p-autocomplete-dropdown.p-button {
-  background-color: #fff;
   border-left: none;
-  border-color: #d1d5db;
-  color: rgba(0, 0, 0, 0.60);
 }
 
 .solid-standard-autocomplete:hover .p-autocomplete-dropdown.p-button,
@@ -2642,16 +2635,6 @@ li.header-li-px {
   border-color: var(--primary-color);
 }
 
-/* Hide right shadow of input and left shadow of button to make them merge */
-.solid-standard-autocomplete .p-inputtext:focus {
-  /* box-shadow: 0 0 0 0.2rem #d3b5f5, inset -2px 0 0 #fff, inset 2px 0 0 transparent; */
-}
-
-.solid-standard-autocomplete .p-inputtext:focus+.p-button {
-  /* box-shadow: 0 0 0 0.2rem #d3b5f5, inset -2px 0 0 transparent, inset 2px 0 0 #fff; */
-  border-color: #d1d5db !important;
-}
-
 .solid-dialog .p-dialog-content {
   padding: 0 !important;
   border-radius: 0;
@@ -2714,13 +2697,11 @@ li.header-li-px {
 }
 
 .solid-custom-editor .ql-toolbar.ql-snow {
-  border: 1px solid #d1d5db;
   border-top-right-radius: 6px;
   border-top-left-radius: 6px;
 }
 
 .solid-custom-editor .ql-container.ql-snow {
-  border: 1px solid #d1d5db;
   border-bottom-right-radius: 6px;
   border-bottom-left-radius: 6px;
 }
@@ -2760,8 +2741,6 @@ li.header-li-px {
 } */
 
 .solid-column-panel.p-panel .p-panel-header {
-  border: 1px solid rgba(216, 226, 234, 0.40);
-  background: #F9F9F9;
   color: var(--solid-form-title);
   border-top-right-radius: 0.5rem;
   border-top-left-radius: 0.5rem;
@@ -2772,7 +2751,6 @@ li.header-li-px {
 }
 
 .solid-column-panel.p-panel .p-panel-content {
-  border: 1px solid rgba(216, 226, 234, 0.40);
   border-bottom-right-radius: 0.5rem;
   border-bottom-left-radius: 0.5rem;
   border-top: 0;
@@ -2963,35 +2941,20 @@ li.header-li-px {
 .solid-kanban-card {
   box-shadow: none;
   border-radius: 0.5rem;
-  border: 1px solid #E0E0E0;
-  background: #FAFAFA;
   padding: 9px;
   transition: 0.2s linear;
 }
 
-.solid-kanban-card:hover {
-  border: 1px solid #722ED1;
-  background: #F9F0FF;
-}
-
 .solid-media-card {
   box-shadow: none;
   border-radius: 0.5rem;
-  border: 1px solid #E0E0E0;
-  background: #FAFAFA;
   padding: 9px;
   height: 100%;
   transition: 0.2s linear;
 }
 
-.solid-media-card:hover {
-  border: 1px solid #722ED1;
-  background: #F9F0FF;
-}
-
 .solid-mimetype-chip {
   border-radius: 0.25rem;
-  background: #F0F0F0;
   padding: 0.25rem 0.5rem;
   color: var(--secondary-dark-color);
   font-size: 12px;
@@ -3015,10 +2978,8 @@ li.header-li-px {
   align-items: center;
   flex-shrink: 0;
   border-radius: 6.25rem;
-  background: #F6FAFF;
   font-size: 0.75rem;
   font-weight: 600;
-  color: var(--primary-color);
 }
 
 .kanban-image-preview {
@@ -3031,10 +2992,8 @@ flex-shrink: 0; */
   max-height: 120px;
   object-fit: contain;
   /* box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 2px 0px; */
-  background-color: #fff;
 }
 
-
 .kanban-media-image-preview {
   /* width: 100px; */
   /* width: 240px;
@@ -3044,7 +3003,6 @@ flex-shrink: 0; */
   border-radius: 8px;
   height: 145px;
   object-fit: contain;
-  background-color: #fff;
 }
 
 .kanban-media-view-card {
@@ -3052,19 +3010,12 @@ flex-shrink: 0; */
   border-radius: 8px;
   height: 145px;
   object-fit: contain;
-  background-color: #fff;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-.kanban-image-preview:hover {
-  box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 6px -1px, rgba(0, 0, 0, 0.06) 0px 2px 4px -1px;
-}
-
-
 .solid-kanban-board-wrapper {
-  border-top: 1px solid #CED0D6;
   overflow: hidden;
   height: calc(100vh - 65px) !important;
 }
@@ -3088,7 +3039,6 @@ flex-shrink: 0; */
 }
 
 .view-widget-chip.p-chip {
-  background-color: #f9f9f9 !important;
   padding: 4px 10px !important;
 }
 
@@ -3097,8 +3047,6 @@ flex-shrink: 0; */
   margin-bottom: 0 !important;
 }
 
-
-
 .solid-global-search-element input {
 
   min-width: 300px;

package/src/resources/stylesheets/_menu.scss

@@ -177,9 +177,4 @@
     object-fit: contain;
     height: 30px;
     width: 30px;
-}
-
-.active-menu-image {
-    background-color: #EFF1F4;
-    border-radius: 4px;
 }