@solidstarters/solid-core-ui 1.1.19 → 1.1.20

package/src/components/auth/SolidForgotPassword.tsx

@@ -13,6 +13,8 @@ import * as Yup from "yup";
 import { LayoutContext } from "../layout/context/layoutcontext";
 import { useLazyGetAuthSettingsQuery } from "@/redux/api/solidSettingsApi";
 import { AppTitle } from "@/helpers/AppTitle";
+import Image from "next/image";
+import SolidLogo from '../../resources/images/SS-Logo.png'
 
 const SolidForgotPassword = () => {
     const [trigger, { data: solidSettingsData }] = useLazyGetAuthSettingsQuery()
@@ -76,10 +78,11 @@ const SolidForgotPassword = () => {
                 {solidSettingsData?.data?.authPagesLayout === 'center' &&
                     <div className="flex justify-content-center">
                         <div className="solid-logo flex align-items-center gap-3">
-                            <img
+                            <Image
                                 alt="solid logo"
-                                src={'/images/SS-Logo-1 1.png'}
-                                className="position-relative img-fluid"
+                                src={SolidLogo}
+                                className="relative"
+                                fill
                             />
                             <AppTitle title={solidSettingsData} />
                         </div>

package/src/components/auth/SolidInitialLoginOtp.tsx

@@ -4,6 +4,7 @@ import { AppTitle } from "@/helpers/AppTitle";
 import { useConfirmOtpLoginMutation } from "@/redux/api/authApi";
 import { useLazyGetAuthSettingsQuery } from "@/redux/api/solidSettingsApi";
 import { Form, Formik } from "formik";
+import Image from "next/image";
 import Link from "next/link";
 import { useRouter, useSearchParams } from "next/navigation";
 import { Button } from "primereact/button";
@@ -12,6 +13,7 @@ import { Message } from "primereact/message";
 import { Toast } from "primereact/toast";
 import { useEffect, useRef } from "react";
 import * as Yup from "yup";
+import SolidLogo from '../../resources/images/SS-Logo.png'
 
 const SolidInitialLoginOtp = () => {
     const searchParams = useSearchParams();
@@ -51,10 +53,11 @@ const SolidInitialLoginOtp = () => {
                 {solidSettingsData?.data?.authPagesLayout === 'center' &&
                     <div className="flex justify-content-center">
                         <div className="solid-logo flex align-items-center gap-3">
-                            <img
+                            <Image
                                 alt="solid logo"
-                                src={'/images/SS-Logo-1 1.png'}
-                                className="position-relative img-fluid"
+                                src={SolidLogo}
+                                className="relative"
+                                fill
                             />
                             <AppTitle title={solidSettingsData} />
                         </div>

package/src/components/auth/SolidInitiateRegisterOtp.tsx

@@ -4,6 +4,7 @@ import { AppTitle } from "@/helpers/AppTitle";
 import { useConfirmOtpRegisterMutation } from "@/redux/api/authApi";
 import { useLazyGetAuthSettingsQuery } from "@/redux/api/solidSettingsApi";
 import { Form, Formik } from "formik";
+import Image from "next/image";
 import Link from "next/link";
 import { useRouter, useSearchParams } from "next/navigation";
 import { Button } from "primereact/button";
@@ -12,6 +13,7 @@ import { Message } from "primereact/message";
 import { Toast } from "primereact/toast";
 import { useEffect, useRef } from "react";
 import * as Yup from "yup";
+import SolidLogo from '../../resources/images/SS-Logo.png'
 
 const SolidInitiateRegisterOtp = () => {
     const searchParams = useSearchParams();
@@ -51,10 +53,11 @@ const SolidInitiateRegisterOtp = () => {
                 {solidSettingsData?.data?.authPagesLayout === 'center' &&
                     <div className="flex justify-content-center">
                         <div className="solid-logo flex align-items-center gap-3">
-                            <img
+                            <Image
                                 alt="solid logo"
-                                src={'/images/SS-Logo-1 1.png'}
-                                className="position-relative img-fluid"
+                                src={SolidLogo}
+                                className="relative"
+                                fill
                             />
                             <AppTitle title={solidSettingsData} />
                         </div>

package/src/components/auth/SolidLogin.tsx

@@ -19,6 +19,8 @@ import { LayoutContext } from "../layout/context/layoutcontext";
 import { useLazyGetAuthSettingsQuery } from "@/redux/api/solidSettingsApi";
 import { useInitateLoginMutation } from "@/redux/api/authApi";
 import { AppTitle } from "@/helpers/AppTitle";
+import Image from "next/image";
+import SolidLogo from '../../resources/images/SS-Logo.png'
 
 const SolidLogin = () => {
     const [trigger, { data: solidSettingsData }] = useLazyGetAuthSettingsQuery();
@@ -51,10 +53,11 @@ const SolidLogin = () => {
                 {solidSettingsData?.data?.authPagesLayout === 'center' &&
                     <div className="flex justify-content-center">
                         <div className="solid-logo flex align-items-center gap-3">
-                            <img
+                            <Image
                                 alt="solid logo"
-                                src={'/images/SS-Logo-1 1.png'}
-                                className="position-relative img-fluid"
+                                src={SolidLogo}
+                                className="relative"
+                                fill
                             />
                             <AppTitle title={solidSettingsData} />
                         </div>

package/src/components/auth/SolidOTPVerify.tsx

@@ -13,6 +13,8 @@ import * as Yup from "yup";
 import { LayoutContext } from "../layout/context/layoutcontext";
 import { useLazyGetAuthSettingsQuery } from "@/redux/api/solidSettingsApi";
 import { AppTitle } from "@/helpers/AppTitle";
+import Image from "next/image";
+import SolidLogo from '../../resources/images/SS-Logo.png'
 
 
 const SolidOTPVerify = () => {
@@ -53,10 +55,11 @@ const SolidOTPVerify = () => {
                 {solidSettingsData?.data?.authPagesLayout === 'center' &&
                     <div className="flex justify-content-center">
                         <div className="solid-logo flex align-items-center gap-3">
-                            <img
+                            <Image
                                 alt="solid logo"
-                                src={'/images/SS-Logo-1 1.png'}
-                                className="position-relative img-fluid"
+                                src={SolidLogo}
+                                className="relative"
+                                fill
                             />
                             <AppTitle title={solidSettingsData} />
                         </div>

package/src/components/auth/SolidRegister.tsx

@@ -18,7 +18,8 @@ import { useEffect, useRef } from "react";
 import * as Yup from "yup";
 import { SocialMediaLogin } from "../common/SocialMediaLogin";
 import { AppTitle } from "@/helpers/AppTitle";
-
+import Image from "next/image";
+import SolidLogo from '../../resources/images/SS-Logo.png'
 
 interface AuthTabsProps {
     iamPasswordRegistrationEnabled: boolean;
@@ -299,10 +300,11 @@ const SolidRegister = () => {
                 {solidSettingsData?.data?.authPagesLayout === 'center' &&
                     <div className="flex justify-content-center">
                         <div className="solid-logo flex align-items-center gap-3">
-                            <img
+                            <Image
                                 alt="solid logo"
-                                src={'/images/SS-Logo-1 1.png'}
-                                className="position-relative img-fluid"
+                                src={SolidLogo}
+                                className="relative"
+                                fill
                             />
                             <AppTitle title={solidSettingsData} />
                         </div>

package/src/components/auth/SolidResetPassword.tsx

@@ -4,6 +4,7 @@ import { AppTitle } from "@/helpers/AppTitle";
 import { useConfirmForgotPasswordMutation } from "@/redux/api/authApi";
 import { useLazyGetAuthSettingsQuery } from "@/redux/api/solidSettingsApi";
 import { useFormik } from "formik";
+import Image from "next/image";
 import Link from "next/link";
 import { useRouter, useSearchParams } from "next/navigation";
 import { Button } from "primereact/button";
@@ -13,6 +14,7 @@ import { Toast } from "primereact/toast";
 import { classNames } from "primereact/utils";
 import { useEffect, useRef } from "react";
 import * as Yup from "yup";
+import SolidLogo from '../../resources/images/SS-Logo.png'
 
 const SolidResetPassword = () => {
     const searchParams = useSearchParams();
@@ -81,10 +83,11 @@ const SolidResetPassword = () => {
                 {solidSettingsData?.data?.authPagesLayout === 'center' &&
                     <div className="flex justify-content-center">
                         <div className="solid-logo flex align-items-center gap-3">
-                            <img
+                            <Image
                                 alt="solid logo"
-                                src={'/images/SS-Logo-1 1.png'}
-                                className="position-relative img-fluid"
+                                src={SolidLogo}
+                                className="relative"
+                                fill
                             />
                             <AppTitle title={solidSettingsData} />
                         </div>

package/src/components/common/CancelButton.tsx

@@ -18,7 +18,7 @@ export const CancelButton = () => {
     };
     return (
         <div>
-            <Button outlined size="small" type="button" label="Cancel" onClick={handleGoBack} className='bg-primary-reverse'/>
+            <Button outlined size="small" type="button" label="Close" onClick={handleGoBack} className='bg-primary-reverse'/>
         </div>
     )
 }
@@ -36,7 +36,7 @@ export const SolidCancelButton = () => {
     };
     return (
         <div>
-            <Button outlined size="small" type="button" label="Cancel" 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

@@ -0,0 +1,27 @@
+import Link from 'next/link';
+import { BreadCrumb } from 'primereact/breadcrumb';
+import React from 'react';
+
+interface BreadcrumbItem {
+    label: string;
+    link?: string;
+}
+
+interface SolidBreadcrumbProps {
+    breadcrumbItems: BreadcrumbItem[];
+}
+
+export const SolidBreadcrumb: React.FC<SolidBreadcrumbProps> = ({ breadcrumbItems }) => {
+    const items = breadcrumbItems.map((item) => ({
+        label: item.label,
+        ...(item.link && item.link !== '#' ? {
+            template: () => (
+                <Link href={item.link || '/'}>
+                    <p className="text-primary font-normal">{item.label}</p>
+                </Link>
+            )
+        } : {})
+    }));
+
+    return <BreadCrumb model={items} className="solid-breadcrumb" />;
+};

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

@@ -1,4 +1,6 @@
 "use client"
+import { deleteManyPermission, deletePermission } from "@/helpers/permissions";
+import Image from "next/image";
 import { Accordion, AccordionTab } from "primereact/accordion";
 import { Button } from "primereact/button";
 import { Checkbox, CheckboxChangeEvent } from "primereact/checkbox";
@@ -11,12 +13,13 @@ interface FilterColumns {
     name: string;
     key: string;
 }
-export const SolidConfigureLayoutElement = ({ setShowArchived, showArchived, viewData, sizeOptions, setSize, size, viewModes, setView, view }: any) => {
+export const SolidConfigureLayoutElement = ({ setShowArchived, showArchived, viewData, sizeOptions, setSize, size, viewModes, setView, view, params, actionsAllowed, selectedRecords, setDialogVisible }: any) => {
 
     // const [visible, setVisible] = useState<boolean>(false);
     const op = useRef(null);
     const customizeLayout = useRef<OverlayPanel | null>(null);
     const [isOverlayOpen, setIsOverlayOpen] = useState(false);
+    console.log("isOverlayOpen", isOverlayOpen);
     useEffect(() => {
         const handleClickOutside = (event: MouseEvent) => {
             if (
@@ -35,6 +38,7 @@ export const SolidConfigureLayoutElement = ({ setShowArchived, showArchived, vie
 
         return () => document.removeEventListener("click", handleClickOutside);
     }, [isOverlayOpen])
+
     const categories: FilterColumns[] = [
         { name: 'ID', key: 'A' },
         { name: 'Tracker Date', key: 'M' },
@@ -68,8 +72,20 @@ export const SolidConfigureLayoutElement = ({ setShowArchived, showArchived, vie
             <OverlayPanel ref={op} className="listview-cogwheel-panel">
                 <div className="p-2">
                     <div className="flex flex-column">
-                        <Button text icon='pi pi-download' label="Import" size="small" severity="secondary" className="text-left gap-2" />
-                        <Button text icon='pi pi-upload' label="Export" size="small" severity="secondary" className="text-left gap-2" />
+                        {actionsAllowed.includes(`${deleteManyPermission(params.modelName)}`) && viewData?.data?.solidView?.layout?.attrs?.delete !== false && selectedRecords.length > 0 &&
+                            <Button
+                                text
+                                type="button"
+                                className="text-left gap-2 text-base"
+                                label="Delete"
+                                size="small"
+                                iconPos="left"
+                                severity="danger"
+                                icon={'pi pi-trash'}
+                                onClick={() => setDialogVisible(true)}
+                            />}
+                        <Button text icon='pi pi-download' label="Import" size="small" severity="secondary" className="text-left gap-2 text-base" />
+                        <Button text icon='pi pi-upload' label="Export" size="small" severity="secondary" className="text-left gap-2 text-base" />
                         {/* <Button text icon='pi pi-share-alt' label="Share" size="small" severity="secondary" className="text-left gap-2" /> */}
                         {/* {viewData?.data?.solidView?.model?.enableSoftDelete &&
                             <Button text severity="secondary" size="small" className="text-left w-13rem" label={showArchived ? "Hide Archived Records" : "Show Archived Records"} iconPos="left" onClick={() => { setShowArchived(!showArchived); }} />
@@ -98,7 +114,7 @@ export const SolidConfigureLayoutElement = ({ setShowArchived, showArchived, vie
                         severity={isOverlayOpen ? undefined : "secondary"}
                         size="small"
                         text={isOverlayOpen ? false : true}
-                        className="text-left gap-2 w-full"
+                        className="text-left gap-2 w-full text-base"
                         // @ts-ignore
                         onClick={(e) => {
                             customizeLayout.current?.toggle(e);
@@ -131,11 +147,11 @@ export const SolidConfigureLayoutElement = ({ setShowArchived, showArchived, vie
                                                 />
                                                 <label htmlFor={option.value} className="ml-2 flex align-items-center justify-content-between w-full">
                                                     {option.label}
-                                                    <img
+                                                    <Image
                                                         src={option.image}
                                                         alt={option.value}
-                                                        className='img-fluid position-relative'
-                                                        style={{ width: '2.75rem' }}
+                                                        fill
+                                                        className='relative row-spacing-img'
                                                     />
                                                 </label>
                                             </div>
@@ -156,11 +172,11 @@ export const SolidConfigureLayoutElement = ({ setShowArchived, showArchived, vie
                                                 />
                                                 <label htmlFor={option.value} className="ml-2 flex align-items-center justify-content-between w-full">
                                                     {option.label}
-                                                    <img
+                                                    <Image
                                                         src={option.image}
                                                         alt={option.value}
-                                                        className='img-fluid position-relative'
-                                                        style={{ width: '2.75rem' }}
+                                                        fill
+                                                        className='relative row-spacing-img'
                                                     />
                                                 </label>
                                             </div>
@@ -196,11 +212,14 @@ export const SolidConfigureLayoutElement = ({ setShowArchived, showArchived, vie
                         <Divider className="m-0" />
                         <div className="p-3 flex gap-2">
                             <Button label="Apply" size="small" />
-                            <Button outlined label="Cancel" size="small" />
+                            <Button outlined label="Cancel" size="small"
+                                // @ts-ignore
+                                onClick={(e) => op.current.hide(e)}
+                            />
                         </div>
                     </OverlayPanel>
                 </div>
             </OverlayPanel>
-        </div >
+        </div>
     )
 }

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

@@ -7,7 +7,7 @@ import qs from "qs";
 
 export const SolidManyToOneFilterElement = ({ value, updateInputs, index, fieldMetadata }: any) => {
 
-    const entityApi = createSolidEntityApi(fieldMetadata.relationModelSingularName);
+    const entityApi = createSolidEntityApi(fieldMetadata.relationCoModelSingularName);
     const { useLazyGetSolidEntitiesQuery } = entityApi;
     const [triggerGetSolidEntities] = useLazyGetSolidEntitiesQuery();
 

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

@@ -35,6 +35,7 @@ import { SolidTimeField } from "./fields/SolidTimeField";
 import { BackButton } from "@/components/common/BackButton";
 import { SolidFormStepper } from "@/components/common/SolidFormStepper";
 import { OverlayPanel } from "primereact/overlaypanel";
+import { SolidBreadcrumb } from "@/components/common/SolidBreadcrumb";
 
 export type SolidFormViewProps = {
     moduleName: string;
@@ -130,7 +131,7 @@ const fieldFactory = (type: string, fieldContext: SolidFieldProps): ISolidField
 }
 
 // solidFieldsMetadata={solidFieldsMetadata} solidView={solidView}
-const SolidField = ({ formik, field, fieldMetadata, initialEntityData, solidFormViewMetaData, modelName }: any) => {
+const SolidField = ({ formik, field, fieldMetadata, initialEntityData, solidFormViewMetaData, modelName, readOnly }: any) => {
     const fieldContext: SolidFieldProps = {
         // field metadata - coming from the field-metadata table.
         fieldMetadata: fieldMetadata,
@@ -141,6 +142,7 @@ const SolidField = ({ formik, field, fieldMetadata, initialEntityData, solidForm
         // complete form view metadata - this includes layout of the whole form & metadata about all fields in the corresponding model.
         solidFormViewMetaData: solidFormViewMetaData,
         modelName: modelName,
+        readOnly: readOnly
     }
     const solidField = fieldFactory(fieldMetadata?.type, fieldContext);
 
@@ -543,7 +545,13 @@ const SolidFormView = (params: SolidFormViewProps) => {
     const {
         data: solidFormViewData,
         isLoading: solidFormViewDataIsLoading,
-    } = useGetSolidEntityByIdQuery({ id: params.id, qs: formViewDataQs }, { skip: !solidFormViewMetaData || params.id === 'new' });
+        refetch: refetchSolidFormViewData,
+    } = useGetSolidEntityByIdQuery({ id: params.id, qs: formViewDataQs });
+    useEffect(() => {
+        refetchSolidFormViewData()
+    }, [formViewDataQs])
+
+
     useEffect(() => {
         if (solidFormViewData) {
             setInitialEntityData(solidFormViewData.data);
@@ -628,8 +636,9 @@ const SolidFormView = (params: SolidFormViewProps) => {
                 case "field": {
                     // const fieldMetadata = solidFieldsMetadata[attrs.name];
                     const fieldMetadata = solidFormViewMetaData.data.solidFieldsMetadata[attrs.name];
-
-                    return <SolidField key={key} field={element} formik={formik} fieldMetadata={fieldMetadata} initialEntityData={solidFormViewData ? solidFormViewData.data : null} solidFormViewMetaData={solidFormViewMetaData} modelName={params.modelName} />;
+                    // Read only permission if there is no update permission on model and router doesnt contains new
+                    const readOnlyPermission  = !actionsAllowed.includes(`${updatePermission(params.modelName)}`) && params.id !== "new" 
+                    return <SolidField key={key} field={element} formik={formik} fieldMetadata={fieldMetadata} initialEntityData={solidFormViewData ? solidFormViewData.data : null} solidFormViewMetaData={solidFormViewMetaData} modelName={params.modelName} readOnly={readOnlyPermission} />;
                 }
                 case "notebook":
                     return <SolidNotebook key={key}>{children.map((element: any) => renderFormElementDynamically(element, solidFormViewMetaData))}</SolidNotebook>;
@@ -688,13 +697,9 @@ const SolidFormView = (params: SolidFormViewProps) => {
                         outlined
                         severity="secondary"
                         type="button"
-                        icon={
-                            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-                                <path d="M6 14C5.45 14 4.97917 13.8042 4.5875 13.4125C4.19583 13.0208 4 12.55 4 12C4 11.45 4.19583 10.9792 4.5875 10.5875C4.97917 10.1958 5.45 10 6 10C6.55 10 7.02083 10.1958 7.4125 10.5875C7.80417 10.9792 8 11.45 8 12C8 12.55 7.80417 13.0208 7.4125 13.4125C7.02083 13.8042 6.55 14 6 14ZM12 14C11.45 14 10.9792 13.8042 10.5875 13.4125C10.1958 13.0208 10 12.55 10 12C10 11.45 10.1958 10.9792 10.5875 10.5875C10.9792 10.1958 11.45 10 12 10C12.55 10 13.0208 10.1958 13.4125 10.5875C13.8042 10.9792 14 11.45 14 12C14 12.55 13.8042 13.0208 13.4125 13.4125C13.0208 13.8042 12.55 14 12 14ZM18 14C17.45 14 16.9792 13.8042 16.5875 13.4125C16.1958 13.0208 16 12.55 16 12C16 11.45 16.1958 10.9792 16.5875 10.5875C16.9792 10.1958 17.45 10 18 10C18.55 10 19.0208 10.1958 19.4125 10.5875C19.8042 10.9792 20 11.45 20 12C20 12.55 19.8042 13.0208 19.4125 13.4125C19.0208 13.8042 18.55 14 18 14Z" fill="#4B4D52" />
-                            </svg>
-                        }
+                        icon={'pi pi-cog'}
                         size="small"
-                        className="bg-primary-reverse p-0"
+                        className="surface-card p-0"
                         style={{
                             height: 33.06,
                             width: 33.06
@@ -706,7 +711,7 @@ const SolidFormView = (params: SolidFormViewProps) => {
                     />
                     <OverlayPanel ref={op} className="solid-custom-overlay">
                         <div className="flex flex-column gap-1 p-1">
-                            <Button
+                            {/* <Button
                                 text
                                 type="button"
                                 className="w-8rem text-left gap-2 text-color"
@@ -716,26 +721,48 @@ const SolidFormView = (params: SolidFormViewProps) => {
                                 icon={<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
                                     <path d="M6 11.9997C5.63333 11.9997 5.31944 11.8691 5.05833 11.608C4.79722 11.3469 4.66667 11.033 4.66667 10.6663V2.66634C4.66667 2.29967 4.79722 1.98579 5.05833 1.72467C5.31944 1.46356 5.63333 1.33301 6 1.33301H12C12.3667 1.33301 12.6806 1.46356 12.9417 1.72467C13.2028 1.98579 13.3333 2.29967 13.3333 2.66634V10.6663C13.3333 11.033 13.2028 11.3469 12.9417 11.608C12.6806 11.8691 12.3667 11.9997 12 11.9997H6ZM6 10.6663H12V2.66634H6V10.6663ZM3.33333 14.6663C2.96667 14.6663 2.65278 14.5358 2.39167 14.2747C2.13056 14.0136 2 13.6997 2 13.333V3.99967H3.33333V13.333H10.6667V14.6663H3.33333Z" fill="black" fill-opacity="0.88" />
                                 </svg>}
-                            />
-                            <Button
-                                text
-                                type="button"
-                                className="w-8rem text-left gap-2 text-color"
-                                label="Delete"
-                                size="small"
-                                iconPos="left"
-                                icon={<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-                                    <path d="M4.66666 14C4.29999 14 3.9861 13.8694 3.72499 13.6083C3.46388 13.3472 3.33332 13.0333 3.33332 12.6667V4H2.66666V2.66667H5.99999V2H9.99999V2.66667H13.3333V4H12.6667V12.6667C12.6667 13.0333 12.5361 13.3472 12.275 13.6083C12.0139 13.8694 11.7 14 11.3333 14H4.66666ZM11.3333 4H4.66666V12.6667H11.3333V4ZM5.99999 11.3333H7.33332V5.33333H5.99999V11.3333ZM8.66666 11.3333H9.99999V5.33333H8.66666V11.3333Z" fill="#4B4D52" />
-                                </svg>
-                                }
-                                onClick={() => setDeleteDialogVisible(true)}
-                            />
+                            /> */}
+                            {params.embeded !== true &&
+                                actionsAllowed.includes(`${deletePermission(params.modelName)}`) &&
+                                !formViewLayout.attrs.readonly &&
+                                <Button
+                                    text
+                                    type="button"
+                                    className="w-8rem text-left gap-2"
+                                    label="Delete"
+                                    size="small"
+                                    iconPos="left"
+                                    severity="danger"
+                                    icon={'pi pi-trash'}
+                                    onClick={() => setDeleteDialogVisible(true)}
+                                />
+                            }
+                            {params.embeded == true &&
+                                actionsAllowed.includes(`${deletePermission(params.modelName)}`) &&
+                                !formViewLayout.attrs.readonly &&
+                                <Button
+                                    text
+                                    type="button"
+                                    className="w-8rem text-left gap-2"
+                                    label="Delete"
+                                    size="small"
+                                    iconPos="left"
+                                    severity="danger"
+                                    icon={'pi pi-trash'}
+                                    onClick={() => setDeleteDialogVisible(true)}
+                                />
+                            }
                         </div>
                     </OverlayPanel>
                 </div>
             )
         }
 
+        const breadcrumbData = [
+            { label: 'Book', link: '/admin/core/library-management/book/list' },
+            { label: params.id === "new" ? `Add ${params.modelName}` : `Edit ${params.modelName}` },
+        ];
+
         return (
             <div className="solid-form-wrapper">
                 <Toast ref={toast} />
@@ -752,7 +779,7 @@ const SolidFormView = (params: SolidFormViewProps) => {
                                     {params.embeded !== true &&
                                         actionsAllowed.includes(`${createPermission(params.modelName)}`) &&
                                         !formViewLayout.attrs.readonly &&
-                                        !formViewLayout.attrs.readonly &&
+                                        formik.dirty &&
                                         <div>
                                             <Button
                                                 label="Save"
@@ -762,10 +789,9 @@ const SolidFormView = (params: SolidFormViewProps) => {
                                             />
                                         </div>
                                     }
-                                    {params.embeded !== true &&
+                                    {/* {params.embeded !== true &&
                                         actionsAllowed.includes(`${createPermission(params.modelName)}`) &&
                                         !formViewLayout.attrs.readonly &&
-                                        !formViewLayout.attrs.readonly &&
                                         <div>
                                             <Button
                                                 label="Save & Close"
@@ -777,11 +803,11 @@ const SolidFormView = (params: SolidFormViewProps) => {
                                                 type="submit"
                                             />
                                         </div>
-                                    }
+                                    } */}
                                     {params.embeded == true &&
                                         actionsAllowed.includes(`${createPermission(params.modelName)}`) &&
                                         !formViewLayout.attrs.readonly &&
-                                        !formViewLayout.attrs.readonly &&
+                                        formik.dirty &&
                                         <div>
                                             <Button
                                                 label="Save"
@@ -795,7 +821,7 @@ const SolidFormView = (params: SolidFormViewProps) => {
                                         </div>
                                     }
                                     {params.embeded == true &&
-                                        <Button outlined size="small" type="button" label="Cancel" onClick={() => params.handlePopupClose()} className='bg-primary-reverse' />
+                                        <Button outlined size="small" type="button" label="Close" onClick={() => params.handlePopupClose()} className='bg-primary-reverse' />
 
                                     }
                                     {params.embeded !== true &&
@@ -814,7 +840,7 @@ const SolidFormView = (params: SolidFormViewProps) => {
                                     {params.embeded !== true &&
                                         actionsAllowed.includes(`${updatePermission(params.modelName)}`) &&
                                         !formViewLayout.attrs.readonly &&
-                                        !formViewLayout.attrs.readonly &&
+                                        formik.dirty &&
                                         <div>
                                             <Button
                                                 label="Save"
@@ -827,7 +853,7 @@ const SolidFormView = (params: SolidFormViewProps) => {
                                     {params.embeded == true &&
                                         actionsAllowed.includes(`${updatePermission(params.modelName)}`) &&
                                         !formViewLayout.attrs.readonly &&
-                                        !formViewLayout.attrs.readonly &&
+                                        formik.dirty &&
                                         <div>
                                             <Button
                                                 label="Save"
@@ -837,10 +863,9 @@ const SolidFormView = (params: SolidFormViewProps) => {
                                             />
                                         </div>
                                     }
-                                    {params.embeded !== true &&
+                                    {/* {params.embeded !== true &&
                                         actionsAllowed.includes(`${updatePermission(params.modelName)}`) &&
                                         !formViewLayout.attrs.readonly &&
-                                        !formViewLayout.attrs.readonly &&
                                         <div>
                                             <Button
                                                 label="Save & Close"
@@ -852,37 +877,9 @@ const SolidFormView = (params: SolidFormViewProps) => {
                                                 type="submit"
                                             />
                                         </div>
-                                    }
-                                    {params.embeded !== true &&
-                                        actionsAllowed.includes(`${deletePermission(params.modelName)}`) &&
-                                        !formViewLayout.attrs.readonly &&
-                                        !formViewLayout.attrs.readonly &&
-                                        <div>
-                                            <Button
-                                                size="small"
-                                                type="button"
-                                                label="Delete"
-                                                severity="danger"
-                                                onClick={() => setDeleteDialogVisible(true)}
-                                            />
-                                        </div>
-                                    }
-                                    {params.embeded == true &&
-                                        actionsAllowed.includes(`${deletePermission(params.modelName)}`) &&
-                                        !formViewLayout.attrs.readonly &&
-                                        !formViewLayout.attrs.readonly &&
-                                        <div>
-                                            <Button
-                                                size="small"
-                                                type="button"
-                                                label="Delete"
-                                                severity="danger"
-                                                onClick={() => setDeleteDialogVisible(true)}
-                                            />
-                                        </div>
-                                    }
+                                    } */}
                                     {params.embeded == true &&
-                                        <Button outlined size="small" type="button" label="Cancel" onClick={() => params.handlePopupClose()} className='bg-primary-reverse' />
+                                        <Button outlined size="small" type="button" label="Close" onClick={() => params.handlePopupClose()} className='bg-primary-reverse' />
 
                                     }
                                     {params.embeded !== true &&
@@ -893,6 +890,7 @@ const SolidFormView = (params: SolidFormViewProps) => {
                             </>
                         )}
                     </div>
+                    <SolidBreadcrumb breadcrumbItems={breadcrumbData} />
                     {/* {params.embeded !== true &&
                         <div className="solid-form-stepper">
                             <SolidFormStepper />

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

@@ -7,7 +7,8 @@ export type SolidFieldProps = {
     fieldMetadata: any,
     field: any,
     data: any,
-    modelName?: any
+    modelName?: any,
+    readOnly?: any
 };
 
 export type FormikObject = {