feat: add own organizations in ecosystem (#667)

* feat: created page Signed-off-by: sanjay.khatal <[email protected]> * feat: add own organizations in the ecosystem Signed-off-by: sanjay.khatal <[email protected]> * feat: add orgs in ecosystem Signed-off-by: sanjay.khatal <[email protected]> * fix: types, redirection and error handling Signed-off-by: sanjay.khatal <[email protected]> * fix: sonarlint issues Signed-off-by: sanjay.khatal <[email protected]> * fix: role wise list access Signed-off-by: bhavanakarwade <[email protected]> * fix: resolved comments Signed-off-by: bhavanakarwade <[email protected]> * fix: pagesize Signed-off-by: bhavanakarwade <[email protected]> --------- Signed-off-by: sanjay.khatal <[email protected]> Signed-off-by: bhavanakarwade <[email protected]> Co-authored-by: bhavanakarwade <[email protected]>
credebl · Apr 26, 2024 · 5c26347 · 5c26347
1 parent 642c9db
commit 5c26347
Show file tree

Hide file tree

Showing 13 changed files with 621 additions and 172 deletions.
diff --git a/src/api/ecosystem.ts b/src/api/ecosystem.ts
@@ -257,3 +257,27 @@ export const getEcosystemMemberList = async ({
 		return err?.message;
 	}
 };
+
+
+export const addOrganizationInEcosystem = async (
+	data: string[],
+	ecosystemId: string,
+	orgId: string,
+) => {
+	const url = `${apiRoutes.Ecosystem.root}/${ecosystemId}/${orgId}${apiRoutes.organizations.root}`;
+	const payload = {
+		organizationIds: data
+	};
+	const axiosPayload = {
+		url,
+		payload,
+		config: await getHeaderConfigs(),
+	};
+
+	try {
+		return await axiosPost(axiosPayload);
+	} catch (error) {
+		const err = error as Error;
+		return err?.message;
+	}
+};
diff --git a/src/api/organization.ts b/src/api/organization.ts
@@ -65,8 +65,10 @@ export const getOrganizations = async (
 	pageNumber: number,
 	pageSize: number,
 	search = '',
+	role = ''
 ) => {
-	const url = `${apiRoutes.organizations.getAll}?pageNumber=${pageNumber}&pageSize=${pageSize}&search=${search}`;
+	const roleQuery = role ? `&role=${role}` : ''
+	const url = `${apiRoutes.organizations.getAll}?pageNumber=${pageNumber}&pageSize=${pageSize}&search=${search}${roleQuery}`;
 
 	const token = await getFromLocalStorage(storageKeys.TOKEN);
 

diff --git a/src/commonComponents/datatable/SortDataTable.tsx b/src/commonComponents/datatable/SortDataTable.tsx
@@ -2,7 +2,7 @@ import type { IDataTable } from './interface';
 import CustomSpinner from '../../components/CustomSpinner';
 import SearchInput from '../../components/SearchInput';
 import { Pagination } from 'flowbite-react';
-import { ChangeEvent, useState } from 'react';
+import { useState } from 'react';
 import { EmptyListMessage } from '../../components/EmptyListComponent';
 
 const SortDataTable: React.FC<IDataTable> = ({
@@ -28,13 +28,14 @@ const SortDataTable: React.FC<IDataTable> = ({
 	discription,
 	noExtraHeight,
 	sortOrder,
+	itemPerPage
 }) => {
 	const [selectedValue, setSelectedValue] = useState(sortOrder ?? '');
 
 	const handleSortByValues = (event: { target: { value: any } }) => {
 		const newSelectedValue = event.target.value;
 		setSelectedValue(newSelectedValue);
-		if(searchSortByValue){
+		if (searchSortByValue) {
 			searchSortByValue(newSelectedValue);
 		}
 	};
@@ -48,9 +49,8 @@ const SortDataTable: React.FC<IDataTable> = ({
 		nextPage?: number;
 		lastPage?: number;
 	};
-
-	const startItem = (nextPage - 2) * 10 + 1;
-	const endItem = Math.min((nextPage - 1) * 10, totalItem);
+	const startItem = (nextPage - 2) * (itemPerPage || 10) + 1;
+	const endItem = Math.min((nextPage - 1) * (itemPerPage || 10), totalItem);	
 
 	const sortValues = [
 		{
@@ -177,13 +177,12 @@ const SortDataTable: React.FC<IDataTable> = ({
 								</tr>
 							) : (
 								<tbody className="bg-white dark:bg-gray-800 w-full">
-									{data.length ? (
-										data.map((ele, index) => (
+									{data?.length ? (
+										data?.map((ele, index) => (
 											<tr
 												key={index}
-												className={`${
-													index % 2 !== 0 ? 'bg-gray-50 dark:bg-gray-700' : ''
-												}`}
+												className={`${index % 2 !== 0 ? 'bg-gray-50 dark:bg-gray-700' : ''
+													}`}
 											>
 												{ele.data.map((subEle, index) => (
 													<td

diff --git a/src/commonComponents/datatable/interface.ts b/src/commonComponents/datatable/interface.ts
@@ -27,7 +27,7 @@ export interface IDataTable {
 	currentPage: any;
 	onPageChange: (page: number) => void;
 	totalPages: number;
-	searchSortByValue: (value: any) => void;
+	searchSortByValue?: (value: string) => void;
 	isPagination?: boolean;
 	isSearch: boolean;
 	isRefresh: boolean;
@@ -47,4 +47,5 @@ export interface IDataTable {
 		  }
 		| {};
 	sortOrder?:string;
+	itemPerPage?: number;
 }