@procivis/one-react-native-components 0.3.47 → 0.3.50

package/src/utils/hooks/core/trust-entity.ts

@@ -1,5 +1,6 @@
 import {
   CreateRemoteTrustEntityRequest,
+  IdentifierTypeEnum,
   ONECore,
   OneError,
   TrustAnchor,
@@ -58,20 +59,29 @@ export const useTrustEntity = (identifierId: string | undefined) => {
 
   return useQuery(
     [TRUST_ENTITY_DETAIL_QUERY_KEY, identifierId],
-    () => identifierId && identifierDetail
-        ? core.resolveTrustEntityByIdentifier({
-          identifiers: [{
-            certificateId: identifierDetail.type === 'CERTIFICATE' ? identifierDetail.certificates?.[0]?.id : undefined,
-            id: identifierId,
-          }],
-        }).then((result) => {
-          return result[identifierId];
-        }).catch((e) => {
-          if (e instanceof OneError && e.code === OneErrorCode.NoTrustEntityFound) {
-            return null;
-          }
-          throw e;
-        })
+    () =>
+      identifierId && identifierDetail
+        ? core
+            .resolveTrustEntityByIdentifier({
+              identifiers: [
+                {
+                  certificateId:
+                    identifierDetail?.type === IdentifierTypeEnum.CERTIFICATE
+                      ? identifierDetail.certificates?.[0]?.id
+                      : undefined,
+                  id: identifierId,
+                },
+              ],
+            })
+            .then((result) => {
+              return result[identifierId]?.[0]?.trustEntity ?? null;
+            })
+            .catch((e) => {
+              if (e instanceof OneError && e.code === OneErrorCode.NoTrustEntityFound) {
+                return null;
+              }
+              throw e;
+            })
         : undefined,
     {
       enabled: Boolean(identifierDetail),
@@ -99,51 +109,57 @@ export const useCreateRemoteTrustEntity = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(async (request: Omit<CreateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string, didId?: string }) => {
-    const { identifierId, didId } = request
+  return useMutation(
+    async (request: Omit<CreateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string; didId?: string }) => {
+      const { identifierId, didId } = request;
 
-    let entityDidId = didId;
+      let entityDidId = didId;
 
-    if (identifierId) {
-      const identifierDetail = await core.getIdentifier(identifierId);
-      entityDidId = identifierDetail?.did?.id;
-    }
+      if (identifierId) {
+        const identifierDetail = await core.getIdentifier(identifierId);
+        entityDidId = identifierDetail?.did?.id;
+      }
 
-    return core.createRemoteTrustEntity({
-      ...request,
-      didId: entityDidId!,
-    })
-  }, {
-    onSuccess: async () => {
-      await queryClient.invalidateQueries(REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY);
-      await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
+      return core.createRemoteTrustEntity({
+        ...request,
+        didId: entityDidId!,
+      });
     },
-  });
+    {
+      onSuccess: async () => {
+        await queryClient.invalidateQueries(REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY);
+        await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
+      },
+    },
+  );
 };
 
 export const useUpdateRemoteTrustEntity = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(async (request: Omit<UpdateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string, didId?: string }) => {
-    const { identifierId, didId } = request
-
-    let entityDidId = didId;
-    if (identifierId) {
-      const identifierDetail = await core.getIdentifier(identifierId);
-      entityDidId = identifierDetail?.did?.id;
-    }
-
-    return core.updateRemoteTrustEntity({
-      ...request,
-      didId: entityDidId!,
-    })
-  }, {
-    onSuccess: async () => {
-      await queryClient.invalidateQueries(REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY);
-      await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
+  return useMutation(
+    async (request: Omit<UpdateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string; didId?: string }) => {
+      const { identifierId, didId } = request;
+
+      let entityDidId = didId;
+      if (identifierId) {
+        const identifierDetail = await core.getIdentifier(identifierId);
+        entityDidId = identifierDetail?.did?.id;
+      }
+
+      return core.updateRemoteTrustEntity({
+        ...request,
+        didId: entityDidId!,
+      });
     },
-  });
+    {
+      onSuccess: async () => {
+        await queryClient.invalidateQueries(REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY);
+        await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
+      },
+    },
+  );
 };
 
 export enum TrustManagementEnum {

package/src/utils/parsers/credential.ts

@@ -91,7 +91,8 @@ export const cardHeaderFromCredential = (
   testID: string,
   labels: CardHeaderLabels,
 ): Omit<CredentialHeaderProps, 'style'> => {
-  let credentialDetailPrimary = formatDateTimeLocalized(new Date(credential.issuanceDate)) ?? '';
+  let credentialDetailPrimary =
+    formatDateTimeLocalized(new Date(credential.issuanceDate ?? credential.createdDate)) ?? '';
 
   let credentialDetailSecondary: string | undefined;
   let credentialDetailErrorColor: boolean | undefined;

package/src/utils/parsers/query.ts

@@ -0,0 +1,149 @@
+import {
+  CredentialListQuery,
+  CredentialSchemaListQuery,
+  DidListQuery,
+  HistoryListQuery,
+  IdentifierListQuery,
+  ProofListQuery,
+  ProofSchemaListQuery,
+} from '@procivis/react-native-one-core';
+
+type QueryKey<ListQuery, ParamList> = ParamList extends ReadonlyArray<keyof ListQuery> // all params are inside the ListQuery
+  ? keyof ListQuery extends ParamList[number] // all ListQuery fields are in the params
+    ? Array<ListQuery[keyof ListQuery]>
+    : void
+  : void; // otherwise produce a wrong return type which should trigger compilation error
+
+/** Typecheck that all query params are included in the query key */
+function getQueryKey<ListQuery extends {}, ParamList extends ReadonlyArray<keyof ListQuery>>(
+  queryParams: ListQuery,
+  params: ParamList,
+): QueryKey<ListQuery, ParamList> {
+  return params.map((param) => queryParams[param]) as QueryKey<ListQuery, ParamList>;
+}
+
+export const getQueryKeyFromCredentialListQueryParams = (queryParams: Partial<CredentialListQuery> = {}) => {
+  return getQueryKey(queryParams, [
+    'page',
+    'pageSize',
+    'organisationId',
+    'name',
+    'searchText',
+    'searchType',
+    'sort',
+    'sortDirection',
+    'exact',
+    'role',
+    'ids',
+    'status',
+    'include',
+    'profile',
+  ]);
+};
+
+export const getQueryKeyFromHistoryListQueryParams = (queryParams: Partial<HistoryListQuery> = {}) => {
+  return getQueryKey(queryParams, [
+    'page',
+    'pageSize',
+    'organisationId',
+    'entityId',
+    'actions',
+    'entityTypes',
+    'createdDateFrom',
+    'createdDateTo',
+    'identifierId',
+    'credentialId',
+    'credentialSchemaId',
+    'proofSchemaId',
+    'searchText',
+    'searchType',
+  ]);
+};
+
+export const getQueryKeyFromCredentialSchemaListQueryParams = (
+  queryParams: Partial<CredentialSchemaListQuery> = {},
+) => {
+  return getQueryKey(queryParams, [
+    'page',
+    'pageSize',
+    'organisationId',
+    'name',
+    'sort',
+    'sortDirection',
+    'exact',
+    'ids',
+    'include',
+    'schemaId',
+    'formats',
+  ]);
+};
+
+export const getQueryKeyFromProofSchemaListQueryParams = (queryParams: Partial<ProofSchemaListQuery> = {}) => {
+  return getQueryKey(queryParams, [
+    'page',
+    'pageSize',
+    'organisationId',
+    'name',
+    'sort',
+    'sortDirection',
+    'exact',
+    'ids',
+    'formats',
+  ]);
+};
+
+export const getQueryKeyFromProofListQueryParams = (queryParams: Partial<ProofListQuery> = {}) => {
+  return getQueryKey(queryParams, [
+    'page',
+    'pageSize',
+    'organisationId',
+    'sort',
+    'sortDirection',
+    'name',
+    'ids',
+    'proofStates',
+    'proofRoles',
+    'proofSchemaIds',
+    'exact',
+    'profile',
+  ]);
+};
+
+export const getQueryKeyFromDidListQueryParams = (queryParams: Partial<DidListQuery> = {}) => {
+  return getQueryKey(queryParams, [
+    'page',
+    'pageSize',
+    'organisationId',
+    'sort',
+    'sortDirection',
+    'name',
+    'did',
+    'type',
+    'deactivated',
+    'exact',
+    'keyAlgorithms',
+    'keyRoles',
+    'keyStorages',
+    'keyIds',
+    'didMethods',
+  ]);
+};
+
+export const getQueryKeyFromIdentifierListQueryParams = (queryParams: Partial<IdentifierListQuery> = {}) => {
+  return getQueryKey(queryParams, [
+    'page',
+    'pageSize',
+    'organisationId',
+    'sort',
+    'sortDirection',
+    'name',
+    'types',
+    'state',
+    'exact',
+    'didMethods',
+    'isRemote',
+    'keyAlgorithms',
+    'keyRoles',
+    'keyStorages',
+  ]);
+};

package/src/utils/parsers/query.tsx

@@ -1,92 +0,0 @@
-import {
-  CredentialListQuery,
-  CredentialSchemaListQuery,
-  DidListQuery,
-  HistoryListQuery,
-  IdentifierListQuery,
-  ProofListQuery,
-  ProofSchemaListQuery,
-} from '@procivis/react-native-one-core';
-
-export const getQueryKeyFromCredentialListQueryParams = (queryParams?: Partial<CredentialListQuery>) => {
-  if (!queryParams) {
-    return [];
-  }
-  const { name, sort, sortDirection, exact, role, ids, status, include } = queryParams;
-  return [name, sort, sortDirection, exact, role, ids, status, include];
-};
-
-export const getQueryKeyFromHistoryListQueryParams = (queryParams?: Partial<HistoryListQuery>) => {
-  if (!queryParams) {
-    return [];
-  }
-
-  const {
-    entityId,
-    actions,
-    entityTypes,
-    createdDateFrom,
-    createdDateTo,
-    identifierId,
-    credentialId,
-    credentialSchemaId,
-    searchText,
-    searchType,
-    proofSchemaId,
-  } = queryParams;
-  return [
-    entityId,
-    actions,
-    entityTypes,
-    createdDateFrom,
-    createdDateTo,
-    identifierId,
-    credentialId,
-    credentialSchemaId,
-    searchText,
-    searchType,
-    proofSchemaId,
-  ];
-};
-
-export const getQueryKeyFromCredentialSchemaListQueryParams = (queryParams?: Partial<CredentialSchemaListQuery>) => {
-  if (!queryParams) {
-    return [];
-  }
-  const { name, sort, sortDirection, exact, ids, include } = queryParams;
-  return [name, sort, sortDirection, exact, ids, include];
-};
-
-export const getQueryKeyFromProofSchemaListQueryParams = (queryParams?: Partial<ProofSchemaListQuery>) => {
-  if (!queryParams) {
-    return [];
-  }
-  const { name, sort, sortDirection, exact, ids } = queryParams;
-  return [name, sort, sortDirection, exact, ids];
-};
-
-export const getQueryKeyFromProofListQueryParams = (queryParams?: Partial<ProofListQuery>) => {
-  if (!queryParams) {
-    return [];
-  }
-  const { name, sort, sortDirection, exact, ids, proofStates, proofSchemaIds } = queryParams;
-  return [name, sort, sortDirection, exact, ids, proofStates, proofSchemaIds];
-};
-
-export const getQueryKeyFromDidListQueryParams = (queryParams?: Partial<DidListQuery>) => {
-  if (!queryParams) {
-    return [];
-  }
-
-  const { name, did, type, deactivated, keyAlgorithms, keyRoles } = queryParams;
-  return [name, did, type, deactivated, keyAlgorithms, keyRoles];
-};
-
-export const getQueryKeyFromIdentifierListQueryParams = (queryParams?: Partial<IdentifierListQuery>) => {
-  if (!queryParams) {
-    return [];
-  }
-
-  const { isRemote, didMethods, state, keyStorages, keyAlgorithms, exact, keyRoles, types, name } = queryParams;
-  return [name, types, state, isRemote, didMethods, keyStorages, keyAlgorithms, exact, keyRoles];
-};