From dbb6db11ae3582505f6f69a6516ca1bf0075c14a Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Mon, 20 Jan 2025 19:37:46 +0530 Subject: [PATCH 01/11] fix: schema route changes Signed-off-by: bhavanakarwade --- src/config/pathRoutes.ts | 2 +- src/pages/organizations/schemas/[schemaId].astro | 9 +++++++++ .../organizations/schemas/view-schema/[schemaId].astro | 9 --------- 3 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 src/pages/organizations/schemas/[schemaId].astro delete mode 100644 src/pages/organizations/schemas/view-schema/[schemaId].astro diff --git a/src/config/pathRoutes.ts b/src/config/pathRoutes.ts index d21fdacee..2eab0beec 100644 --- a/src/config/pathRoutes.ts +++ b/src/config/pathRoutes.ts @@ -34,7 +34,7 @@ export const pathRoutes = { createSchema: '/organizations/schemas/create', deleteOrganization:'/organizations/delete-organizations', - viewSchema: '/organizations/schemas/view-schema', + viewSchema: '/organizations/schemas', Issuance: { issue: '/organizations/credentials/issue', schema: '/organizations/credentials/issue/schemas', diff --git a/src/pages/organizations/schemas/[schemaId].astro b/src/pages/organizations/schemas/[schemaId].astro new file mode 100644 index 000000000..e672385fc --- /dev/null +++ b/src/pages/organizations/schemas/[schemaId].astro @@ -0,0 +1,9 @@ +--- +import LayoutSidebar from "../../../app/LayoutSidebar.astro"; +import ViewSchemas from "../../../components/Resources/Schema/ViewSchema"; + +const schemaId = Astro.params.schemaId; +--- + + + diff --git a/src/pages/organizations/schemas/view-schema/[schemaId].astro b/src/pages/organizations/schemas/view-schema/[schemaId].astro deleted file mode 100644 index e12ae57d9..000000000 --- a/src/pages/organizations/schemas/view-schema/[schemaId].astro +++ /dev/null @@ -1,9 +0,0 @@ ---- -import LayoutSidebar from '../../../../app/LayoutSidebar.astro'; -import ViewSchemas from '../../../../components/Resources/Schema/ViewSchema' - -const schemaId = Astro.params.schemaId; ---- - - - From efa91da135acd78e869f6011abde280e374256c9 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Tue, 21 Jan 2025 12:17:38 +0530 Subject: [PATCH 02/11] fix: refactor dev deploy yml file Signed-off-by: bhavanakarwade --- .github/workflows/deploy-dev.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index c26ee9aa9..f5fb97b4a 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -28,7 +28,7 @@ jobs: echo "PUBLIC_MODE=DEV" > .env - echo "PUBLIC_BASE_URL=${{ secrets.DEV_PUBLIC_BASE_URL }}" >> .env + echo "PUBLIC_BASE_URL=${{ secrets.QA_PUBLIC_BASE_URL }}" >> .env echo "PUBLIC_SHOW_NAME_AS_LOGO=true" >> .env @@ -46,29 +46,29 @@ jobs: echo "PUBLIC_PLATFROM_DISCORD_SUPPORT=https://discord.gg/w4hnQT7NJG" >> .env - echo "PUBLIC_ALLOW_DOMAIN=${{ secrets.DEV_PUBLIC_ALLOW_DOMAIN }}" >> .env + echo "PUBLIC_ALLOW_DOMAIN=${{ secrets.QA_PUBLIC_ALLOW_DOMAIN }}" >> .env echo "PUBLIC_POLYGON_MAINNET_URL=https://polygon-rpc.com/" >> .env echo "PUBLIC_POLYGON_TESTNET_URL=https://rpc-amoy.polygon.technology" >> .env - echo "PUBLIC_ECOSYSTEM_FRONT_END_URL=https://dev-ecosystem.sovio.id" >> .env + echo "PUBLIC_ECOSYSTEM_FRONT_END_URL=https://qa-ecosystem.credebl.id" >> .env - echo "PUBLIC_CREDEBL_FRONT_END_URL=https://dev.sovio.id" >> .env + echo "PUBLIC_CREDEBL_FRONT_END_URL=https://qa.credebl.id" >> .env - echo "PUBLIC_ECOSYSTEM_BASE_URL=${{ secrets.DEV_PUBLIC_ECOSYSTEM_BASE_URL }}" >> .env + echo "PUBLIC_ECOSYSTEM_BASE_URL=${{ secrets.QA_PUBLIC_ECOSYSTEM_BASE_URL }}" >> .env echo "PUBLIC_PLATFORM_DISCORD_URL=https://discord.gg/w4hnQT7NJG" >> .env - echo "PUBLIC_REDIRECTION_TARGET_URL=https://social-share.sovio.id" >> .env + echo "PUBLIC_REDIRECTION_TARGET_URL=https://social-share.credebl.id" >> .env - echo "PUBLIC_CRYPTO_PRIVATE_KEY=${{ secrets.DEV_PUBLIC_CRYPTO_PRIVATE_KEY }}" >> .env + echo "PUBLIC_CRYPTO_PRIVATE_KEY=${{ secrets.QA_PUBLIC_CRYPTO_PRIVATE_KEY }}" >> .env - echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID=${{ secrets.DEV_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID }}" >> .env + echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID=${{ secrets.QA_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID }}" >> .env - echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=${{ secrets.DEV_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET }}" >> .env + echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=${{ secrets.QA_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET }}" >> .env - echo "PUBLIC_REDIRECT_FROM_URL=https://dev.sovio.id" >> .env + echo "PUBLIC_REDIRECT_FROM_URL=https://qa.credebl.id" >> .env - name: Build step run: npm install && npm run build # 📝 Update the build command(s) @@ -76,6 +76,6 @@ jobs: - name: Upload to Deno Deploy uses: denoland/deployctl@v1 with: - project: "credebl-dev-ui" # Project name in Deno Deploy + project: "credebl-studio-qa" # Project name in Deno Deploy entrypoint: "server/entry.mjs" # 📝 Update the entrypoint root: "dist" \ No newline at end of file From 4506f3f58ec32731d3a9cdcd381e1d659be3bc4c Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Tue, 21 Jan 2025 15:38:20 +0530 Subject: [PATCH 03/11] fix: refactor dev yml file Signed-off-by: bhavanakarwade --- .github/workflows/deploy-dev.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index f5fb97b4a..81cf17621 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -28,7 +28,7 @@ jobs: echo "PUBLIC_MODE=DEV" > .env - echo "PUBLIC_BASE_URL=${{ secrets.QA_PUBLIC_BASE_URL }}" >> .env + echo "PUBLIC_BASE_URL=${{ secrets.DEV_PUBLIC_BASE_URL }}" >> .env echo "PUBLIC_SHOW_NAME_AS_LOGO=true" >> .env @@ -46,29 +46,29 @@ jobs: echo "PUBLIC_PLATFROM_DISCORD_SUPPORT=https://discord.gg/w4hnQT7NJG" >> .env - echo "PUBLIC_ALLOW_DOMAIN=${{ secrets.QA_PUBLIC_ALLOW_DOMAIN }}" >> .env + echo "PUBLIC_ALLOW_DOMAIN=${{ secrets.DEV_PUBLIC_ALLOW_DOMAIN }}" >> .env echo "PUBLIC_POLYGON_MAINNET_URL=https://polygon-rpc.com/" >> .env echo "PUBLIC_POLYGON_TESTNET_URL=https://rpc-amoy.polygon.technology" >> .env - echo "PUBLIC_ECOSYSTEM_FRONT_END_URL=https://qa-ecosystem.credebl.id" >> .env + echo "PUBLIC_ECOSYSTEM_FRONT_END_URL=https://dev-ecosystem.sovio.id" >> .env - echo "PUBLIC_CREDEBL_FRONT_END_URL=https://qa.credebl.id" >> .env + echo "PUBLIC_CREDEBL_FRONT_END_URL=https://dev.sovio.id" >> .env - echo "PUBLIC_ECOSYSTEM_BASE_URL=${{ secrets.QA_PUBLIC_ECOSYSTEM_BASE_URL }}" >> .env + echo "PUBLIC_ECOSYSTEM_BASE_URL=${{ secrets.DEV_PUBLIC_ECOSYSTEM_BASE_URL }}" >> .env echo "PUBLIC_PLATFORM_DISCORD_URL=https://discord.gg/w4hnQT7NJG" >> .env - echo "PUBLIC_REDIRECTION_TARGET_URL=https://social-share.credebl.id" >> .env + echo "PUBLIC_REDIRECTION_TARGET_URL=https://social-share.sovio.id" >> .env - echo "PUBLIC_CRYPTO_PRIVATE_KEY=${{ secrets.QA_PUBLIC_CRYPTO_PRIVATE_KEY }}" >> .env + echo "PUBLIC_CRYPTO_PRIVATE_KEY=${{ secrets.DEV_PUBLIC_CRYPTO_PRIVATE_KEY }}" >> .env - echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID=${{ secrets.QA_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID }}" >> .env + echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID=${{ secrets.DEV_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID }}" >> .env - echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=${{ secrets.QA_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET }}" >> .env + echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=${{ secrets.DEV_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET }}" >> . - echo "PUBLIC_REDIRECT_FROM_URL=https://qa.credebl.id" >> .env + echo "PUBLIC_REDIRECT_FROM_URL=https://dev.sovio.id" >> .env - name: Build step run: npm install && npm run build # 📝 Update the build command(s) @@ -76,6 +76,6 @@ jobs: - name: Upload to Deno Deploy uses: denoland/deployctl@v1 with: - project: "credebl-studio-qa" # Project name in Deno Deploy + project: "credebl-dev-ui" # Project name in Deno Deploy entrypoint: "server/entry.mjs" # 📝 Update the entrypoint root: "dist" \ No newline at end of file From e7e6fc705d9a0e8cba42955ca2ff11a0faf07499 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Tue, 21 Jan 2025 15:46:44 +0530 Subject: [PATCH 04/11] fix: refactor domains in yml file Signed-off-by: bhavanakarwade --- .github/workflows/deploy-dev.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 2690e273c..0e9b32782 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -28,7 +28,7 @@ jobs: echo "PUBLIC_MODE=DEV" > .env - echo "PUBLIC_BASE_URL=${{ secrets.QA_PUBLIC_BASE_URL }}" >> .env + echo "PUBLIC_BASE_URL=${{ secrets.DEV_PUBLIC_BASE_URL }}" >> .env echo "PUBLIC_SHOW_NAME_AS_LOGO=true" >> .env @@ -46,29 +46,29 @@ jobs: echo "PUBLIC_PLATFROM_DISCORD_SUPPORT=https://discord.gg/w4hnQT7NJG" >> .env - echo "PUBLIC_ALLOW_DOMAIN=${{ secrets.QA_PUBLIC_ALLOW_DOMAIN }}" >> .env + echo "PUBLIC_ALLOW_DOMAIN=${{ secrets.DEV_PUBLIC_ALLOW_DOMAIN }}" >> .env echo "PUBLIC_POLYGON_MAINNET_URL=https://polygon-rpc.com/" >> .env echo "PUBLIC_POLYGON_TESTNET_URL=https://rpc-amoy.polygon.technology" >> .env - echo "PUBLIC_ECOSYSTEM_FRONT_END_URL=https://qa-ecosystem.credebl.id" >> .env + echo "PUBLIC_ECOSYSTEM_FRONT_END_URL=https://dev-ecosystem.sovio.id" >> .env - echo "PUBLIC_CREDEBL_FRONT_END_URL=https://qa.credebl.id" >> .env + echo "PUBLIC_CREDEBL_FRONT_END_URL=https://dev.sovio.id" >> .env - echo "PUBLIC_ECOSYSTEM_BASE_URL=${{ secrets.QA_PUBLIC_ECOSYSTEM_BASE_URL }}" >> .env + echo "PUBLIC_ECOSYSTEM_BASE_URL=${{ secrets.DEV_PUBLIC_ECOSYSTEM_BASE_URL }}" >> .env echo "PUBLIC_PLATFORM_DISCORD_URL=https://discord.gg/w4hnQT7NJG" >> .env - echo "PUBLIC_REDIRECTION_TARGET_URL=https://social-share.credebl.id" >> .env + echo "PUBLIC_REDIRECTION_TARGET_URL=https://social-share.sovio.id" >> .env - echo "PUBLIC_CRYPTO_PRIVATE_KEY=${{ secrets.QA_PUBLIC_CRYPTO_PRIVATE_KEY }}" >> .env + echo "PUBLIC_CRYPTO_PRIVATE_KEY=${{ secrets.DEV_PUBLIC_CRYPTO_PRIVATE_KEY }}" >> .env - echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID=${{ secrets.QA_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID }}" >> .env + echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID=${{ secrets.DEV_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_ID }}" >> .env - echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=${{ secrets.DEV_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET }}" >> . + echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=${{ secrets.DEV_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET }}" >> .env - echo "PUBLIC_REDIRECT_FROM_URL=https://qa.credebl.id" >> .env + echo "PUBLIC_REDIRECT_FROM_URL=https://dev.sovio.id" >> .env - name: Build step run: npm install && npm run build # 📝 Update the build command(s) From 6b17f18e0189eaf1f5dee0d66de5f5c4e629ca31 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Tue, 21 Jan 2025 16:51:12 +0530 Subject: [PATCH 05/11] fix: added validations for condition and values of predicates Signed-off-by: bhavanakarwade --- .../Verification/EmailAttributesSelection.tsx | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/components/Verification/EmailAttributesSelection.tsx b/src/components/Verification/EmailAttributesSelection.tsx index f88eb9063..18e3950a8 100644 --- a/src/components/Verification/EmailAttributesSelection.tsx +++ b/src/components/Verification/EmailAttributesSelection.tsx @@ -112,12 +112,7 @@ const EmailAttributesSelection = () => { const handleSubmit = () => { setErrMsg(null); - - if(isConnectionProof){ - redirectToConnections(); - return; - } - + if (w3cSchema ) { redirectToAppropriatePage(); return; @@ -131,6 +126,7 @@ const EmailAttributesSelection = () => { }; const hasInvalidNumberAttributes = (): boolean => { + const numberAttributes = attributeData?.filter( (attr) => attr.dataType === 'number' && attr.isChecked ); @@ -155,22 +151,26 @@ const EmailAttributesSelection = () => { setErrMsg('Condition is required'); return true; } - return false; }; const redirectToAppropriatePage = () => { - window.location.href = w3cSchema - ? `${pathRoutes.organizations.verification.w3cEmailVerification}` - : `${pathRoutes.organizations.verification.emailVerification}`; - }; + switch (true) { + case w3cSchema && isConnectionProof: + window.location.href = pathRoutes.organizations.verification.W3CConnections; + break; + case !w3cSchema && isConnectionProof: + window.location.href = pathRoutes.organizations.verification.connections; + break; + case w3cSchema && !isConnectionProof: + window.location.href = pathRoutes.organizations.verification.w3cEmailVerification; + break; + default: + window.location.href = pathRoutes.organizations.verification.emailVerification; + break; + } + }; - const redirectToConnections = () => { - window.location.href = w3cSchema - ? `${pathRoutes.organizations.verification.W3CConnections}` - : `${pathRoutes.organizations.verification.connections}`; - } - const loadAttributesData = async () => { setLoading(true); From 15c5e706a8e2c13046feb0d7c65f9d3bbdcbf7a8 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Tue, 21 Jan 2025 18:39:02 +0530 Subject: [PATCH 06/11] fix: unable to send proof request using connection issue Signed-off-by: bhavanakarwade --- src/components/Verification/Connections.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/Verification/Connections.tsx b/src/components/Verification/Connections.tsx index 1c9a7a65f..be75999b8 100644 --- a/src/components/Verification/Connections.tsx +++ b/src/components/Verification/Connections.tsx @@ -64,7 +64,7 @@ const Connections = () => { }) setSelectedConnectionList(connectionsData); } catch (error) { - console.log("ERROR IN TABLE GENERATION::", error); + console.error("ERROR IN TABLE GENERATION::", error); } }; @@ -114,11 +114,10 @@ const Connections = () => { await setToLocalStorage(storageKeys.SELECTED_USER, selectedConnections); - const [attributeData, userData, orgId, attributes] = await Promise.all([ + const [attributeData, userData, orgId] = await Promise.all([ getFromLocalStorage(storageKeys.ATTRIBUTE_DATA), getFromLocalStorage(storageKeys.SELECTED_USER), getFromLocalStorage(storageKeys.ORG_ID), - getFromLocalStorage(storageKeys.SCHEMA_ATTRIBUTES), ]); const attr= JSON.parse(attributeData) @@ -159,6 +158,7 @@ const Connections = () => { }); let verifyCredentialPayload; + if (!isW3cDid) { const parsedUserData = JSON.parse(userData); const connectionIds = parsedUserData.map((connection: { connectionId: string | string[]; }) => connection.connectionId); @@ -185,7 +185,7 @@ const Connections = () => { schemaId: attr.schemaId, schemaName: attr.schemaName, })); - + const groupedAttributes = checkedW3CAttributes.reduce((acc: any, curr: any) => { const schemaName = curr.schemaName; if (!acc[schemaName]) { @@ -194,7 +194,6 @@ const Connections = () => { acc[schemaName].push(curr); return acc; }, {}); - verifyCredentialPayload = { @@ -231,8 +230,8 @@ const Connections = () => { } } - - if (attributes && verifyCredentialPayload ) { + + if (verifyCredentialPayload ) { const requestType = isW3cDid ? RequestType.PRESENTATION_EXCHANGE : RequestType.INDY; let response; if (typeof verifyCredentialPayload.connectionId === 'string') { From 157880724c382a79c59b8d70125831f3c4a4a80f Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Fri, 24 Jan 2025 12:47:14 +0530 Subject: [PATCH 07/11] fix: remove unnecessary code Signed-off-by: bhavanakarwade --- src/pages/index.astro | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pages/index.astro b/src/pages/index.astro index c3c67f72c..86e438738 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -788,9 +788,7 @@ const env = import.meta.env || process.env; class="h-10 w-10 rounded-full bg-gray-100 text-gray-600 dark:bg-gray-600 dark:text-gray-300 sm:h-12 sm:w-12 lg:h-16 lg:w-16" /> - class="dark:text:white hover:opacity-50" -1149 -  +
- class="dark:text:white hover:opacity-50" -1149 -  +
Date: Fri, 24 Jan 2025 19:23:01 +0530 Subject: [PATCH 08/11] fix: search bar issue throughout the application Signed-off-by: bhavanakarwade --- .../datatable/SortDataTable.tsx | 3 +- src/commonComponents/datatable/interface.ts | 1 + src/components/Issuance/IssuedCrdentials.tsx | 4 +- .../Resources/Schema/SchemasList.tsx | 2 +- .../VerificationCredentialList.tsx | 3 + .../organization/OrganizationsList.tsx | 103 ++++++++---------- .../organization/invitations/Invitations.tsx | 1 + src/components/organization/users/Members.tsx | 2 +- 8 files changed, 56 insertions(+), 63 deletions(-) diff --git a/src/commonComponents/datatable/SortDataTable.tsx b/src/commonComponents/datatable/SortDataTable.tsx index 88cafe21d..9144493b3 100644 --- a/src/commonComponents/datatable/SortDataTable.tsx +++ b/src/commonComponents/datatable/SortDataTable.tsx @@ -8,6 +8,7 @@ import { EmptyListMessage } from '../../components/EmptyListComponent'; const SortDataTable: React.FC = ({ header, + searchValue, displaySelect, data, loading, @@ -91,7 +92,7 @@ const SortDataTable: React.FC = ({
{isSearch && ( - + )} diff --git a/src/commonComponents/datatable/interface.ts b/src/commonComponents/datatable/interface.ts index 7cd5870e6..4f7390c03 100644 --- a/src/commonComponents/datatable/interface.ts +++ b/src/commonComponents/datatable/interface.ts @@ -20,6 +20,7 @@ export interface Data { export interface IDataTable { header: TableHeader[]; + searchValue?: string; data: ITableData[]; loading: boolean; onInputChange: (e: ChangeEvent) => void; diff --git a/src/components/Issuance/IssuedCrdentials.tsx b/src/components/Issuance/IssuedCrdentials.tsx index cf2fde20e..cdecac4ed 100644 --- a/src/components/Issuance/IssuedCrdentials.tsx +++ b/src/components/Issuance/IssuedCrdentials.tsx @@ -46,7 +46,7 @@ const CredentialList = () => { lastPage: '', }); const [w3cSchema, setW3CSchema]= useState(false); - + const [searchText, setSearchText] = useState(""); const getIssuedCredDefs = async ( listAPIParameter: IConnectionListAPIParameter, @@ -204,6 +204,7 @@ const CredentialList = () => { //onChange of Search input text const searchInputChange = (e: ChangeEvent) => { + setSearchText(e.target.value) setListAPIParameter({ ...listAPIParameter, search: e.target.value, @@ -301,6 +302,7 @@ const CredentialList = () => { > => { event.preventDefault(); const inputValue = event.target.value; - setSearchValue(inputValue); + setSearchValue(inputValue.toLowerCase()); getSchemaList( { diff --git a/src/components/Verification/VerificationCredentialList.tsx b/src/components/Verification/VerificationCredentialList.tsx index 53eb93276..0d1234150 100644 --- a/src/components/Verification/VerificationCredentialList.tsx +++ b/src/components/Verification/VerificationCredentialList.tsx @@ -58,6 +58,7 @@ const VerificationCredentialList = () => { nextPage: '', lastPage: '', }); + const [searchText, setSearchText] = useState(""); const getProofPresentationData = async (proofId: string) => { try { @@ -85,6 +86,7 @@ const VerificationCredentialList = () => { }; const searchInputChange = (e: ChangeEvent) => { + setSearchText(e.target.value) setListAPIParameter({ ...listAPIParameter, search: e.target.value, @@ -410,6 +412,7 @@ const VerificationCredentialList = () => { > { await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString()); window.location.href = pathRoutes.organizations.dashboard; }; + + const filteredOrganizations = organizationsList?.filter((org) => + org.name.toLowerCase().includes(searchText.toLowerCase()) + ); + let content: React.JSX.Element = <>; - if (organizationsList && organizationsList?.length > 0) { + + if (filteredOrganizations && filteredOrganizations.length > 0) { content = (
- {organizationsList.map((org) => ( + {filteredOrganizations.map((org) => ( redirectOrgDashboard(org)} @@ -142,77 +148,64 @@ const OrganizationsList = () => { maxWidth: '100%', overflow: 'auto', }} - > + >
- {org.logoUrl ? ( + /> ) : ( - + )} - -
+
{org?.name}

{org?.description}

-
-
    -
  • -
    -
    - Role(s): - {org.roles && - org.roles.length > 0 && - org.roles.map((role: string, index: number) => { - return ( - - {role.charAt(0).toUpperCase() + - role.slice(1)} - - ); - })} -
    -
    -
    • -
-
))}
-
- {currentPage.total > 1 && ( -
- -
- )} -
+ {currentPage.total > 1 && ( +
+ +
+ )}
); - } else { + } else if (searchText && filteredOrganizations?.length === 0) { content = ( + ); + } else if (!searchText && (!organizationsList || organizationsList.length === 0)) { + content = ( + { /> ); } + return (
@@ -245,7 +239,7 @@ const OrganizationsList = () => { Organizations
- +
= 10} @@ -278,15 +272,6 @@ const OrganizationsList = () => { setOpenModal={props.setOpenModal} isorgModal={true} /> - { organizationsList && { - setMessage(null); - setError(null); - }} - /> - } {loading ? (
diff --git a/src/components/organization/invitations/Invitations.tsx b/src/components/organization/invitations/Invitations.tsx index 42edd75df..1b999348c 100644 --- a/src/components/organization/invitations/Invitations.tsx +++ b/src/components/organization/invitations/Invitations.tsx @@ -122,6 +122,7 @@ const Invitations = () => {
{
- +
Date: Mon, 27 Jan 2025 13:39:15 +0530 Subject: [PATCH 09/11] fix: added search on connection list Signed-off-by: bhavanakarwade --- src/components/ConnectionsList/index.tsx | 3 +++ src/components/Issuance/ConnectionList.tsx | 4 +++- src/components/Verification/ConnectionList.tsx | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/ConnectionsList/index.tsx b/src/components/ConnectionsList/index.tsx index dc6505e5d..de1fbb91e 100644 --- a/src/components/ConnectionsList/index.tsx +++ b/src/components/ConnectionsList/index.tsx @@ -37,6 +37,7 @@ const ConnectionList = () => { nextPage: '', lastPage: '', }); + const [searchText, setSearchText] = useState(""); const getConnections = async (apiParameter: IConnectionListAPIParameter) => { const orgId = await getFromLocalStorage(storageKeys.ORG_ID); @@ -105,6 +106,7 @@ const ConnectionList = () => { //onChange of Search input text const searchInputChange = (e: ChangeEvent) => { + setSearchText(e.target.value) setListAPIParameter({ ...listAPIParameter, search: e.target.value, @@ -150,6 +152,7 @@ const ConnectionList = () => { )} ([]); const [connectionList, setConnectionList] = useState([]); const [localOrgs, setLocalOrgs] = useState([]); - + const [searchText, setSearchText] = useState(""); const [loading, setLoading] = useState(false); const [totalItem, setTotalItem] = useState(0); const [error, setError] = useState(null); @@ -188,6 +188,7 @@ const ConnectionList = (props: { //onChange of Search input text const searchInputChange = (e: ChangeEvent) => { + setSearchText(e.target.value) setListAPIParameter({ ...listAPIParameter, search: e.target.value, @@ -278,6 +279,7 @@ const ConnectionList = (props: { /> ([]); const [connectionsTableData, setConnectionsTableData] = useState([]); const [localOrgs, setLocalOrgs] = useState([]); - + const [searchText, setSearchText] = useState(""); const [selectedConnectionList, setSelectedConnectionList] = useState< ITableData[] >([]); @@ -66,6 +66,7 @@ const ConnectionList = (props: { }, [listAPIParameter]); const searchInputChange = (e: ChangeEvent) => { + setSearchText(e.target.value) setListAPIParameter({ ...listAPIParameter, search: e.target.value, @@ -299,6 +300,7 @@ const extractConnectionFields = (item: IConnectionList) => { /> Date: Mon, 27 Jan 2025 15:55:47 +0530 Subject: [PATCH 10/11] chore: did domain related changes in yml file Signed-off-by: bhavanakarwade --- .github/workflows/deploy-qa.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-qa.yml b/.github/workflows/deploy-qa.yml index a9ca4a4d7..3e4be1a81 100644 --- a/.github/workflows/deploy-qa.yml +++ b/.github/workflows/deploy-qa.yml @@ -52,15 +52,15 @@ jobs: echo "PUBLIC_POLYGON_TESTNET_URL=https://rpc-amoy.polygon.technology" >> .env - echo "PUBLIC_ECOSYSTEM_FRONT_END_URL=https://qa-ecosystem.credebl.id" >> .env + echo "PUBLIC_ECOSYSTEM_FRONT_END_URL=https://qa-ecosystem.sovio.id" >> .env - echo "PUBLIC_CREDEBL_FRONT_END_URL=https://qa.credebl.id" >> .env + echo "PUBLIC_CREDEBL_FRONT_END_URL=https://qa.sovio.id" >> .env echo "PUBLIC_ECOSYSTEM_BASE_URL=${{ secrets.QA_PUBLIC_ECOSYSTEM_BASE_URL }}" >> .env echo "PUBLIC_PLATFORM_DISCORD_URL=https://discord.gg/w4hnQT7NJG" >> .env - echo "PUBLIC_REDIRECTION_TARGET_URL=https://social-share.credebl.id" >> .env + echo "PUBLIC_REDIRECTION_TARGET_URL=https://social-share.sovio.id" >> .env echo "PUBLIC_CRYPTO_PRIVATE_KEY=${{ secrets.QA_PUBLIC_CRYPTO_PRIVATE_KEY }}" >> .env @@ -68,7 +68,7 @@ jobs: echo "PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET=${{ secrets.QA_PUBLIC_KEYCLOAK_MANAGEMENT_CLIENT_SECRET }}" >> .env - echo "PUBLIC_REDIRECT_FROM_URL=https://qa.credebl.id" >> .env + echo "PUBLIC_REDIRECT_FROM_URL=https://qa.sovio.id" >> .env - name: Build step run: npm install && npm run build # 📝 Update the build command(s) From fc9b808b6e8341e7bce9797392e141633b85bc05 Mon Sep 17 00:00:00 2001 From: bhavanakarwade Date: Mon, 27 Jan 2025 16:07:35 +0530 Subject: [PATCH 11/11] fix: added roles for orglist Signed-off-by: bhavanakarwade --- .../organization/OrganizationsList.tsx | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/components/organization/OrganizationsList.tsx b/src/components/organization/OrganizationsList.tsx index 26a3f0625..058fdb46d 100644 --- a/src/components/organization/OrganizationsList.tsx +++ b/src/components/organization/OrganizationsList.tsx @@ -174,6 +174,30 @@ const OrganizationsList = () => {

{org?.description}

+
+
    +
  • +
    +
    + Role(s): + {org.roles && + org.roles.length > 0 && + org.roles.map((role: string, index: number) => { + return ( + + {role.charAt(0).toUpperCase() + + role.slice(1)} + + ); + })} +
    +
    +
    • +
+