merge main

Author: Francesca-Bit

.github/workflows/ci.yml

@@ -23,6 +23,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
@@ -42,3 +48,4 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64

package-lock.json

@@ -37,11 +37,9 @@
     "graphql": "^16.6.0",
     "graphql-tag": "^2.12.6",
     "http-proxy-middleware": "^2.0.6",
-    "i": "^0.3.7",
     "morgan": "~1.9.1",
     "npm": "^9.8.0",
-    "swagger-ui-express": "^4.5.0",
-    "uuid": "^9.0.0"
+    "swagger-ui-express": "^4.5.0"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.3",

package.json

@@ -8,8 +8,9 @@ import * as settings from './settings'
 
 import dbSchema from '../../change_request_schema.json'
 import { doc } from "@terminusdb/terminusdb-client/dist/typescript/lib/woql"
-//import {v4 as uuidv4} from 'uuid';
-const { v4: uuidv4 } = require('uuid');
+
+const crypto = require('node:crypto');
+
 class ChangeRequestDB {
   client: WOQLClient;
   request : Request
@@ -103,7 +104,7 @@ class ChangeRequestDB {
         original_branch: originalBranch,
         creator: creator,
         // we autogenerate the branchName
-        tracking_branch : uuidv4(),
+        tracking_branch : crypto.randomUUID(),
         origin_commit_id : lastStartBranchCommitID,
         creator_email: this.request.body.author || creator,
         creation_time: timestamp,