credebl · pranalidhanavade · May 30, 2024 · May 14, 2024 · May 16, 2024 · May 16, 2024
diff --git a/src/commonComponents/AgentHealth.tsx b/src/commonComponents/AgentHealth.tsx
@@ -1,10 +1,10 @@
-import { apiStatusCodes, storageKeys } from '../config/CommonConstant';
+import { apiStatusCodes, storageKeys } from '../config/CommonConstant.ts';
 import { useEffect, useState } from 'react';
 
 import type { AxiosResponse } from 'axios';
 import CustomSpinner from '../components/CustomSpinner';
-import { getAgentHealth } from '../api/Agent';
-import { getFromLocalStorage } from '../api/Auth';
+import { getAgentHealth } from '../api/Agent.ts';
+import { getFromLocalStorage } from '../api/Auth.ts';
 
 interface Agent {
 	label: string;
@@ -51,7 +51,7 @@ const AgentHealth = () => {
 				{loader ? (
 					<div>
 						<CustomSpinner hideMessage={true} />
-					</div>
+					</div>	
 				) : orgId && (
 					agentHealthDetails?.isInitialized ? (
 						<div className="w-fit flex shrink-0 items-center bg-green-100 text-green-800 text-xs font-medium rounded-full px-2 py-2 md:py-1 dark:bg-green-900 dark:text-green-300">

diff --git a/src/commonComponents/EcosystemProfileCard.tsx b/src/commonComponents/EcosystemProfileCard.tsx
@@ -86,9 +86,9 @@ const EcosystemProfileCard = ({getEndorsementListData}:IEndorsement) => {
                 >
                     <div className="mr-4">
                         {ecosystemDetails?.logoUrl ? (
-                            <CustomAvatar size="60" src={ecosystemDetails?.logoUrl} />
+                            <CustomAvatar size="80px" round src={ecosystemDetails?.logoUrl} />
                         ) : (
-                            <CustomAvatar size="70" name={ecosystemDetails?.name} />
+                            <CustomAvatar size="80px" round name={ecosystemDetails?.name} />
                         )}
                     </div>
 

diff --git a/src/components/Authentication/SignUpUser.tsx b/src/components/Authentication/SignUpUser.tsx
@@ -9,7 +9,7 @@ import {
 	Form,
 	Formik
 } from 'formik';
-import { checkUserExist, sendVerificationMail, setToLocalStorage } from '../../api/Auth.js';
+import { checkUserExist, sendVerificationMail, setToLocalStorage } from '../../api/Auth.ts';
 import { apiStatusCodes, storageKeys } from '../../config/CommonConstant.js';
 import { useEffect, useState } from 'react';
 import SignUpUserName from './SignUpUserName'

diff --git a/src/components/Ecosystem/Dashboard.tsx b/src/components/Ecosystem/Dashboard.tsx
@@ -8,7 +8,7 @@ import BreadCrumbs from '../BreadCrumbs';
 import CustomAvatar from '../Avatar';
 import CustomSpinner from '../CustomSpinner';
 import MemberList from './MemberList';
-import { getEcosystems, getEcosystemDashboard } from '../../api/ecosystem';
+import { getEcosystems, getEcosystemDashboard } from '../../api/ecosystem.ts';
 import { EmptyListMessage } from '../EmptyListComponent';
 import CreateEcosystemOrgModal from '../CreateEcosystemOrgModal';
 import { AlertComponent } from '../AlertComponent';
@@ -17,16 +17,16 @@ import {
 	getEcosystemId,
 	getOwnerAdminRole,
 } from '../../config/ecosystem';
-import type { ICheckEcosystem} from '../../config/ecosystem';
+import type { ICheckEcosystem} from '../../config/ecosystem.ts';
 import { Button, Dropdown } from 'flowbite-react';
 import EditPopupModal from '../EditEcosystemOrgModal';
-import { getFromLocalStorage, removeFromLocalStorage } from '../../api/Auth';
-import { getUserEcosystemInvitations } from '../../api/invitations';
-import { pathRoutes } from '../../config/pathRoutes';
+import { getFromLocalStorage, removeFromLocalStorage } from '../../api/Auth.ts';
+import { getUserEcosystemInvitations } from '../../api/invitations.ts';
+import { pathRoutes } from '../../config/pathRoutes.ts';
 import type { EcosystemDashboard } from '../organization/interfaces';
-import { dateConversion } from '../../utils/DateConversion';
+import { dateConversion } from '../../utils/DateConversion.ts';
 import DateTooltip from '../Tooltip';
-import DashboardCard from '../../commonComponents/DashboardCard';
+import DashboardCard from '../../commonComponents/DashboardCard.tsx';
 import { Roles } from '../../utils/enums/roles';
 
 interface IRoleTablet {

diff --git a/src/components/Ecosystem/EcosystemSidebarOption.tsx b/src/components/Ecosystem/EcosystemSidebarOption.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
-import { checkEcosystem } from '../../config/ecosystem';
-import type { ICheckEcosystem } from '../../config/ecosystem';
-import { pathRoutes } from '../../config/pathRoutes';
+import { checkEcosystem } from '../../config/ecosystem.ts';
+import type { ICheckEcosystem } from '../../config/ecosystem.ts';
+import { pathRoutes } from '../../config/pathRoutes.ts';
 
 const EcosystemSidebarOption = () => {
 	const [isEcosystemEnabled, setIsEcosystemEnabled] = useState(false);

diff --git a/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx b/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx
@@ -260,7 +260,7 @@ const EndorsementPopup = (props: {
 									<Button
 										 => props.closeModal()}
 
-										className="text-primary-700 hover:bg-secondary-700 bg-transparent ring-2 font-medium rounded-lg text-sm dark:text-white dark:hover:text-primary-700 enabled:hover:bg-cyan-100"
+										className="text-primary-700 hover:bg-secondary-700 bg-transparent dark:bg-transparent ring-2 font-medium rounded-lg text-sm dark:text-white dark:hover:text-primary-700 dark:enabled:hover:bg-cyan-100 enabled:hover:bg-cyan-100 "
 									>
 										<svg
 											xmlns="http://www.w3.org/2000/svg"

diff --git a/src/components/Issuance/SchemaSelection.tsx b/src/components/Issuance/SchemaSelection.tsx
@@ -1,8 +1,8 @@
 
-import { setToLocalStorage } from "../../api/Auth";
-import { storageKeys } from "../../config/CommonConstant";
-import { pathRoutes } from "../../config/pathRoutes";
-import SchemaList from "../Resources/Schema/SchemasList";
+import { setToLocalStorage } from "../../api/Auth.ts";
+import { storageKeys } from "../../config/CommonConstant.ts";
+import { pathRoutes } from "../../config/pathRoutes.ts";
+import SchemaList from "../Resources/Schema/SchemasList.tsx";
 
 const SchemaSelection = () => {
 

diff --git a/src/components/Profile/DisplayProfileImg.tsx b/src/components/Profile/DisplayProfileImg.tsx
@@ -1,9 +1,9 @@
 import { useEffect, useState } from "react";
 
-import CustomAvatar from '../Avatar/index'
+import CustomAvatar from '../Avatar/index.tsx'
 import type { IUserProfile } from "./interfaces";
-import { getFromLocalStorage } from "../../api/Auth";
-import { storageKeys } from "../../config/CommonConstant";
+import { getFromLocalStorage } from "../../api/Auth.ts";
+import { storageKeys } from "../../config/CommonConstant.ts";
 
 const DisplayProfileImg = () => {
     const [userObj, setUserObj] = useState<IUserProfile | null>(null)

diff --git a/src/components/Profile/DisplayUser.tsx b/src/components/Profile/DisplayUser.tsx
@@ -1,8 +1,8 @@
 import { useEffect, useState } from "react";
 
-import { TextTittlecase } from "../../utils/TextTransform";
-import { getFromLocalStorage } from "../../api/Auth";
-import { storageKeys } from "../../config/CommonConstant";
+import { TextTittlecase } from "../../utils/TextTransform.ts";
+import { getFromLocalStorage } from "../../api/Auth.ts";
+import { storageKeys } from "../../config/CommonConstant.ts";
 
 const DisplayUser = () => {
 

diff --git a/src/components/organization/OrgDropDown.tsx b/src/components/organization/OrgDropDown.tsx
@@ -1,4 +1,4 @@
-import { apiStatusCodes, storageKeys } from '../../config/CommonConstant';
+import { apiStatusCodes, storageKeys } from '../../config/CommonConstant.ts';
 import {
 	getFromLocalStorage,
 	removeFromLocalStorage,
@@ -9,10 +9,10 @@ import '../../common/global.css';
 import type { AxiosResponse } from 'axios';
 import { BiChevronDown } from 'react-icons/bi';
 import { AiOutlineSearch } from 'react-icons/ai';
-import CustomAvatar from '../Avatar/index';
+import CustomAvatar from '../Avatar/index.tsx';
 import type { IOrgInfo, Organisation } from './interfaces';
-import { getOrganizations } from '../../api/organization';
-import { pathRoutes } from '../../config/pathRoutes';
+import { getOrganizations } from '../../api/organization.ts';
+import { pathRoutes } from '../../config/pathRoutes.ts';
 
 const OrgDropDown = () => {
 	const [orgList, setOrgList] = useState<Organisation[]>([]);
@@ -48,25 +48,29 @@ const OrgDropDown = () => {
 		await removeFromLocalStorage(storageKeys.ECOSYSTEM_ID);
 		await removeFromLocalStorage(storageKeys.ECOSYSTEM_ROLE);
 
-		await setOrgRoleDetails(org);
-		const roles: string[] = org?.userOrgRoles?.length > 0 ? org?.userOrgRoles?.map(
-			(role) => role?.orgRole?.name,
-		) : [];
-		const { id, name, description, logoUrl } = org || {};
-		const orgInfo = {
-			name, description, logoUrl, roles, id
+		if (org) { // Added check
+			await setOrgRoleDetails(org);
+			const roles: string[] = org?.userOrgRoles?.length > 0 ? org?.userOrgRoles?.map((role) => role?.orgRole?.name)
+				: [];
+			const { id, name, description, logoUrl } = org || {};
+			const orgInfo = {
+				name, description, logoUrl, roles, id
+			};
+			await setToLocalStorage(storageKeys.ORG_INFO, orgInfo);
+			window.location.href = pathRoutes.organizations.dashboard;
 		}
-		await setToLocalStorage(storageKeys.ORG_INFO, orgInfo);
-		window.location.href = pathRoutes.organizations.dashboard;
 	};
 
 	const setOrgRoleDetails = async (org: Organisation) => {
-
-		await setToLocalStorage(storageKeys.ORG_ID, org?.id?.toString());
-		const roles: string[] = org?.userOrgRoles?.length > 0 ? org?.userOrgRoles?.map(
-			(role) => role?.orgRole?.name,
-		) : [];
-		await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
+		if (org && org.id !== undefined && org.id !== null) { // Added check
+			await setToLocalStorage(storageKeys.ORG_ID, org.id.toString());
+		}
+		const roles: string[] = org?.userOrgRoles?.length > 0
+			? org?.userOrgRoles.map((role) => role?.orgRole?.name)
+			: [];
+		if (roles.length > 0) { // Added check
+			await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString());
+		}
 	};
 
 	const handleActiveOrg = async (organizations: Organisation[]) => {
@@ -76,26 +80,27 @@ const OrgDropDown = () => {
 
 		if (activeOrgDetails && Object.keys(activeOrgDetails)?.length > 0) {
 			setActiveOrg(activeOrgDetails);
-		} else {
+		} else if (organizations?.[0]) {
 			activeOrgDetails = organizations?.[0];
-			const roles: string[] = activeOrgDetails?.userOrgRoles.map(
+			const roles: string[] = activeOrgDetails?.userOrgRoles?.map(
 				(role: { orgRole: { name: string } }) => role.orgRole.name,
 			);
 			const { id, name, description, logoUrl } = organizations[0] || {};
 			const orgInfo = {
 				id, name, description, logoUrl, roles
-			}
+			};
 			await setToLocalStorage(storageKeys.ORG_INFO, orgInfo);
 
 			setActiveOrg(activeOrgDetails);
 
-			await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString());
+
+				await setToLocalStorage(storageKeys.ORG_ROLES, roles?.toString());
+
 		}
 		if (activeOrgDetails) {
 			await setOrgRoleDetails(activeOrgDetails);
 		}
 	};
-
 	const redirectToCreateOrgModal = () => {
 		window.location.href = '/organizations?orgModal=true';
 	};

diff --git a/src/components/organization/users/EditUserRolesModal.tsx b/src/components/organization/users/EditUserRolesModal.tsx
@@ -210,7 +210,7 @@ const EditUserRoleModal = (props: { openModal: boolean; user: User; setMessage:
                     >
 
                         <svg className="pr-2" xmlns="http://www.w3.org/2000/svg" width="25" height="25" fill="none" viewBox="0 0 18 18">
-										<path stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 1v12l-4-2-4 2V1h8ZM3 17h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2Z"/>
+										<path stroke="#fff" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 1v12l-4-2-4 2V1h8ZM3 17h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2Z"/>
 									</svg>
                         Save
                     </Button>

diff --git a/src/components/organization/users/index.tsx b/src/components/organization/users/index.tsx
@@ -23,7 +23,7 @@ const Users = () => {
                 <ul className="pl-5 flex flex-wrap -mb-px text-sm font-medium text-center" id="myTab" role="tablist">
                     <li className="mr-2">
                         <button
-                            className={`text-xl inline-block p-4 border-b-2 rounded-t-lg ${activeTab === 'users' ? 'text-blue-600 border-blue-600 dark:text-blue-500 dark:border-blue-500' : 'hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300'}`}
+                            className={`text-xl inline-block p-4 border-b-2 rounded-t-lg ${activeTab === 'users' ? 'border-b-2 text-blue-600 border-blue-600 dark:text-blue-500 dark:border-blue-500' : 'border-blue-100 dark:text-gray-400 text-gray-500 hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 hover:border-gray-300 dark:border-transparent'}`}
                             id="users-tab"
                              => setActiveTab('users')}
                             type="button"
@@ -36,7 +36,7 @@ const Users = () => {
                     </li>
                     <li className="mr-2">
                         <button
-                            className={`text-xl inline-block p-4 border-b-2 rounded-t-lg ${activeTab === 'invitations' ? 'text-blue-600 border-blue-600 dark:text-blue-500 dark:border-blue-500' : 'hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300'}`}
+                            className={`text-xl inline-block p-4  rounded-t-lg ${activeTab === 'invitations' ? 'border-b-2 text-blue-600 border-blue-600 dark:text-blue-500 dark:border-blue-500' : 'border-blue-100 dark:text-gray-400 text-gray-500 hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 dark:border-transparent'}`}
                             id="invitations-tab"
                              => setActiveTab('invitations')}
                             type="button"