merge: changes from develop branch to qa branch

.github/workflows/deploy.yml

@@ -1,9 +1,9 @@
-name: Deploy main to Deno Deploy
+name: Deploy
 on:
   push:
-    branches: main
+    branches: develop
   pull_request:
-    branches: main
+    branches: develop
 
 jobs:
   deploy:
@@ -16,24 +16,19 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Deno
         uses: denoland/setup-deno@v1
         with:
           deno-version: v1.x
 
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: lts/*
-
       - name: Build step
-        run: "npm install && npm run build" # 📝 Update the build command(s) if necessary
+        run: "npm install && npm run build"
 
       - name: Upload to Deno Deploy
         uses: denoland/deployctl@v1
         with:
-          project: "credebl-studio"
-          entrypoint: "server/entry.mjs" # 📝 Update the entrypoint if necessary
-          root: "dist" # 📝 Update the root if necessary
+          project: "credebl-dev-ui"
+          entrypoint: "server/entry.mjs"
+          root: "dist"

Dockerfile

@@ -27,4 +27,4 @@ COPY --from=build /app/node_modules ./node_modules
 COPY --from=build /app/package.json ./
 COPY --from=build /app/dist ./dist
 EXPOSE 3000
-CMD [ "npm", "run", "preview" ]
+CMD ["deno", "run", "--allow-net", "--allow-read", "--allow-env", "./dist/server/entry.mjs"]

package.json

@@ -32,7 +32,7 @@
 		"@babel/runtime": "^7.22.6",
 		"@babel/runtime-corejs3": "^7.22.6",
 		"@faker-js/faker": "^7.6.0",
-		"@simplewebauthn/browser": "^7.2.0",
+		"@simplewebauthn/browser": "9.0.1",
 		"@supabase/supabase-js": "^2.31.0",
 		"@tanstack/react-form": "^0.0.11",
 		"@types/react": "^18.2.14",

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;
+	}
+};

src/api/issuance.ts

@@ -14,7 +14,7 @@ export const getIssuedCredentials = async ({page,
 	sortingOrder,
 filter}: IConnectionListAPIParameter) => {
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Issuance.getIssuedCredentials}?pageSize=${itemPerPage}&pageNumber=${page}&searchByText=${search}&sortBy=${sortingOrder}&sortField=${sortBy}`;
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Issuance.getIssuedCredentials}?pageSize=${itemPerPage}&pageNumber=${page}&search=${search}&sortBy=${sortingOrder}&sortField=${sortBy}`;
 	const axiosPayload = {
 		url,
 		config: await getHeaderConfigs(),

src/api/organization.ts

@@ -10,6 +10,7 @@ import { apiRoutes } from '../config/apiRoutes';
 import { getFromLocalStorage } from './Auth';
 import { getHeaderConfigs } from '../config/GetHeaderConfigs';
 import { storageKeys } from '../config/CommonConstant';
+import type { IUpdatePrimaryDid } from '../components/organization/interfaces';
 
 export const createOrganization = async (data: object) => {
 	const url = apiRoutes.organizations.create;
@@ -65,8 +66,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);
 
@@ -362,3 +365,62 @@ export const deleteOrganizationInvitation = async (
 		return err?.message;
 	}
 };
+
+export const getDids = async (orgId: string) => {
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.organizations.didList}`;
+
+	const token = await getFromLocalStorage(storageKeys.TOKEN);
+
+	const config = {
+		headers: {
+			'Content-Type': 'application/json',
+			Authorization: `Bearer ${token}`,
+		},
+	};
+	const axiosPayload = {
+		url,
+		config,
+	};
+
+	try {
+		return await axiosGet(axiosPayload);
+	} catch (error) {
+		const err = error as Error;
+		return err?.message;
+	}
+};
+
+export const createDid = async (payload: any) => {
+	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.organizations.createDid}`;
+
+	const axiosPayload = {
+		url,
+		payload,
+		config: await getHeaderConfigs(),
+	};
+
+	try {
+		return await axiosPost(axiosPayload);
+	} catch (error) {
+		const err = error as Error;
+		return err?.message;
+	}
+};
+
+export const updatePrimaryDid = async (orgId: string, payload: IUpdatePrimaryDid) => {
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.organizations.primaryDid}`;
+
+	const axiosPayload = {
+		url,
+		payload,
+		config: await getHeaderConfigs(),
+	};
+
+	try {
+		return await axiosPut(axiosPayload);
+	} catch (error) {
+		const err = error as Error;
+		return err?.message;
+	}
+};

src/api/verification.ts

@@ -47,7 +47,7 @@ export const getVerificationList = async ({
 	sortingOrder,
 }: IConnectionListAPIParameter) => {
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Verification.verifyCredential}?pageSize=${itemPerPage}&pageNumber=${page}&searchByText=${search}&sortBy=${sortingOrder}&sortField=${sortBy}`;
+	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Verification.verifyCredential}?pageSize=${itemPerPage}&pageNumber=${page}&search=${search}&sortBy=${sortingOrder}&sortField=${sortBy}`;
 
 	const axiosPayload = {
 		url,

src/app/constants.ts

@@ -55,3 +55,4 @@ export const RANDOMIZE = Boolean(env.RANDOMIZE) || true;
 // 		],
 // 	},
 // ];
+

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

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;
 }