@solidstarters/solid-core-ui 1.1.68 → 1.1.69

package/src/components/core/common/SolidGlobalSearchElement.tsx

@@ -203,7 +203,7 @@ export const mergeSearchAndCustomFilters = (transformedFilter: any, newFilter: a
 const SavedFilterList = ({ savedfilter, activeSavedFilter, applySavedFilter, openSavedCustomFilter, setSavedFilterTobeDeleted, setIsDeleteSQDialogVisible }: any) => {
     return (
         <div className="flex align-items-center justify-content-between gap-2">
-            <Button text size="small" className="text-base py-1 w-full" severity={Number(activeSavedFilter) == savedfilter.id ? "secondary" : "contrast" } onClick={() => applySavedFilter(savedfilter)}>{savedfilter.name}</Button>
+            <Button text size="small" className="text-base py-1 w-full" severity={Number(activeSavedFilter) == savedfilter.id ? "secondary" : "contrast"} onClick={() => applySavedFilter(savedfilter)}>{savedfilter.name}</Button>
             <div className="flex align-items-center gap-2">
                 <Button
                     icon="pi pi-pencil"
@@ -228,7 +228,7 @@ const SavedFilterList = ({ savedfilter, activeSavedFilter, applySavedFilter, ope
     )
 }
 
-export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCustomFilter, filters, clearFilter }: any, ref) => {
+export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCustomFilter, filters, clearFilter, showSaveFilterPopup, setShowSaveFilterPopup }: any, ref) => {
     const defaultState: FilterRule[] = [
         {
             id: 1,
@@ -276,7 +276,6 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
     const [searchFilter, setSearchFilter] = useState<any | null>(null);
     const [customFilter, setCustomFilter] = useState<any | null>(null);
     const [hasSearched, setHasSearched] = useState<boolean>(false);
-    const [showSaveFilterPopup, setShowSaveFilterPopup] = useState<boolean>(false);
     const [currentSavedFilterData, setCurrentSavedFilterData] = useState<any>();
     const [savedFilterTobeDeleted, setSavedFilterTobeDeleted] = useState<any>();
     const [isDeleteSQDialogVisible, setIsDeleteSQDialogVisible] = useState<boolean>(false);
@@ -316,7 +315,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
     useEffect(() => {
 
         const filters = {
-            $or:[
+            $or: [
                 {
                     $and: [
                         { model: { $in: [viewData?.data?.solidView?.model?.id] } },
@@ -333,7 +332,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                 }
 
             ]
-            
+
         }
 
         const queryData: any = {
@@ -690,7 +689,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                             <React.Fragment>
                                 <span key={index} className="custom-chip-value">{value}
                                 </span>
-                                {values.length > 1 &&
+                                {index < values.length - 1 &&
                                     <span className="custom-chip-or">or</span>
                                 }
                             </React.Fragment>
@@ -809,7 +808,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                         }
                     </div>
                 </Dialog>
-                <Dialog header="Add Custom Filter" visible={showSaveFilterPopup} style={{ width: 500 }} onHide={() => { if (!showSaveFilterPopup) return; setShowSaveFilterPopup(false); }}>
+                <Dialog header="Save Custom Filter" visible={showSaveFilterPopup} style={{ width: 500 }} onHide={() => { if (!showSaveFilterPopup) return; setShowSaveFilterPopup(false); }}>
                     <SolidSaveCustomFilterForm currentSavedFilterData={currentSavedFilterData} handleSaveFilter={handleSaveFilter} closeDialog={setShowSaveFilterPopup}></SolidSaveCustomFilterForm>
                 </Dialog>
 
@@ -828,7 +827,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                     <p>Are you sure you want to delete the {currentSavedFilterData?.name} saved query?</p>
                 </Dialog>
             </div>
-            <div>
+            {/* <div>
                 <Button
                     icon="pi pi-save"
                     style={{ fontSize: 10 }}
@@ -838,7 +837,7 @@ export const SolidGlobalSearchElement = forwardRef(({ viewData, handleApplyCusto
                         setShowSaveFilterPopup(true)
                     }}
                 />
-            </div>
+            </div> */}
         </>
     )
 });

package/src/components/core/kanban/KanbanCard.tsx

@@ -1,11 +1,10 @@
 // @ts-nocheck
 'use client';
-
-import { Draggable, DraggableProvided } from "@hello-pangea/dnd";
-import { Card } from "primereact/card";
-import React from "react";
+import React, { useRef } from "react";
 import { SolidKanbanViewFields } from "./SolidKanbanViewFields";
 import { useRouter } from "next/navigation";
+import { Button } from "primereact/button";
+import { OverlayPanel } from "primereact/overlaypanel";
 
 // Define the types for the data and props
 interface Data {
@@ -162,6 +161,53 @@ const KanbanCard: React.FC<KanbanCardProps> = ({ data, solidKanbanViewMetaData,
     return dynamicForm;
   };
 
+  const kanbanActionRef = useRef(null);
+
+  const renderKanbanAction = (data, groupedView) => {
+    return (
+      <div className="solid-kanban-action" onClick={(e) => e.stopPropagation()}>
+        <Button
+          size="small"
+          text
+          className="text-sm p-0"
+          icon="pi pi-ellipsis-v"
+          onClick={(e) => kanbanActionRef.current.toggle(e)}
+          style={{ width: 25, height: 25 }}
+        />
+        <OverlayPanel ref={kanbanActionRef} className="solid-custom-overlay">
+          <div className="flex flex-column">
+            <Button
+              type="button"
+              className="w-8rem text-left gap-1"
+              label="Edit"
+              size="small"
+              iconPos="left"
+              text
+              icon={"pi pi-pencil"}
+              onClick={() => router.push(`${editButtonUrl}/${data?.id}`)}
+            />
+            {!groupedView &&
+              <a
+                href={data?.relativeUri}
+                download={data?.originalFileName}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <Button
+                  type="button"
+                  className="w-8rem text-left gap-1"
+                  label="Download"
+                  size="small"
+                  iconPos="left"
+                  icon={"pi pi-download"}
+                />
+              </a>
+            }
+          </div>
+        </OverlayPanel>
+      </div>
+    )
+  }
 
   return (
     <Draggable draggableId={String(data.id)} index={index} isDragDisabled={!groupedView}>
@@ -191,8 +237,8 @@ const KanbanCard: React.FC<KanbanCardProps> = ({ data, solidKanbanViewMetaData,
               router.push(`${editButtonUrl}/${data?.id}`)
             }}
           >
+            {renderKanbanAction(data, groupedView)}
             {renderFormDynamically(solidKanbanViewMetaData)}
-
             {/* {solidKanbanViewMetaData?.solidView?.layout?.layoutData &&
               Object.entries(solidKanbanViewMetaData?.solidView?.layout?.layoutData).map(([key, value]) => (
                 <p className="kanban-card-heading" key={key}>{data[value]}</p>

package/src/components/core/kanban/SolidKanbanView.tsx

@@ -236,7 +236,7 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
   const [columnsCount, setColumnsCount] = useState(5);
   const [swimLaneCurrentPageNumber, setSwimLaneCurrentPageNumber] = useState(1);
   const [queryDataLoaded, setQueryDataLoaded] = useState(false);
-
+  const [showSaveFilterPopup, setShowSaveFilterPopup] = useState<boolean>(false);
 
 
   const showToast = (severity: "success" | "error", summary: string, detail: string) => {
@@ -722,7 +722,7 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
           <p className="m-0 view-title">{kanbanViewTitle}</p>
           {solidKanbanViewMetaData?.data?.solidView?.layout?.attrs.enableGlobalSearch === true &&
             // <SolidGlobalSearchElement viewData={solidKanbanViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter} ></SolidGlobalSearchElement>
-            <SolidGlobalSearchElement ref={solidGlobalSearchElementRef} viewData={solidKanbanViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter}  ></SolidGlobalSearchElement>
+            <SolidGlobalSearchElement showSaveFilterPopup={showSaveFilterPopup} setShowSaveFilterPopup={setShowSaveFilterPopup} ref={solidGlobalSearchElementRef} viewData={solidKanbanViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter}  ></SolidGlobalSearchElement>
 
           }
         </div>
@@ -754,6 +754,7 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
             actionsAllowed={actionsAllowed}
             viewModes={viewModes}
             setLayoutDialogVisible={setLayoutDialogVisible}
+            setShowSaveFilterPopup={setShowSaveFilterPopup}
           />
           {/* <SolidConfigureLayoutElement></SolidConfigureLayoutElement> */}
         </div>

package/src/components/core/kanban/SolidKanbanViewConfigure.tsx

@@ -7,7 +7,7 @@ import { OverlayPanel } from 'primereact/overlaypanel';
 import { RadioButton } from 'primereact/radiobutton';
 import React, { useEffect, useRef, useState } from 'react'
 
-export const SolidKanbanViewConfigure = ({ solidKanbanViewMetaData, actionsAllowed, setLayoutDialogVisible, viewModes }: any) => {
+export const SolidKanbanViewConfigure = ({ solidKanbanViewMetaData, actionsAllowed, setLayoutDialogVisible, viewModes, setShowSaveFilterPopup }: any) => {
     const op = useRef(null);
     const customizeLayout = useRef<OverlayPanel | null>(null);
     const pathname = usePathname();
@@ -98,6 +98,7 @@ export const SolidKanbanViewConfigure = ({ solidKanbanViewMetaData, actionsAllow
                     >
                         <i className="pi pi-chevron-right text-sm"></i>
                     </Button>
+                    <Button text icon='pi pi-save' label="Save Custom Filter" size="small" severity="secondary" className="text-left gap-2 text-base" onClick={() => setShowSaveFilterPopup(true)} />
                     <OverlayPanel ref={customizeLayout} className="customize-layout-panel" style={{ minWidth: 250 }}
                         onShow={() => setIsOverlayOpen(true)}
                         onHide={() => {

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

@@ -267,6 +267,8 @@ export const SolidListView = (params: SolidListViewParams) => {
   const [showArchived, setShowArchived] = useState(false);
   const [queryDataLoaded, setQueryDataLoaded] = useState(false);
   const [customFilter, setCustomFilter] = useState(null);
+  const [showSaveFilterPopup, setShowSaveFilterPopup] = useState<boolean>(false);
+
   const sizeOptions = [
     { label: 'Compact', value: 'small', image: CompactImage },
     { label: 'Cozy', value: 'normal', image: CozyImage },
@@ -713,7 +715,7 @@ export const SolidListView = (params: SolidListViewParams) => {
         <div className="flex gap-3 align-items-center">
           <p className="m-0 view-title">{solidListViewMetaData?.data?.solidView?.displayName}</p>
           {solidListViewMetaData?.data?.solidView?.layout?.attrs?.enableGlobalSearch === true && params.embeded === false &&
-            <SolidGlobalSearchElement filters={filters} clearFilter={clearFilter} ref={solidGlobalSearchElementRef} viewData={solidListViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter}></SolidGlobalSearchElement>
+            <SolidGlobalSearchElement showSaveFilterPopup={showSaveFilterPopup} setShowSaveFilterPopup={setShowSaveFilterPopup} filters={filters} clearFilter={clearFilter} ref={solidGlobalSearchElementRef} viewData={solidListViewMetaData} handleApplyCustomFilter={handleApplyCustomFilter}></SolidGlobalSearchElement>
           }
         </div>
         <div className="flex align-items-center gap-3">
@@ -758,6 +760,7 @@ export const SolidListView = (params: SolidListViewParams) => {
               actionsAllowed={actionsAllowed}
               selectedRecords={selectedRecords}
               setDialogVisible={setDialogVisible}
+              setShowSaveFilterPopup={setShowSaveFilterPopup}
             />
           }
 

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

@@ -11,7 +11,7 @@ import { RadioButton } from "primereact/radiobutton";
 import { useEffect, useRef, useState } from "react";
 import { SolidListColumnSelector } from "./SolidListColumnSelector";
 
-export const SolidListViewConfigure = ({ listViewMetaData, setShowArchived, showArchived, viewData, sizeOptions, setSize, size, viewModes, params, actionsAllowed, selectedRecords, setDialogVisible }: any) => {
+export const SolidListViewConfigure = ({ listViewMetaData, setShowArchived, showArchived, viewData, sizeOptions, setSize, size, viewModes, params, actionsAllowed, selectedRecords, setDialogVisible, setShowSaveFilterPopup }: any) => {
     // const [visible, setVisible] = useState<boolean>(false);
     const op = useRef(null);
     const customizeLayout = useRef<OverlayPanel | null>(null);
@@ -120,6 +120,7 @@ export const SolidListViewConfigure = ({ listViewMetaData, setShowArchived, show
                     >
                         <i className="pi pi-chevron-right text-sm"></i>
                     </Button>
+                    <Button text icon='pi pi-save' label="Save Custom Filter" size="small" severity="secondary" className="text-left gap-2 text-base" onClick={() => setShowSaveFilterPopup(true)} />
                     {/* <p className="mt-3 mb-1 font-medium" style={{ color: 'var(--gray-400)' }}>Saved Layouts</p> */}
                     {/* <Button text severity="secondary" label="Diet Tracking" icon="pi pi-plus" size="small" /> */}
                     <OverlayPanel ref={customizeLayout} className="customize-layout-panel" style={{ minWidth: 250 }}

package/src/components/core/model/ModelMetaData.tsx

@@ -104,8 +104,22 @@ const ModelMetaData = React.forwardRef(({ modelMetaData, setModelMetaData, allMo
     enableAuditTracking: Yup.boolean(),
     internationalisation: Yup.boolean(),
     isChild: Yup.boolean(),
-    parentModelId: Yup.number(),
-    parentModel: Yup.object()
+    parentModelId: Yup.number().when("isChild", (isChild: any, schema) => {
+      console.log("relationCreateInverse", isChild);
+      if (isChild.length > 0 && isChild[0] == true) {
+        return schema.required("Parent Model Id is required")
+      } else {
+        return schema.notRequired().nullable();
+      }
+    }),
+    parentModel: Yup.object().when("isChild", (isChild: any, schema) => {
+      console.log("relationCreateInverse", isChild);
+      if (isChild.length > 0 && isChild[0] == true) {
+        return schema.required("Parent Model is required")
+      } else {
+        return schema.notRequired().nullable();
+      }
+    }),
 
   });
 

package/src/resources/globals.css

@@ -2938,6 +2938,11 @@ li.header-li-px {
   max-width: calc(20% - 20px);
 }
 
+.solid-kanban-action {
+  position: absolute;
+  right: 5px;
+}
+
 .solid-kanban-card {
   box-shadow: none;
   border-radius: 0.5rem;

package/src/resources/themes/solid-light-purple/theme.css

@@ -6205,6 +6205,10 @@
     background-color: #EFF1F4;
   }
 
+  .solid-kanban-board-wrapper {
+    border-top: 1px solid var(--primary-light-color);
+  }
+
   .solid-kanban-card,
   .solid-media-card {
     border: 1px solid var(--solid-kanban-wrapper);