@solidstarters/solid-core-ui 1.1.60 → 1.1.61

package/src/components/common/CancelButton.tsx

@@ -18,7 +18,7 @@ export const CancelButton = () => {
     };
     return (
         <div>
-            <Button outlined size="small" type="button" label="Close" onClick={handleGoBack} className='bg-primary-reverse'/>
+            <Button outlined size="small" type="button" label="Close" onClick={handleGoBack} className='bg-primary-reverse' />
         </div>
     )
 }
@@ -28,15 +28,21 @@ export const SolidCancelButton = () => {
     const pathname = usePathname(); // Get the current path
 
     const handleGoBack = () => {
-        const segments = pathname.split('/').filter(Boolean); // Split and filter empty segments
-        if (segments.length > 1) {
-            const newPath = '/' + segments.slice(0, -2).join('/') + '/list'; // Remove last segment and add "/all"
-            router.push(newPath); // Navigate to the parent route with "/all"
+        let fromView: string | null = null;
+        if (typeof window !== "undefined") {
+            fromView = sessionStorage.getItem("fromView");
         }
+
+        // Default to 'list' if not available
+        const view = fromView === "kanban" ? "kanban" : "list";
+
+        // Navigate back to the previous path with the appropriate view type
+        const newPath = pathname.replace(/\/form\/[^/]+$/, `/${view}`);
+        router.push(newPath);
     };
     return (
         <div>
-            <Button outlined size="small" type="button" label="Close" onClick={handleGoBack}  className='bg-primary-reverse'/>
+            <Button outlined size="small" type="button" label="Close" onClick={handleGoBack} className='bg-primary-reverse' />
         </div>
     )
 }

package/src/components/common/SolidBreadcrumb.tsx

@@ -3,82 +3,101 @@
 import Link from "next/link";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import { BreadCrumb } from "primereact/breadcrumb";
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 
 interface BreadcrumbItem {
-    label: string;
-    link?: string;
+  label: string;
+  link?: string;
 }
 
 interface Props {
-    solidFormViewMetaData?: any;
-    initialEntityData?: any;
+  solidFormViewMetaData?: any;
+  initialEntityData?: any;
 }
 
 export const SolidBreadcrumb = (props: Props) => {
-    const { solidFormViewMetaData, initialEntityData } = props;
-    const modelMetadata = solidFormViewMetaData?.data?.solidView?.model;
-    const pathname = usePathname();
-    const router = useRouter();
-    const searchParams = useSearchParams();
-    const segments = pathname.split("/").filter(Boolean); // Remove empty segments
-
-    let userKeyFieldValue: string | null = null;
-
-    if (modelMetadata?.userKeyField) {
-        const userKeyFieldName = modelMetadata.userKeyField.name; // Get the name from userKeyField
-        if (userKeyFieldName && initialEntityData?.[userKeyFieldName] !== undefined) {
-            userKeyFieldValue = initialEntityData[userKeyFieldName]; // Get the value from initialEntityData
-        }
+  const { solidFormViewMetaData, initialEntityData } = props;
+  const modelMetadata = solidFormViewMetaData?.data?.solidView?.model;
+  const pathname = usePathname();
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const segments = pathname.split("/").filter(Boolean);
+
+  let userKeyFieldValue: string | null = null;
+
+  if (modelMetadata?.userKeyField) {
+    const userKeyFieldName = modelMetadata.userKeyField.name;
+    if (userKeyFieldName && initialEntityData?.[userKeyFieldName] !== undefined) {
+      userKeyFieldValue = initialEntityData[userKeyFieldName];
     }
+  }
 
-    // Extract userKeyField from URL query params
-    const queryUserKeyField = searchParams.get("userKeyField");
+  const queryUserKeyField = searchParams.get("userKeyField");
 
-    // Append `userKeyField` to browser URL if not already present
-    useEffect(() => {
-        if (segments.length === 6 && segments[4] === "form" && userKeyFieldValue && !queryUserKeyField) {
-            const newUrl = `${pathname}?userKeyField=${encodeURIComponent(userKeyFieldValue)}`;
-            router.replace(newUrl, { scroll: false }); // Update URL without reloading
-        }
-    }, [pathname, userKeyFieldValue, queryUserKeyField, router]);
+  useEffect(() => {
+    if (segments.length === 6 && segments[4] === "form" && userKeyFieldValue && !queryUserKeyField) {
+      const newUrl = `${pathname}?userKeyField=${encodeURIComponent(userKeyFieldValue)}`;
+      router.replace(newUrl, { scroll: false });
+    }
+  }, [pathname, userKeyFieldValue, queryUserKeyField, router]);
 
-    let breadcrumbItems: BreadcrumbItem[] = [];
+  const [fromView, setFromView] = useState<"list" | "kanban" | null>(null);
 
-    if (segments.length >= 4 && segments[0] === "admin" && segments[1] === "core") {
-        const moduleName = segments[2].replace(/-/g, " "); // Convert kebab-case to normal text
-        const modelName = segments[3].replace(/-/g, " ");
+  useEffect(() => {
+    if (typeof window !== "undefined") {
+      const storedView = sessionStorage.getItem("fromView");
+      console.log("📌 fromView loaded from sessionStorage:", storedView);
+      if (storedView === "list" || storedView === "kanban") {
+        setFromView(storedView);
+      }
+    }
+  }, []);
 
-        // 4th segment: Always "home"
-        breadcrumbItems.push({ label: moduleName, link: `/admin/core/${segments[2]}/home` });
+  let breadcrumbItems: BreadcrumbItem[] = [];
 
-        // 5th segment: Determine if it's "List" or the model name
-        if (segments.length >= 5) {
-            if (segments[4] === "form" && segments.length === 6) {
-                breadcrumbItems.push({ label: "List", link: `/admin/core/${segments[2]}/${segments[3]}/list` });
-            } else {
-                breadcrumbItems.push({ label: modelName, link: `/admin/core/${segments[2]}/${segments[3]}` });
-            }
-        }
+  if (segments.length >= 4 && segments[0] === "admin" && segments[1] === "core") {
+    const moduleName = segments[2].replace(/-/g, " ");
+    const modelName = segments[3].replace(/-/g, " ");
 
-        // 6th segment: If in "form/[id]" mode, show the final value or ID
-        if (segments.length === 6 && segments[4] === "form") {
-            breadcrumbItems.push({ label: queryUserKeyField || segments[5] });
-        }
+    breadcrumbItems.push({
+      label: moduleName,
+      link: `/admin/core/${segments[2]}/home`,
+    });
+
+    if (segments.length >= 5) {
+      if (segments[4] === "form" && segments.length === 6) {
+        const view = fromView ?? "list";
+        breadcrumbItems.push({
+          label: view === "kanban" ? "Kanban" : "List",
+          link: `/admin/core/${segments[2]}/${segments[3]}/${view}`,
+        });
+      } else {
+        breadcrumbItems.push({
+          label: modelName,
+          link: `/admin/core/${segments[2]}/${segments[3]}`,
+        });
+      }
+    }
+
+    if (segments.length === 6 && segments[4] === "form") {
+      breadcrumbItems.push({
+        label: queryUserKeyField || segments[5],
+      });
     }
+  }
+
+  const items = breadcrumbItems.map((item) => ({
+    label: item.label,
+    ...(item.link
+      ? {
+          template: () => (
+            <Link href={item.link!}>
+              <p className="text-primary font-normal">{item.label}</p>
+            </Link>
+          ),
+        }
+      : {}),
+  }));
 
-    const items = breadcrumbItems.map((item) => ({
-        label: item.label,
-        ...(item.link
-            ? {
-                template: () => (
-                    <Link href={item.link!}>
-                        <p className="text-primary font-normal">{item.label}</p>
-                    </Link>
-                ),
-            }
-            : {}),
-    }));
-
-    return <BreadCrumb model={items} className="solid-breadcrumb" />;
+  return <BreadCrumb model={items} className="solid-breadcrumb" />;
 };

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

@@ -118,8 +118,9 @@ export const KanbanBoard = ({ groupedView, kanbanViewData, solidKanbanViewMetaDa
                         );
                     })}
                     {groupedView !== false &&
-                        <div className="kanban-load-more-folded">
-                            <Button className="kaban-load-more" size="small" text onClick={handleSwimLanePagination}>load More</Button></div>
+                        <div>
+                            <Button size="small" style={{ textWrap: 'nowrap' }} text onClick={handleSwimLanePagination}>Load More...</Button>
+                        </div>
                     }
                 </div>
             </DragDropContext>

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

@@ -180,13 +180,16 @@ const KanbanCard: React.FC<KanbanCardProps> = ({ data, solidKanbanViewMetaData,
             style={{
               opacity: snapshot.isDragging ? 0.9 : 1,
               transform: snapshot.isDragging ? "rotate(-2deg)" : "",
-              cursor:'pointer'
+              cursor: 'pointer'
             }}
             elevation={snapshot.isDragging ? 3 : 1}
             className={`${!groupedView ? 'solid-media-card' : 'solid-kanban-card'}`}
-            onClick={() =>
+            onClick={() => {
+              if (typeof window !== "undefined") {
+                sessionStorage.setItem("fromView", "kanban");
+              }
               router.push(`${editButtonUrl}/${data?.id}`)
-            }
+            }}
           >
             {renderFormDynamically(solidKanbanViewMetaData)}
 

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

@@ -29,8 +29,7 @@ import "yet-another-react-lightbox/plugins/counter.css";
 import { useRouter, useSearchParams } from "next/navigation";
 import { SolidKanbanViewConfigure } from "./SolidKanbanViewConfigure";
 import { KanbanUserViewLayout } from "./KanbanUserViewLayout";
-
-
+import { Toast } from "primereact/toast";
 
 type SolidKanbanViewParams = {
   moduleName: string;
@@ -64,8 +63,7 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
   const [lightboxUrls, setLightboxUrls] = useState({});
   const [filterQueryString, setFilterQueryString] = useState<any>();
   const [isLayoutDialogVisible, setLayoutDialogVisible] = useState(false);
-
-
+  const toast = useRef<Toast>(null);
 
   const pushFiltersToRouter = (filterQueryString: any) => {
     router.push(`?${filterQueryString}`, undefined, { shallow: true });
@@ -115,7 +113,8 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
     useLazyGetSolidKanbanEntitiesQuery,
     useLazyGetSolidEntityByIdQuery,
     usePrefetch,
-    useUpdateSolidEntityMutation
+    useUpdateSolidEntityMutation,
+    usePatchUpdateSolidEntityMutation
   } = entityApi;
 
   // Get the kanban view layout & metadata first. 
@@ -227,6 +226,14 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
   const [columnsCount, setColumnsCount] = useState(5);
   const [swimLaneCurrentPageNumber, setSwimLaneCurrentPageNumber] = useState(1);
 
+  const showToast = (severity: "success" | "error", summary: string, detail: string) => {
+    toast.current?.show({
+      severity,
+      summary,
+      detail,
+      life: 3000,
+    });
+  };
   // Get the kanban view data.
   // const [triggerGetSolidEntitiesForKanban, { data: solidEntityKanbanViewData, isLoading, error }] = useLazyGetSolidKanbanEntitiesQuery();
   const [triggerGetSolidEntities, { data: solidEntityKanbanViewData, isLoading, error }] = useLazyGetSolidEntitiesQuery();
@@ -242,7 +249,10 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
       data: DeletedSolidEntities,
     },
   ] = useDeleteMultipleSolidEntitiesMutation();
-
+  const [
+    patchKanbanView,
+    { isSuccess: isKanbanUpdateSuccessfull, isError: isKanbanUpdateError, error: kanbanUpdateError },
+  ] = usePatchUpdateSolidEntityMutation();
 
   // After data is fetched populate the kanban view state so as to be able to render the data. 
   useEffect(() => {
@@ -544,17 +554,33 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
     destinationGroup.groupData.records = destinationRecords;
 
     // Update the kanbanViewData state
-    setKanbanViewData((prevData: typeof kanbanViewData) =>
-      prevData.map((group: any) => {
-        if (group.groupName === sourceGroupName) {
-          return sourceGroup;
-        }
-        if (group.groupName === destinationGroupName) {
-          return destinationGroup;
-        }
-        return group;
-      })
-    );
+    try {
+      const formData = new FormData();
+      formData.append(groupByFieldName, destinationGroupName);
+      const kanbanUpdateResponse = await patchKanbanView({ id: +movedItem.id, data: formData }).unwrap();
+
+      if (kanbanUpdateResponse?.statusCode === 200) {
+        showToast("success", "Success", "Kanban View Updated!");
+        // Update the kanbanViewData state
+        setKanbanViewData((prevData: typeof kanbanViewData) =>
+          prevData.map((group: any) => {
+            if (group.groupName === sourceGroupName) {
+              return sourceGroup;
+            }
+            if (group.groupName === destinationGroupName) {
+              return destinationGroup;
+            }
+            return group;
+          })
+        );
+      } else {
+        showToast("error", "Duplicate Key", kanbanUpdateResponse?.error);
+      }
+    } catch (error: any) {
+      // 6. Handle 500 or network errors
+      console.error("API error:", error);
+      showToast("error", "Something went wrong", error?.data?.message || "Something went wrong");
+    }
   };
 
 
@@ -672,6 +698,7 @@ export const SolidKanbanView = (params: SolidKanbanViewParams) => {
 
   return (
     <div className="page-parent-wrapper">
+      <Toast ref={toast} />
       <div className="page-header">
         <div className="flex gap-3 align-items-center">
           <p className="m-0 view-title">{kanbanViewTitle}</p>

package/src/components/core/kanban/kanban-fields/SolidMediaSingleKanbanField.tsx

@@ -7,6 +7,11 @@ import { FormEvent } from "primereact/ts-helpers";
 import { FilterMatchMode } from 'primereact/api';
 import { Document, Page, pdfjs } from "react-pdf";
 import { Dialog } from "primereact/dialog";
+import { PDFSvg } from '@/components/Svg/PDFSvg';
+import Image from 'next/image';
+import FileImage from '../../../../resources/images/fileTypes/File.png'
+import { ExcelSvg } from '@/components/Svg/ExcelSvg';
+
 
 pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.mjs`;
 
@@ -22,7 +27,6 @@ const SolidMediaSingleKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, f
     // const url = "http://localhost:8080/media-files-storage/PF Form.xls";
 
 
-
     return (
         <>
             {mimeType && mimeType.includes("image/") &&
@@ -52,7 +56,7 @@ const SolidMediaSingleKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, f
                 <div onClick={(e) => e.stopPropagation()}>
                     <div className='flex align-items-end gap-2 my-2'>
                         <div onClick={() => setVisible(true)} style={{ cursor: 'pointer' }}>
-                            <svg width="36px" height="36px" viewBox="-4 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg" stroke="#000000" stroke-width="0.0004"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <path d="M25.6686 26.0962C25.1812 26.2401 24.4656 26.2563 23.6984 26.145C22.875 26.0256 22.0351 25.7739 21.2096 25.403C22.6817 25.1888 23.8237 25.2548 24.8005 25.6009C25.0319 25.6829 25.412 25.9021 25.6686 26.0962ZM17.4552 24.7459C17.3953 24.7622 17.3363 24.7776 17.2776 24.7939C16.8815 24.9017 16.4961 25.0069 16.1247 25.1005L15.6239 25.2275C14.6165 25.4824 13.5865 25.7428 12.5692 26.0529C12.9558 25.1206 13.315 24.178 13.6667 23.2564C13.9271 22.5742 14.193 21.8773 14.468 21.1894C14.6075 21.4198 14.7531 21.6503 14.9046 21.8814C15.5948 22.9326 16.4624 23.9045 17.4552 24.7459ZM14.8927 14.2326C14.958 15.383 14.7098 16.4897 14.3457 17.5514C13.8972 16.2386 13.6882 14.7889 14.2489 13.6185C14.3927 13.3185 14.5105 13.1581 14.5869 13.0744C14.7049 13.2566 14.8601 13.6642 14.8927 14.2326ZM9.63347 28.8054C9.38148 29.2562 9.12426 29.6782 8.86063 30.0767C8.22442 31.0355 7.18393 32.0621 6.64941 32.0621C6.59681 32.0621 6.53316 32.0536 6.44015 31.9554C6.38028 31.8926 6.37069 31.8476 6.37359 31.7862C6.39161 31.4337 6.85867 30.8059 7.53527 30.2238C8.14939 29.6957 8.84352 29.2262 9.63347 28.8054ZM27.3706 26.1461C27.2889 24.9719 25.3123 24.2186 25.2928 24.2116C24.5287 23.9407 23.6986 23.8091 22.7552 23.8091C21.7453 23.8091 20.6565 23.9552 19.2582 24.2819C18.014 23.3999 16.9392 22.2957 16.1362 21.0733C15.7816 20.5332 15.4628 19.9941 15.1849 19.4675C15.8633 17.8454 16.4742 16.1013 16.3632 14.1479C16.2737 12.5816 15.5674 11.5295 14.6069 11.5295C13.948 11.5295 13.3807 12.0175 12.9194 12.9813C12.0965 14.6987 12.3128 16.8962 13.562 19.5184C13.1121 20.5751 12.6941 21.6706 12.2895 22.7311C11.7861 24.0498 11.2674 25.4103 10.6828 26.7045C9.04334 27.3532 7.69648 28.1399 6.57402 29.1057C5.8387 29.7373 4.95223 30.7028 4.90163 31.7107C4.87693 32.1854 5.03969 32.6207 5.37044 32.9695C5.72183 33.3398 6.16329 33.5348 6.6487 33.5354C8.25189 33.5354 9.79489 31.3327 10.0876 30.8909C10.6767 30.0029 11.2281 29.0124 11.7684 27.8699C13.1292 27.3781 14.5794 27.011 15.985 26.6562L16.4884 26.5283C16.8668 26.4321 17.2601 26.3257 17.6635 26.2153C18.0904 26.0999 18.5296 25.9802 18.976 25.8665C20.4193 26.7844 21.9714 27.3831 23.4851 27.6028C24.7601 27.7883 25.8924 27.6807 26.6589 27.2811C27.3486 26.9219 27.3866 26.3676 27.3706 26.1461ZM30.4755 36.2428C30.4755 38.3932 28.5802 38.5258 28.1978 38.5301H3.74486C1.60224 38.5301 1.47322 36.6218 1.46913 36.2428L1.46884 3.75642C1.46884 1.6039 3.36763 1.4734 3.74457 1.46908H20.263L20.2718 1.4778V7.92396C20.2718 9.21763 21.0539 11.6669 24.0158 11.6669H30.4203L30.4753 11.7218L30.4755 36.2428ZM28.9572 10.1976H24.0169C21.8749 10.1976 21.7453 8.29969 21.7424 7.92417V2.95307L28.9572 10.1976ZM31.9447 36.2428V11.1157L21.7424 0.871022V0.823357H21.6936L20.8742 0H3.74491C2.44954 0 0 0.785336 0 3.75711V36.2435C0 37.5427 0.782956 40 3.74491 40H28.2001C29.4952 39.9997 31.9447 39.2143 31.9447 36.2428Z" fill="#EB5757"></path> </g></svg>
+                            <PDFSvg size={50} />
                         </div>
                         <p className="text-sm" style={{ cursor: 'pointer', maxWidth: '70%', wordWrap: 'break-word', overflowWrap: 'break-word' }} onClick={() => setVisible(true)}>
                             {fileName}
@@ -69,7 +73,7 @@ const SolidMediaSingleKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, f
             {mimeType && (mimeType.includes("excel") || mimeType.includes("spreadsheet")) && (
                 <div className='flex align-items-end gap-2 my-2' onClick={(e) => e.stopPropagation()}>
                     <a href={url} download target="_blank" rel="noopener noreferrer">
-                        <svg fill="#45B058" height="36px" width="36px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <g> <g> <g> <path d="M447.168,134.56c-0.535-1.288-1.318-2.459-2.304-3.445l-128-128c-2.003-1.988-4.709-3.107-7.531-3.115H74.667 C68.776,0,64,4.776,64,10.667v490.667C64,507.224,68.776,512,74.667,512h362.667c5.891,0,10.667-4.776,10.667-10.667V138.667 C447.997,137.256,447.714,135.86,447.168,134.56z M320,36.416L411.584,128H320V36.416z M426.667,490.667H85.333V21.333h213.333 v117.333c0,5.891,4.776,10.667,10.667,10.667h117.333V490.667z"></path> <path d="M128,181.333v256c0,5.891,4.776,10.667,10.667,10.667h234.667c5.891,0,10.667-4.776,10.667-10.667v-256 c0-5.891-4.776-10.667-10.667-10.667H138.667C132.776,170.667,128,175.442,128,181.333z M320,192h42.667v42.667H320V192z M320,256h42.667v42.667H320V256z M320,320h42.667v42.667H320V320z M320,384h42.667v42.667H320V384z M213.333,192h85.333v42.667 h-85.333V192z M213.333,256h85.333v42.667h-85.333V256z M213.333,320h85.333v42.667h-85.333V320z M213.333,384h85.333v42.667 h-85.333V384z M149.333,192H192v42.667h-42.667V192z M149.333,256H192v42.667h-42.667V256z M149.333,320H192v42.667h-42.667V320z M149.333,384H192v42.667h-42.667V384z"></path> </g> </g> </g> </g></svg>
+                        <ExcelSvg size={50} />
                     </a>
                     <a href={url} download target="_blank" rel="noopener noreferrer" className='text-color flex align-items-start gap-2' style={{ textDecoration: 'none' }}>
                         <p className="text-sm mb-1" style={{ wordWrap: 'break-word', overflowWrap: 'break-word' }}>
@@ -86,7 +90,13 @@ const SolidMediaSingleKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, f
                 !mimeType.includes("spreadsheet") && (
                     <div className='flex align-items-end gap-2 my-2' onClick={(e) => e.stopPropagation()}>
                         <a href={url} download target="_blank" rel="noopener noreferrer">
-                            <svg width="36px" height="36px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="#722ED1" stroke="#722ED1" stroke-width="0.00024000000000000003"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"><path d="M3 23h18V6.709L15.29 1H3zM15 2h.2L20 6.8V7h-5zM4 2h10v6h6v14H4z"></path><path fill="none" d="M0 0h24v24H0z"></path></g></svg>
+                            <Image
+                                src={FileImage}
+                                alt={fileName}
+                                className="relative"
+                                height={50}
+                                width={50}
+                            />
                         </a>
                         <a href={url} download target="_blank" rel="noopener noreferrer" className='text-color flex align-items-start gap-2' style={{ textDecoration: 'none' }}>
                             <p className="text-sm mb-1" style={{ wordWrap: 'break-word', overflowWrap: 'break-word' }}>

package/src/components/core/kanban/kanban-fields/SolidShortTextKanbanField.tsx

@@ -2,12 +2,13 @@
 import { useState } from 'react';
 import { SolidKanbanViewFieldsParams } from '../SolidKanbanViewFields';
 import { Dialog } from 'primereact/dialog';
-import { Document, Page, pdfjs } from "react-pdf";
+import { Document, Page } from "react-pdf";
+import { PDFSvg } from '@/components/Svg/PDFSvg';
 import MP3Image from '../../../../resources/images/fileTypes/Mp3.png'
 import MP4Image from '../../../../resources/images/fileTypes/Mp4.png'
 import FileImage from '../../../../resources/images/fileTypes/File.png'
 import Image from 'next/image';
-import { PDFSvg } from '@/components/Svg/PDFSvg';
+import { ExcelSvg } from '@/components/Svg/ExcelSvg';
 const SolidShortTextKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, fieldLayout, data, setLightboxUrls, setOpenLightbox, groupedView }: SolidKanbanViewFieldsParams) => {
     const [visible, setVisible] = useState(false);
     const renderMode = fieldLayout?.attrs?.renderMode ? fieldLayout?.attrs?.renderMode : "text";
@@ -70,12 +71,7 @@ const SolidShortTextKanbanField = ({ solidKanbanViewMetaData, fieldMetadata, fie
 
             {renderMode === "image" && !groupedView && mimeType && (mimeType.includes("excel") || mimeType.includes("spreadsheet")) && (
                 <a href={data[fieldMetadata.name]} className='kanban-media-view-card mt-3' onClick={(e) => e.stopPropagation()} style={{ cursor: 'pointer' }} download target="_blank" rel="noopener noreferrer">
-                    <svg width="80" height="80" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
-                        <path d="M15 10.4147V10.4146C14.9999 5.29959 19.6888 1 25.3892 1H53.5858L77 24.4142V69.5852C77 74.7288 72.5287 78.9999 66.8806 78.9999H25.1406C19.47 78.9999 15 74.7276 15 69.5852V10.4147Z" fill="white" stroke="#DBDBDB" stroke-width="2" />
-                        <path d="M54.0513 16.32V0L78 24H62.0342C54.8496 24 53.7187 18.88 54.0513 16.32Z" fill="#D4D4D8" />
-                        <rect x="2" y="38" width="51" height="30" rx="6" fill="#079455" />
-                        <path d="M13.7955 46.9091L16.4354 51.3707H16.5376L19.1903 46.9091H22.3161L18.321 53.4545L22.4055 60H19.2223L16.5376 55.532H16.4354L13.7507 60H10.5803L14.6776 53.4545L10.657 46.9091H13.7955ZM24.0675 60V46.9091H26.8352V57.718H32.4474V60H24.0675ZM41.3819 50.674C41.3308 50.1584 41.1113 49.7578 40.7235 49.4723C40.3358 49.1868 39.8095 49.044 39.1447 49.044C38.693 49.044 38.3116 49.108 38.0005 49.2358C37.6895 49.3594 37.4508 49.532 37.2846 49.7536C37.1227 49.9751 37.0417 50.2266 37.0417 50.5078C37.0332 50.7422 37.0822 50.9467 37.1887 51.1214C37.2995 51.2962 37.4508 51.4474 37.6426 51.5753C37.8343 51.6989 38.0559 51.8075 38.3074 51.9013C38.5588 51.9908 38.8272 52.0675 39.1127 52.1314L40.2889 52.4126C40.8599 52.5405 41.3841 52.7109 41.8613 52.924C42.3386 53.1371 42.752 53.3991 43.1014 53.7102C43.4508 54.0213 43.7214 54.3878 43.9132 54.8097C44.1092 55.2315 44.2093 55.7152 44.2136 56.2607C44.2093 57.0618 44.0048 57.7564 43.6 58.3445C43.1994 58.9283 42.6199 59.3821 41.8613 59.706C41.1071 60.0256 40.1973 60.1854 39.1319 60.1854C38.0751 60.1854 37.1547 60.0234 36.3706 59.6996C35.5907 59.3757 34.9814 58.8963 34.5424 58.2614C34.1078 57.6222 33.8798 56.8317 33.8585 55.8899H36.5368C36.5666 56.3288 36.6923 56.6953 36.9139 56.9893C37.1397 57.2791 37.4402 57.4986 37.8152 57.6477C38.1944 57.7926 38.6227 57.8651 39.1 57.8651C39.5687 57.8651 39.9757 57.7969 40.3208 57.6605C40.6703 57.5241 40.9409 57.3345 41.1326 57.0916C41.3244 56.8487 41.4203 56.5696 41.4203 56.2543C41.4203 55.9602 41.3329 55.7131 41.1582 55.5128C40.9877 55.3125 40.7363 55.142 40.4039 55.0014C40.0758 54.8608 39.6731 54.733 39.1958 54.6179L37.7704 54.2599C36.6667 53.9915 35.7953 53.5717 35.1561 53.0007C34.5169 52.4297 34.1994 51.6605 34.2037 50.6932C34.1994 49.9006 34.4103 49.2081 34.8365 48.6158C35.2669 48.0234 35.8571 47.5611 36.6071 47.2287C37.3571 46.8963 38.2093 46.7301 39.1639 46.7301C40.1355 46.7301 40.9835 46.8963 41.7079 47.2287C42.4366 47.5611 43.0034 48.0234 43.4082 48.6158C43.813 49.2081 44.0218 49.8942 44.0346 50.674H41.3819Z" fill="white" />
-                    </svg>
+                    <ExcelSvg />
                 </a>
             )}
             {renderMode === "image" && !groupedView && mimeType && mimeType.includes("audio") && (

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

@@ -147,7 +147,7 @@ export const SolidListView = (params: SolidListViewParams) => {
   } = entityApi;
 
   // Get the list view layout & metadata first. 
-  const listViewMetaDataQs = qs.stringify({ modelName: params.modelName, moduleName: params.moduleName, viewType: 'list'}, {
+  const listViewMetaDataQs = qs.stringify({ modelName: params.modelName, moduleName: params.moduleName, viewType: 'list' }, {
     encodeValuesOnly: true,
   });
   const [listViewMetaData, setListViewMetaData] = useState({});
@@ -812,6 +812,9 @@ export const SolidListView = (params: SolidListViewParams) => {
             if (params.embeded == true) {
               params.handlePopUpOpen(rowData?.id);
             } else {
+              if (typeof window !== "undefined") {
+                sessionStorage.setItem("fromView", "list");
+              }
               router.push(`${editButtonUrl}/${rowData?.id}`);
             }
           }}

package/src/resources/globals.css

@@ -2951,22 +2951,28 @@ li.header-li-px {
 .kanban-ungrouped-column-content {
   display: flex;
   flex-wrap: wrap;
-  gap: 10px;
+  column-gap: 25px;
+  row-gap: 10px;
 }
 
 .kanban-ungrouped-column .kanban-card-container {
-  flex: 1 1 calc(20% - 10px);
-  max-width: calc(20% - 10px);
+  flex: 1 1 calc(20% - 20px);
+  max-width: calc(20% - 20px);
 }
 
 .solid-kanban-card {
   box-shadow: none;
   border-radius: 0.5rem;
-  border: 1px solid rgba(216, 226, 234, 0.60);
-  background: #FFF;
+  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;
@@ -3024,7 +3030,8 @@ flex-shrink: 0; */
   border-radius: 8px;
   max-height: 120px;
   object-fit: contain;
-  box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 2px 0px;
+  /* box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 2px 0px; */
+  background-color: #fff;
 }
 
 
@@ -3059,7 +3066,7 @@ flex-shrink: 0; */
 .solid-kanban-board-wrapper {
   border-top: 1px solid #CED0D6;
   overflow: hidden;
-  height: calc(100vh - 64px) !important;
+  height: calc(100vh - 65px) !important;
 }
 
 .solid-kanban-board-scroll-context {