CryptedData: use id provided by api

Author: johannesloetzsch

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fw-processing",
-  "version": "0.0.1",
+  "version": "0.2.4",
   "packageManager": "pnpm@7.15.0",
   "private": true,
   "scripts": {

packages/import/features/Import.tsx

@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 
 import { useAppSelector, useAppDispatch, setRowData } from 'state';
-import { selectJsonSchema, selectCryptedData, setCryptedData, selectUiSchema, setJsonSchema, setUiSchema } from 'project-state';
+import { selectJsonSchema, selectCryptedData, setCryptedData, selectUiSchema, setJsonSchema, setUiSchema, CryptedData } from 'project-state';
 import { PGPProvider, decryptUsingContext } from 'pgp-provider';
 import { api } from '@formswizard/api';
 
@@ -30,12 +30,13 @@ export function DecryptAndImportLastNewSubmission() {
 
   /** TODO: Delete decrypted dataset after import and loop over submissions **/
 
-  const { data, uuid, keyId, armoredPublicKey } = cryptedData[cryptedData.length-1] || {};
+  const cryptedDatum = cryptedData[cryptedData.length-1] || {} as CryptedData;
+  const { id, data, keyId, armoredPublicKey } = cryptedDatum
   const decrypted_str = decryptUsingContext(data);
   const decrypted = decrypted_str && JSON.parse(decrypted_str);
 
   useEffect( () => {
-    const row = { ...decrypted, id: uuid, uuid, keyId, armoredPublicKey }
+    const row = { ...decrypted, id, keyId, armoredPublicKey }
     decrypted && dispatch(setRowData({row}));
   }, [decrypted]);
 

packages/import/package.json

@@ -1,6 +1,6 @@
 {
   "name": "import",
-  "version": "0.0.0",
+  "version": "0.2.4",
   "license": "MIT",
   "scripts": {
     "lint": "eslint \"**/*.ts*\"",
@@ -17,7 +17,7 @@
     "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@formswizard/api": "^0.2.1",
+    "@formswizard/api": "^0.2.4",
     "@types/react": "^18.2.21",
     "pgp-provider": "workspace:*",
     "project-state": "workspace:*",

packages/project-state/features/slices/cryptedDataSlice.ts

@@ -2,13 +2,12 @@ import { createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { RootState } from "../state/store";
 
 type ArmoredPGPMessage = string;
-type UUID = string;
 type PGPID = string;
 type ArmoredPubKey = string;
 
 export interface CryptedData {
   data: ArmoredPGPMessage
-  uuid: UUID,
+  id: string,
   keyId: PGPID,
   armoredPublicKey: ArmoredPubKey
 }