Correction in Subscription page.

This commit is contained in:
Kartik Sharma 2025-12-13 11:18:11 +05:30
parent d68cb9e664
commit 630c11985d
2 changed files with 81 additions and 97 deletions

View File

@ -1,4 +1,4 @@
import React, { useState } from "react"; import React, { useEffect, useState } from "react";
import TeamEmployeeList from "./TeamEmployeeList"; import TeamEmployeeList from "./TeamEmployeeList";
import { useOrganization } from "../../../hooks/useDirectory"; import { useOrganization } from "../../../hooks/useDirectory";
import { useOrganizationsList } from "../../../hooks/useOrganization"; import { useOrganizationsList } from "../../../hooks/useOrganization";
@ -14,26 +14,26 @@ const TeamAssignToProject = ({ closeModal }) => {
const project = useSelectedProject(); const project = useSelectedProject();
const { data, isLoading, isError, error } = const { data, isLoading, isError, error } =
useProjectAssignedOrganizationsName(project); useProjectAssignedOrganizationsName(project);
const { control, watch, formState: { errors } } = useForm({ const { control, watch, setValue, formState: { errors } } = useForm({
defaultValues: { organizationId: "" }, defaultValues: { organizationId: "" },
}); });
useEffect(() => {
if (data?.length === 1) {
setValue("organizationId", data[0].id, {
shouldValidate: true,
shouldDirty: true,
});
}
}, [data, setValue]);
return ( return (
<div className="container"> <div className="container">
{/* <p className="fs-5 fs-seminbod ">Assign Employee To Project </p> */} {/* <p className="fs-5 fs-seminbod ">Assign Employee To Project </p> */}
<h5 className="mb-4">Assign Employee To Project</h5> <h5 className="mb-4">Assign Employee To Project</h5>
<div className="row align-items-center gx-5 text-start"> <div className="row align-items-center gx-5 text-start">
<div className="col-12 col-md-6 mb-2 mt-5"> <div className="col-12 col-md-6 mb-2">
{!isLoading && data && (
<>
{data.length === 1 && (
<h5 className="mb-2">{data[0].name}</h5>
)}
{/* If multiple organizations → show dropdown */}
{data.length > 1 && (
<div className="col-12 col-md-6 mb-2 text-start">
<AppFormController <AppFormController
name="organizationId" name="organizationId"
control={control} control={control}
@ -41,7 +41,7 @@ const TeamAssignToProject = ({ closeModal }) => {
render={({ field }) => ( render={({ field }) => (
<SelectField <SelectField
label="Select Organization" label="Select Organization"
options={[...data]} options={data ?? []}
placeholder="Choose an Organization" placeholder="Choose an Organization"
required required
labelKey="name" labelKey="name"
@ -54,17 +54,9 @@ const TeamAssignToProject = ({ closeModal }) => {
)} )}
/> />
{errors.organizationId && ( {errors.organizationId && (
<small className="danger-text"> <small className="danger-text">{errors.organizationId.message}</small>
{errors.organizationId.message}
</small>
)} )}
</div> </div>
)}
</>
)}
{/* </div> */}
</div>
<div className="col-12 col-md-6 mt-n2"> <div className="col-12 col-md-6 mt-n2">
<div className="d-flex flex-column"> <div className="d-flex flex-column">
<label htmlFor="search" className="form-label mb-1"> <label htmlFor="search" className="form-label mb-1">

View File

@ -108,15 +108,15 @@ const SubscriptionPlans = () => {
if (!mod || !mod.name) return null; if (!mod || !mod.name) return null;
return ( return (
<div className="accordion-item mb-2" key={mod.id}> <div className="accordion-item mb-2" key={`${plan.id}-${mod.id}`}>
<h2 className="accordion-header" id={`heading-${mod.id}`}> <h2 id={`heading-${plan.id}-${mod.id}`} className="accordion-header">
<button <button
className="accordion-button collapsed py-2 d-flex justify-content-between align-items-center" className="accordion-button py-2 d-flex justify-content-between align-items-center"
type="button" type="button"
data-bs-toggle="collapse" data-bs-toggle="collapse"
data-bs-target={`#collapse-${mod.id}-${plan.id}`} data-bs-target={`#collapse-${plan.id}-${mod.id}`}
aria-expanded="false" aria-expanded="true"
aria-controls={`collapse-${mod.id}-${plan.id}`} aria-controls={`collapse-${plan.id}-${mod.id}`}
> >
<span className="fw-semibold d-flex align-items-center"> <span className="fw-semibold d-flex align-items-center">
{mod.enabled ? ( {mod.enabled ? (
@ -127,45 +127,37 @@ const SubscriptionPlans = () => {
{mod.name} {mod.name}
</span> </span>
{/* Down arrow */} <i className="bx bx-chevron-down ms-2"></i>
<i
className="bx bx-chevron-down ms-2 transition-arrow"
style={{ fontSize: "16px", transition: "transform 0.3s" }}
></i>
</button> </button>
</h2> </h2>
<div <div
id={`collapse-${mod.id}-${plan.id}`} id={`collapse-${plan.id}-${mod.id}`}
className="accordion-collapse collapse" className="accordion-collapse collapse show"
data-bs-parent={`#planFeatures-${plan.id}`} aria-labelledby={`heading-${plan.id}-${mod.id}`}
> >
<div className="accordion-body py-2"> <div className="accordion-body py-2">
{mod.features && mod.features.length > 0 ? ( {mod.features?.length > 0 ? (
<ul className="list-unstyled ms-2"> <ul className="list-unstyled ms-2">
{mod.features.map((feat) => ( {mod.features.map((feat) => (
<li <li key={feat.id} className="d-flex align-items-start mb-1">
key={feat.id}
className="d-flex align-items-start mb-1"
>
<i <i
className={`fa-regular ${mod.enabled ? "bx bxs-circle text-success" : "bx bxs-circle text-danger" className={`bx bxs-circle ${
mod.enabled ? "text-success" : "text-danger"
} me-2 mt-1`} } me-2 mt-1`}
style={{ fontSize: "8px" }} style={{ fontSize: "8px" }}
></i> ></i>
<span>{feat.name}</span> <span>{feat.name}</span>
</li> </li>
))} ))}
</ul> </ul>
) : ( ) : (
<p className="text-muted small mb-0"> <p className="text-muted small mb-0">No additional features</p>
No additional features
</p>
)} )}
</div> </div>
</div> </div>
</div> </div>
); );
})} })}
</div> </div>