@solidstarters/solid-core-ui 1.1.18 → 1.1.19

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

@@ -11,6 +11,10 @@ import { Schema } from "yup";
 import { FormikObject, ISolidField, SolidFieldProps } from "./ISolidField";
 import { FileReaderExt } from "@/components/common/FileReaderExt";
 import { ProgressBar } from "primereact/progressbar";
+import Link from "next/link";
+import getAcceptedFileTypes from "@/helpers/getAcceptedFileTypes";
+import { downloadMediaFile } from "@/helpers/downloadMediaFile";
+
 export class SolidMediaSingleField implements ISolidField {
 
     private fieldContext: SolidFieldProps;
@@ -82,12 +86,11 @@ export class SolidMediaSingleField implements ISolidField {
 
         const [isDeleteImageDialogVisible, setDeleteImageDialogVisible] = useState(false);
         const [imageToBeDeletedData, setImageToBeDeletedData] = useState<any>();
-        const [imagesPreview, setImagesPreview] = useState<string | ArrayBuffer | null>(null);
-        const [uploadProgress, setUploadProgress] = useState<number>(0);
         const [uploadCompleted, setUploadCompleted] = useState<boolean>(false);
-        const [fileDetails, setFileDetails] = useState<{ name: string; type: string } | null>(null);
-        const [uploadedSize, setUploadedSize] = useState<string>("0 MB");
+        const [fileDetails, setFileDetails] = useState<{ name: string; type: string, fileUrl: string } | null>(null);
         const [totalSize, setTotalSize] = useState<string>("0 KB");
+        const [isReplaceImageDialogVisible, setReplaceImageDialogVisible] = useState(false);
+        const [newFileToUpload, setNewFileToUpload] = useState<any>(null);
 
         const formatFileSize = (size: number) => {
             return size >= 1024 * 1024
@@ -95,139 +98,104 @@ export class SolidMediaSingleField implements ISolidField {
                 : `${(size / 1024).toFixed(1)} KB`;
         };
 
-        const fieldDisabled = fieldLayoutInfo.attrs?.disabled;
-        const fieldReadonly = fieldLayoutInfo.attrs?.readonly;
-
-        const formDisabled = solidFormViewMetaData.data.solidView?.layout?.attrs?.disabled;
-        const formReadonly = solidFormViewMetaData.data.solidView?.layout?.attrs?.readonly;
-
         const [
             deleteMedia,
             { isLoading: isMediaDeleted, isSuccess: isDeleteMediaSuceess, isError: isMediaDeleteError, error: mediaDeleteError, data: DeletedMedia },
         ] = useDeleteMediaMutation();
 
-        const handleDelete = () => {
-            imageToBeDeletedData.e.stopPropagation();
-            if (imageToBeDeletedData.imagesPreview.id) {
-                deleteMedia(imageToBeDeletedData.imagesPreview.id);
-            }
-            formik.setFieldValue(fieldLayoutInfo.attrs.name, null);
-            setDeleteImageDialogVisible(false);
-        };
         const handleCancelUpload = (e: React.MouseEvent) => {
             e.stopPropagation();
             if (imageToBeDeletedData) {
                 deleteMedia(imageToBeDeletedData);
             }
             e.stopPropagation();
-            setUploadProgress(0);
             setUploadCompleted(false);
             setFileDetails(null);
             formik.setFieldValue(fieldLayoutInfo.attrs.name, null);
             setDeleteImageDialogVisible(false);
         };
 
-        const handleDropImage = (acceptedFiles: File[]) => {
-            // const file = acceptedFiles[0];
-            // if (file) {
-            //     formik.setFieldValue(fieldLayoutInfo.attrs.name, file);
-            // } else {
-            //     console.error("No file was accepted");
-            // }
+        const handleDropImage = (acceptedFiles: any[]) => {
             const file = acceptedFiles[0];
             if (!file) return;
+            if (fileDetails) {
+                // If a file is already uploaded, show the confirmation dialog
+                setNewFileToUpload(file);
+                setReplaceImageDialogVisible(true);
+            } else {
+                // If no file is present, proceed with upload
+                uploadFile(file);
+            }
+        };
 
+        const uploadFile = (file: any) => {
             setUploadCompleted(false);
-            setUploadProgress(0);
             setTotalSize(formatFileSize(file.size));
-            setUploadedSize("0 KB");
-            setFileDetails({ name: file.name, type: file.type });
+            setFileDetails({ name: file.name, type: file.type, fileUrl: file.fileUrl });
 
             const reader = new FileReader();
-
-            reader.onloadstart = () => {
-                setUploadProgress(0);
-                setUploadedSize("0 KB");
-            };
-            reader.onprogress = (event) => {
-                if (event.loaded && event.total) {
-                    const percent = Math.round((event.loaded / event.total) * 100);
-                    setUploadProgress(percent);
-                    setUploadedSize(formatFileSize(event.loaded));
-                }
-            };
-
             reader.onloadend = () => {
-                setUploadProgress(100);
                 setUploadCompleted(true);
-                setUploadedSize(totalSize); // Set uploaded size to total size after completion
             };
-
             reader.readAsDataURL(file);
             formik.setFieldValue(fieldLayoutInfo.attrs.name, file);
         };
+        const handleReplaceFile = () => {
+            // Delete the existing file first
+            if (imageToBeDeletedData) {
+                deleteMedia(imageToBeDeletedData);
+            }
 
-        // useEffect(() => {
-        //     const fieldValue = formik?.values[fieldLayoutInfo.attrs.name];
+            setUploadCompleted(false);
+            setFileDetails(null);
+            formik.setFieldValue(fieldLayoutInfo.attrs.name, null);
 
-        //     if (fieldValue instanceof File) {
-        //         setImagesPreview(URL.createObjectURL(fieldValue)); // Generate preview URL for file
-        //     }
-        //     if (typeof fieldValue === 'object') {
-        //         setImagesPreview(fieldValue); // Generate preview URL for file
-        //     }
-        //     if (!fieldValue) {
-        //         setImagesPreview(null);
-        //     }
-        // }, [formik.values, fieldLayoutInfo.attrs.name]);
+            // Proceed with uploading new file
+            if (newFileToUpload) {
+                uploadFile(newFileToUpload);
+                setNewFileToUpload(null);
+            }
+
+            setReplaceImageDialogVisible(false);
+        };
         useEffect(() => {
             const fieldValue = formik?.values[fieldLayoutInfo.attrs.name];
 
             if (fieldValue && typeof fieldValue === "object") {
-                const fileUrl = fieldValue._full_url;
-                if (typeof fileUrl === "string" && fileUrl.length > 0) {
-                    const fileName = fileUrl.split("/").pop(); // Extract filename from URL
-                    setFileDetails({ name: fileName || "Unknown File", type: "Uploaded File" });
-
-                    // Set upload progress
-                    setUploadProgress(100);
-                    setUploadCompleted(true);
-                    setImageToBeDeletedData(fieldValue.id)
-                    // Ensure Formik has the existing file URL
-                    formik.setFieldValue(fieldLayoutInfo.attrs.name, fieldValue);
+                let fileUrl = "";
+                let fileName = "Unknown File";
+
+                if (fieldValue instanceof File) {
+                    // Handle new file upload
+                    fileUrl = fieldValue.name;
+                    fileName = fileUrl;
+                } else if (fieldValue._full_url) {
+                    // Handle updated file from backend
+                    fileUrl = fieldValue._full_url;
+                    fileName = fieldValue.relativeUri?.split("/").pop() || "Unknown File";
                 }
+
+                setFileDetails({ name: fileName, type: "Uploaded File", fileUrl });
+
+                // Set upload progress
+                setUploadCompleted(true);
+                setImageToBeDeletedData(fieldValue.id);
+                formik.setFieldValue(fieldLayoutInfo.attrs.name, fieldValue);
             }
         }, [formik.values, fieldLayoutInfo.attrs.name]);
 
-
         const {
             getRootProps: getRootProps,
             getInputProps: getInputProps,
             isDragActive: isDragActive,
         } = useDropzone({
             onDrop: handleDropImage,
-            accept: {
-                "image/jpeg": [],
-                "image/png": [],
-            },
-            maxSize: 2 * 1024 * 1024, // 2MB
+            accept: getAcceptedFileTypes(fieldMetadata.mediaTypes),
+            maxSize: fieldMetadata.mediaMaxSizeKb * 1024,
         });
 
         const isFormFieldValid = (formik: any, fieldName: string) => formik.touched[fieldName] && formik.errors[fieldName];
 
-        const imageFormatHandler = (preview: any) => {
-            if (typeof preview === 'string') {
-                return preview; // Existing URLs
-            }
-            if (preview instanceof File) {
-                return URL.createObjectURL(preview); // Generate preview URL for File
-            }
-            if (typeof preview === 'object') {
-                return preview._full_url
-            }
-            return ""; // Fallback for invalid cases
-        }
-
         return (
             <div className={className}>
                 <div className="flex flex-column gap-2 mt-4">
@@ -241,7 +209,10 @@ export class SolidMediaSingleField implements ISolidField {
                         className="solid-dropzone-wrapper"
                     >
                         <input {...getInputProps()} />
-                        <DropzonePlaceholder />
+                        <DropzonePlaceholder
+                            mediaTypes={fieldMetadata.mediaTypes}
+                            mediaMaxSizeKb={fieldMetadata.mediaMaxSizeKb}
+                        />
                     </div>
                     {isFormFieldValid(formik, fieldLayoutInfo.attrs.name) && (
                         <Message severity="error" text={formik?.errors[fieldLayoutInfo.attrs.name]?.toString()} />
@@ -251,46 +222,47 @@ export class SolidMediaSingleField implements ISolidField {
                             <div className="flex align-items-center gap-2">
                                 <FileReaderExt fileDetails={fileDetails} />
                                 <div className="w-full flex flex-column gap-1">
-                                    <div className="flex align-items-center justify-content-between">
-                                        <div className="font-bold">{fileDetails.name}</div>
-                                        <div className="cancel-upload-button" onClick={() => setDeleteImageDialogVisible(true)}>
-                                            <svg xmlns="http://www.w3.org/2000/svg" width="6" height="6" viewBox="0 0 6 6" fill="none">
-                                                <path d="M0.6 6L0 5.4L2.4 3L0 0.6L0.6 0L3 2.4L5.4 0L6 0.6L3.6 3L6 5.4L5.4 6L3 3.6L0.6 6Z" fill="#4B4D52" />
-                                            </svg>
+                                    <div className="flex align-items-start justify-content-between">
+                                        <Link className="font-bold w-9" href={process.env.NEXT_PUBLIC_BACKEND_API_URL + `/${fileDetails?.fileUrl}`} target="_blank">{fileDetails.name}</Link>
+                                        <div className="flex align-items-center gap-2">
+                                            <div>
+                                                <Button
+                                                    text
+                                                    icon={"pi pi-download"}
+                                                    size="small"
+                                                    severity="secondary"
+                                                    // className="p-2"
+                                                    style={{
+                                                        height: 16,
+                                                        width: 16
+                                                    }}
+                                                    onClick={() => downloadMediaFile(fileDetails?.fileUrl, fileDetails?.name)}
+                                                />
+                                            </div>
+                                            <div>
+                                                <Button
+                                                    text
+                                                    icon={"pi pi-times"}
+                                                    size="small"
+                                                    severity="secondary"
+                                                    // className="p-2"
+                                                    style={{
+                                                        height: 16,
+                                                        width: 16
+                                                    }}
+                                                    onClick={() => setDeleteImageDialogVisible(true)}
+                                                />
+                                            </div>
                                         </div>
                                     </div>
                                     {
-                                        uploadCompleted ?
-                                            <div className="flex align-items-center gap-2 text-sm">
-                                                {totalSize} of {totalSize}
-                                                <svg xmlns="http://www.w3.org/2000/svg" width="4" height="4" viewBox="0 0 4 4" fill="none">
-                                                    <circle cx="2" cy="2" r="2" fill="#C1C1C1" />
-                                                </svg>
-                                                <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
-                                                    <mask id="mask0_2480_8635" style={{ maskType: 'alpha' }} maskUnits="userSpaceOnUse" x="0" y="0" width="20" height="20">
-                                                        <rect width="20" height="20" fill="#D9D9D9" />
-                                                    </mask>
-                                                    <g mask="url(#mask0_2480_8635)">
-                                                        <path d="M9.16 12.76L13.39 8.53L12.55 7.69L9.16 11.08L7.45 9.37L6.61 10.21L9.16 12.76ZM10 16C9.17 16 8.39 15.8424 7.66 15.5272C6.93 15.2124 6.295 14.785 5.755 14.245C5.215 13.705 4.7876 13.07 4.4728 12.34C4.1576 11.61 4 10.83 4 10C4 9.17 4.1576 8.39 4.4728 7.66C4.7876 6.93 5.215 6.295 5.755 5.755C6.295 5.215 6.93 4.7874 7.66 4.4722C8.39 4.1574 9.17 4 10 4C10.83 4 11.61 4.1574 12.34 4.4722C13.07 4.7874 13.705 5.215 14.245 5.755C14.785 6.295 15.2124 6.93 15.5272 7.66C15.8424 8.39 16 9.17 16 10C16 10.83 15.8424 11.61 15.5272 12.34C15.2124 13.07 14.785 13.705 14.245 14.245C13.705 14.785 13.07 15.2124 12.34 15.5272C11.61 15.8424 10.83 16 10 16Z" fill="#722ED1" />
-                                                    </g>
-                                                </svg>
-                                                Completed
-                                            </div>
-                                            :
-                                            <div className="flex align-items-center gap-2 text-sm">
-                                                {uploadedSize} of {totalSize}
-                                                <svg xmlns="http://www.w3.org/2000/svg" width="4" height="4" viewBox="0 0 4 4" fill="none">
-                                                    <circle cx="2" cy="2" r="2" fill="#C1C1C1" />
-                                                </svg>
-                                                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-                                                    <path d="M7.375 10.5V5.40625L5.75 7.03125L4.875 6.125L8 3L11.125 6.125L10.25 7.03125L8.625 5.40625V10.5H7.375ZM4.25 13C3.90625 13 3.61198 12.8776 3.36719 12.6328C3.1224 12.388 3 12.0938 3 11.75V9.875H4.25V11.75H11.75V9.875H13V11.75C13 12.0938 12.8776 12.388 12.6328 12.6328C12.388 12.8776 12.0938 13 11.75 13H4.25Z" fill="black" />
-                                                </svg>
-                                                Uploading ${uploadProgress}% Completed
-                                            </div>
+                                        uploadCompleted &&
+                                        <div className="flex align-items-center gap-2 text-sm">
+                                            {totalSize}
+                                        </div>
                                     }
                                 </div>
                             </div>
-                            <ProgressBar value={uploadProgress} showValue={false} style={{ height: 4 }} className="mt-2" />
                         </div>
                     )}
                 </div>
@@ -306,7 +278,21 @@ export class SolidMediaSingleField implements ISolidField {
                     )}
                     onHide={() => setDeleteImageDialogVisible(false)}
                 >
-                    <p>Are you sure you want to delete image?</p>
+                    <p>Are you sure you want to delete media?</p>
+                </Dialog>
+                <Dialog
+                    visible={isReplaceImageDialogVisible}
+                    header="Replace Image"
+                    modal
+                    footer={() => (
+                        <div className="flex justify-content-center">
+                            <Button label="Yes, Replace" icon="pi pi-check" className='small-button' severity="danger" onClick={handleReplaceFile} />
+                            <Button label="Cancel" icon="pi pi-times" className='small-button' onClick={() => setReplaceImageDialogVisible(false)} />
+                        </div>
+                    )}
+                    onHide={() => setReplaceImageDialogVisible(false)}
+                >
+                    <p>An media is already uploaded. Do you want to delete it and upload a new one?</p>
                 </Dialog>
             </div>
         );

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

@@ -321,8 +321,8 @@ const CreateModel = ({ data, params }: any) => {
           size="small"
           className="bg-primary-reverse p-0"
           style={{
-            height: 32,
-            width: 32
+            height: 33.06,
+            width: 33.06
           }}
           onClick={(e) =>
             // @ts-ignore 
@@ -400,9 +400,9 @@ const CreateModel = ({ data, params }: any) => {
             </>
           }
         </div>
-        <div className="solid-form-stepper">
+        {/* <div className="solid-form-stepper">
           <SolidFormStepper />
-        </div>
+        </div> */}
         <div className="p-4 solid-form-content">
           <TabView
             activeIndex={activeIndex}

package/src/components/core/module/CreateModule.tsx

@@ -340,8 +340,8 @@ const CreateModule = ({ data }: any) => {
           size="small"
           className="bg-primary-reverse p-0"
           style={{
-            height: 32,
-            width: 32
+            height: 33.06,
+            width: 33.06
           }}
           onClick={(e) =>
             // @ts-ignore 
@@ -414,9 +414,9 @@ const CreateModule = ({ data }: any) => {
             </>
           }
         </div>
-        <div className="solid-form-stepper">
+        {/* <div className="solid-form-stepper">
           <SolidFormStepper />
-        </div>
+        </div> */}
         <div className="p-4 solid-form-content">
           <p className="form-wrapper-heading text-base">Basic Info</p>
           <div className="formgrid grid">

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

@@ -264,9 +264,9 @@ const CreateUser = ({ data, params }: any) => {
             </>
           )}
         </div>
-        <div className="solid-form-stepper">
+        {/* <div className="solid-form-stepper">
           <SolidFormStepper />
-        </div>
+        </div> */}
         <div className="p-4 solid-form-content">
           <div className="grid">
             <div className="col-8 mx-auto">

package/src/components/layout/AppConfig.tsx

@@ -42,7 +42,7 @@ const AppConfig = (props: AppConfigProps) => {
 
     const applyScale = () => {
         // document.documentElement.style.fontSize = layoutConfig.scale + 'px';
-        document.documentElement.style.fontSize = 14 + 'px';
+        document.documentElement.style.fontSize = 15 + 'px';
     };
 
     useEffect(() => {

package/src/components/layout/navbar-two-menu.tsx

@@ -18,7 +18,7 @@ const NavbarTwoMenu = ({ menuItems }: any) => {
     // currentItem === activeParentPath ?' p-highlight' : ''
         return (
             <div key={item?.key} className={`flex align-items-center cursor-pointer menuHead px-3 ${isSettingsPage ? ' p-highlight' : ''}`} onClick={options.onClick}>
-                <Link href={item?.url ? item?.url : '#'} className="w-full flex justify-content-between font-medium">
+                <Link href={item?.url ? item?.url : '#'} className="w-full flex justify-content-between font-normal">
                     <div className="flex align-items-center gap-3">
                         <span className={item.icon} />
                         <span className="">

package/src/components/layout/user-profile-menu.tsx

@@ -86,15 +86,14 @@ const UserProfileMenu = () => {
             <Button
               text
               severity="secondary"
-              className="flex align-items-center gap-2"
-              icon={
-                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
-                  <path d="M3.75 15.75C3.3375 15.75 2.98438 15.6031 2.69063 15.3094C2.39687 15.0156 2.25 14.6625 2.25 14.25V3.75C2.25 3.3375 2.39687 2.98438 2.69063 2.69063C2.98438 2.39687 3.3375 2.25 3.75 2.25H9V3.75H3.75V14.25H9V15.75H3.75ZM12 12.75L10.9688 11.6625L12.8813 9.75H6.75V8.25H12.8813L10.9688 6.3375L12 5.25L15.75 9L12 12.75Z" fill="#F04A4A" />
-                </svg>
-              }
+              className="flex align-items-center gap-2 w-full px-3"
               onClick={() => setConfirmLogout(true)}
-              label="Logout"
-            />
+            >
+              <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18" fill="none">
+                <path d="M3.75 15.75C3.3375 15.75 2.98438 15.6031 2.69063 15.3094C2.39687 15.0156 2.25 14.6625 2.25 14.25V3.75C2.25 3.3375 2.39687 2.98438 2.69063 2.69063C2.98438 2.39687 3.3375 2.25 3.75 2.25H9V3.75H3.75V14.25H9V15.75H3.75ZM12 12.75L10.9688 11.6625L12.8813 9.75H6.75V8.25H12.8813L10.9688 6.3375L12 5.25L15.75 9L12 12.75Z" fill="#F04A4A" />
+              </svg>
+              <span className="p-button-label flex-none ">Logout</span>
+            </Button>
           </div>
         </OverlayPanel>
       </div>

package/src/helpers/downloadMediaFile.tsx

@@ -0,0 +1,19 @@
+export const downloadMediaFile = async (fileUrl: string, fileName: string) => {
+    try {
+        const response = await fetch(`${process.env.NEXT_PUBLIC_BACKEND_API_URL}/${fileUrl}`);
+        const blob = await response.blob();
+
+        const link = document.createElement("a");
+        link.href = URL.createObjectURL(blob);
+        link.setAttribute("download", fileName || "download");
+
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+
+        // Clean up the object URL
+        URL.revokeObjectURL(link.href);
+    } catch (error) {
+        console.error("Download failed:", error);
+    }
+};

package/src/helpers/getAcceptedFileTypes.tsx

@@ -0,0 +1,22 @@
+export default function getAcceptedFileTypes(mediaTypes: string[]) {
+    if (!mediaTypes || mediaTypes.length === 0) return {}; // Default empty
+
+    const fileTypeMapping: Record<string, string> = {
+        image: "image/*",
+        audio: "audio/*",
+        video: "video/*",
+        pdf: "application/pdf",
+        file: "",
+    };
+
+    // If "file" exists in mediaTypes, allow all files
+    if (mediaTypes.includes("file")) {
+        return {};
+    }
+
+    const acceptedTypes = mediaTypes
+        .map(type => fileTypeMapping[type.toLowerCase()])
+        .filter(Boolean); // Remove undefined values
+
+    return acceptedTypes.length > 0 ? Object.fromEntries(acceptedTypes.map(type => [type, []])) : {};
+}

package/src/nextAuth/authProviders.tsx

@@ -175,8 +175,9 @@ const authProviders: NextAuthOptions = {
     callbacks: {
         // @ts-ignore
         jwt: async ({ token, user }) => {
-            if (Date.now() >= (token.accessTokenExpires as number)) {
-                return refreshAccessToken(token); // Call the refresh token function
+            const bufferTime = 60000;
+            if (Date.now() >= (token.accessTokenExpires as number - bufferTime)) {
+                return await refreshAccessToken(token); // Call the refresh token function
             }
 
             // If there is no user (first time login or session), we return the user data

package/dist/components/common/FilterComponent.d.ts

@@ -1,3 +0,0 @@
-declare const FilterComponent: () => import("react/jsx-runtime").JSX.Element;
-export default FilterComponent;
-//# sourceMappingURL=FilterComponent.d.ts.map

package/dist/components/common/FilterComponent.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"FilterComponent.d.ts","sourceRoot":"","sources":["../../../src/components/common/FilterComponent.tsx"],"names":[],"mappings":"AAuRA,QAAA,MAAM,eAAe,+CAkJpB,CAAC;AAEF,eAAe,eAAe,CAAC"}