update Ui

src/components/Tenant/SubScriptionHistory.jsx

@@ -4,9 +4,7 @@ import { useDispatch } from "react-redux";
 import { setCurrentTenant } from "../../slices/globalVariablesSlice";
 import { useNavigate } from "react-router-dom";
 import { formatUTCToLocalTime } from "../../utils/dateUtils";
-import { MANAGE_TENANTS, SUBSCRIPTION_PLAN_FREQUENCIES } from "../../utils/constants";
+import { SUBSCRIPTION_PLAN_FREQUENCIES } from "../../utils/constants";
-import { useHasAnyPermission } from "../../hooks/useExpense";
-
 
 const SubScriptionHistory = ({ tenantId }) => {
   const { data, isLoading, isError, error } = useTenantDetails(tenantId);
@@ -15,10 +13,8 @@ const SubScriptionHistory = ({ tenantId }) => {
 
   useEffect(() => {
     if (data) {
-      // Tenant exists → set operationMode: 1
       dispatch(setCurrentTenant({ operationMode: 1, data }));
     } else {
-      // No tenant yet → set operationMode: 0
       dispatch(setCurrentTenant({ operationMode: 0, data: null }));
     }
   }, [data, dispatch]);
@@ -32,7 +28,6 @@ const SubScriptionHistory = ({ tenantId }) => {
 
   const plan = data?.currentPlan;
 
-  // No subscription plan yet → show "Add Subscription" button
   if (!plan) {
     return (
       <div className="text-center">
@@ -46,26 +41,14 @@ const SubScriptionHistory = ({ tenantId }) => {
     );
   }
 
-  // Subscription plan exists → show details
+  // Format dates
+  const start = plan?.startDate ? new Date(plan.startDate) : null;
+  const end = plan?.endDate ? new Date(plan.endDate) : null;
   const today = new Date();
-  const start = new Date(plan.startDate);
-  const end = new Date(plan.endDate);
 
-  const totalDays = Math.ceil((end - start) / (1000 * 60 * 60 * 24));
+  const totalDays = start && end ? Math.ceil((end - start) / (1000 * 60 * 60 * 24)) : 0;
-  const daysLeft = Math.max(
+  const daysLeft = end ? Math.max(0, Math.ceil((end - today) / (1000 * 60 * 60 * 24))) : 0;
-    0,
-    Math.ceil((end - today) / (1000 * 60 * 60 * 24))
-  );
-  const percentage = Math.min(
-    100,
-    Math.round(((totalDays - daysLeft) / totalDays) * 100)
-  );
 
-  const getProgressVariant = () => {
-    if (percentage < 50) return "success";
-    if (percentage < 80) return "warning";
-    return "danger";
-  };
   const SubscriptionColumns = [
     {
       key: "createdAt",
@@ -76,8 +59,7 @@ const SubScriptionHistory = ({ tenantId }) => {
     {
       key: "frequency",
       label: "Type",
-    getValue: (e) =>
+      getValue: (e) => SUBSCRIPTION_PLAN_FREQUENCIES[e.frequency] || "N/A",
-      SUBSCRIPTION_PLAN_FREQUENCIES[e.frequency] || "N/A",
       align: "text-start",
     },
     {
@@ -88,55 +70,80 @@ const SubScriptionHistory = ({ tenantId }) => {
           {e.currency?.symbol || "₹"} {e.price}
         </span>
       ),
-  align: "text-end", 
+      align: "text-start",
     },
     {
       key: "planName",
       label: "Plan Name",
       getValue: (e) => (
-    <span className="d-inline-block ps-4">
+        <span className="d-inline-block ps-4">{e.planName}</span>
-      {e.planName}
-    </span>
       ),
       align: "text-start",
     },
-
     {
       key: "action",
       label: "Action",
       getValue: (e) => (
-      <i
+        <div className="dropdown text-center">
-        className="bx bx-cloud-download"
+          <button
+            className="btn btn-icon btn-sm dropdown-toggle hide-arrow"
+            data-bs-toggle="dropdown"
+          >
+            <i className="bx bx-dots-vertical-rounded"></i>
+          </button>
+          <div className="dropdown-menu dropdown-menu-end">
+            {/* View */}
+            <button
+              className="dropdown-item py-1"
+              onClick={() => navigate(`/employee/${e.id}`)}
+            >
+              <i className="bx bx-detail bx-sm"></i> View
+            </button>
+            {/* Download */}
+            <button
+              className="dropdown-item py-1"
               onClick={() => console.log("Download clicked for", e.id)}
-        role="button"
+            >
-      />
+              <i className="bx bx-cloud-download bx-sm"></i> Download
+            </button>
+          </div>
+        </div>
       ),
       align: "text-center",
     },
   ];
 
-
   return (
     <div className="p-2">
       <div className="text-start mb-3">
+        {/* Active subscription */}
         <div className="divider text-start my-1">
           <div className="divider-text">Active Subscription</div>
         </div>
 
         <div className="row">
           <div className="col-12 col-sm-8 border rounded p-3 shadow-sm">
-            <p className="text-primary fw-bold m-0">{plan.planName || "N/A"}</p>
+            <p className="text-primary fw-bold m-0 fs-4">
+              {plan.planName || "N/A"}
+            </p>
+            {plan.description && (
+              <div className="col rounded-2 justify-content-start p-0">
+                <p className="m-0">{plan.description}</p>
+              </div>
+            )}
 
             <div className="d-flex justify-content-between align-items-end mt-2">
               <div>
                 <h3 className="m-0">
-                  {plan.currency?.symbol} {plan.price}
+                  {plan.currency?.symbol || "₹"} {plan.price}
                 </h3>
-                <small className="text-muted">{plan.description}</small>
+                <small className="text-muted">
+                  {SUBSCRIPTION_PLAN_FREQUENCIES[plan.frequency] || ""}
+                </small>
               </div>
               <div>
                 <button
-                  className="btn btn-sm btn-success"
+                  className="btn btn-sm btn-primary"
                   onClick={handleUpgradePlan}
                 >
                   Upgrade Plan
@@ -144,25 +151,26 @@ const SubScriptionHistory = ({ tenantId }) => {
               </div>
             </div>
 
-            <div className="mt-3">
+            <div className="mt-3 small text-muted">
-              {/* Progress bar placeholder */}
+              <div className="d-flex justify-content-between">
-              <div className="d-flex justify-content-between small text-muted mt-1">
+                <span>
-                <span>{totalDays - daysLeft} days used</span>
+                  Active Since :{" "}
-                <span>{daysLeft} days left</span>
+                  {plan.startDate ? formatUTCToLocalTime(plan.startDate) : "N/A"} ({daysLeft} days left)
+                </span>
+              </div>
+              <div className="text-start mt-1">
+                Ends on : {plan.endDate ? formatUTCToLocalTime(plan.endDate) : "N/A"}
+              </div>
+            </div>
           </div>
         </div>
 
-            <div className="text-end mt-1 small text-muted">
+        {/* History */}
-              Ends on {end.toLocaleDateString()}
+        <div className="divider text-start my-3">
+          <div className="divider-text">
+            <i className="bx bx-history"></i> <small>History</small>
           </div>
         </div>
-        </div>
-        <div className="text-start my-2">
-       
-        </div>
-         <div className="divider text-start my-1">
-            <div className="divider-text">  <i className="bx bx-history"></i> <small>History</small></div>
-          </div>
 
         <table className="table border-top dataTable text-nowrap align-middle">
           <thead className="align-middle">
@@ -177,7 +185,7 @@ const SubScriptionHistory = ({ tenantId }) => {
           <tbody className="align-middle">
             {data?.subscriptionHistery
               ?.slice()
-      .sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt)) // latest first
+              .sort((a, b) => new Date(b.createdAt) - new Date(a.createdAt))
               .map((item) => (
                 <tr key={item.id}>
                   {SubscriptionColumns.map((col) => (
@@ -189,7 +197,6 @@ const SubScriptionHistory = ({ tenantId }) => {
               ))}
           </tbody>
         </table>
-
       </div>
     </div>
   );