l-min-components 1.0.1022 → 1.0.1025

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.0.1022",
+  "version": "1.0.1025",
   "type": "module",
   "files": [
     "src/assets",

package/src/components/AppMainLayout/index.jsx

@@ -164,13 +164,6 @@ const AppMainLayout = () => {
   const currentPlan = userPlanData?.data?.current_plan;
   const planState = userPlanData?.data?.state;
 
-  useEffect(() => {
-    const account = generalData?.selectedAccount;
-    if (account?.type?.toLocaleLowerCase() === "instructor") {
-      handleGetAllAffiliate();
-    }
-  }, [generalData]);
-
   const wordBank = [
     "Sign out",
     "Learning",
@@ -307,8 +300,7 @@ const AppMainLayout = () => {
                 <CenterLayout isOpen={isOpen} style={centerLayoutStyle}>
                   {window.location.pathname.includes("instructor") &&
                     !window.location.pathname.includes("enterprise") &&
-                    !window.location.pathname.includes("manage-teams") &&
-                    getAllAffiliateData?.data?.count && (
+                    !window.location.pathname.includes("manage-teams") && (
                       <InstructorAccountSwitcher
                         setAccountType={setAffiliatesActive}
                         data={getAllAffiliateData?.data?.results}

package/src/components/header/getHeaderDetails.js

@@ -45,9 +45,10 @@ const useHeader = () => {
     },
     { manual: true }
   );
-  const handleGetAllAffiliate = async () => {
+  const handleGetAllAffiliate = async (params) => {
     return await getAllAffiliate({
       url: "/learn/v1/instructor/account/affiliate_enterprise_accounts/",
+      params,
     });
   };
 

package/src/components/instructorAccountSwitcher/index.jsx

@@ -14,19 +14,28 @@ const InstructorAccountSwitcher = ({
   setAccountType,
   data,
   generalData,
-  loading,
   onChange,
 }) => {
   const [expiryFlow, setExpiryFlow] = useState();
   const [switchValue, setSwitchValue] = useState(null);
   const [selectedValue, setSelectedValue] = useState(null);
+  const [search, setSearch] = useState("");
   const {
     getDefaultAffiliateData,
     handleGetDefaultAffiliate,
     handleSetDefaultAffiliate,
     setDefaultAffiliateData,
+    handleGetAllAffiliate,
+    getAllAffiliateData,
   } = useHeader();
 
+  useEffect(() => {
+    const account = generalData?.selectedAccount;
+    if (account?.type?.toLocaleLowerCase() === "instructor") {
+      handleGetAllAffiliate({ search });
+    }
+  }, [generalData?.selectedAccount, search]);
+
   const dropdownList = data?.map((item) => {
     const image = item?.profile_photo?.url;
     return { name: item?.display_name, image, id: item?.id };
@@ -126,15 +135,16 @@ const InstructorAccountSwitcher = ({
 
   useEffect(() => {
     if (onChange) {
-      if (selectedValue) onChange({ id: selectedValue?.id });
+      let cookieValue = getCookie();
+      if (cookieValue) onChange({ id: selectedValue?.id });
       else onChange(null);
     }
   }, [selectedValue]);
-  return (
+  return getAllAffiliateData?.data?.count && !search ? (
     <>
       {(setDefaultAffiliateData?.loading ||
         getDefaultAffiliateData?.loading ||
-        loading) && <FullPageLoader fixed hasBackground />}
+        getAllAffiliateData?.loading) && <FullPageLoader fixed hasBackground />}
       {expiryFlow === "renew" && (
         <RenewModal
           close={() => setExpiryFlow(null)}
@@ -192,7 +202,10 @@ const InstructorAccountSwitcher = ({
                 <OutsideAlerter handleClick={() => setDropdown(false)}>
                   <AffiliatesDropDownWrapper>
                     <div className="search_wrapper">
-                      <Search placeholder="Search Affiliates" />
+                      <Search
+                        placeholder="Search Affiliates"
+                        onSubmit={setSearch}
+                      />
                     </div>
                     <ul>
                       {dropdownList?.map((item) => (
@@ -234,6 +247,8 @@ const InstructorAccountSwitcher = ({
         </div>
       </Container>
     </>
+  ) : (
+    <></>
   );
 };