Merge pull request #484 from IntersectMBO:fix/dev-staging-0412

fix/dev-staging-0412
IntersectMBO · Dec 4, 2024 · 63c9f33 · 63c9f33
2 parents 02b1284 + e0629e7
commit 63c9f33
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 66 deletions.
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -160,6 +160,14 @@ jobs:
           rm -rf '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'
           docker push ${{ steps.image_lowercase.outputs.lowercase }}:${{ env.TAG }}
 
+      - name: Add tag as a PR comment
+        uses: ubie-oss/[email protected]
+        id: comment-to-merged-pr
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          message: |-
+            This PR is in the tag: ${{ env.TAG }} , for ${{ matrix.name }} service
+
       - name: Deploy with Qovery
         if: github.ref == 'refs/heads/develop'
         env:

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -117,22 +117,20 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
           outputs: type=docker,dest=/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar
           build-args: |
-            NEXT_PUBLIC_API_URL=${{ secrets.QA_NEXT_PUBLIC_API_URL }}
-            NEXT_PUBLIC_USERSNAP_SPACE_API_KEY=${{ secrets.QA_NEXT_PUBLIC_USERSNAP_SPACE_API_KEY }}
-            NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY=${{ secrets.QA_NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY }}
-            NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS=${{ secrets.QA_NEXT_PUBLIC_HIDDEN_USERSNAP_PROJECT_IDS }}
-            NEXT_PUBLIC_IS_MAINNET=${{ secrets.QA_NEXT_PUBLIC_IS_MAINNET }}
-
+            NEXT_PUBLIC_API_URL=${{ secrets.DEV_NEXT_PUBLIC_API_URL }}
+            NEXT_PUBLIC_USERSNAP_GLOBAL_API_KEY=${{ secrets.DEV_NEXT_PUBLIC_USERSNAP_GLOBAL_API_KEY }}
+            NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY=${{ secrets.DEV_NEXT_PUBLIC_USERSNAP_PROJECT_API_KEY }}
+          
       - name: Scan Docker image with Dockle
         id: dockle
         run: |
-          wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
-          tar zxf dockle_0.4.14_Linux-64bit.tar.gz
-          sudo mv dockle /usr/local/bin
+            wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
+            tar zxf dockle_0.4.14_Linux-64bit.tar.gz
+            sudo mv dockle /usr/local/bin
 
-          dockle --exit-code 1 --exit-level fatal --format json --input '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
-          rm -rf '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar'
-          cat ${{ matrix.workdir }}/dockle_scan_output.json
+            dockle --exit-code 1 --exit-level fatal --format json --input '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
+            rm -rf '/tmp/image-${{ matrix.name }}-${{ github.sha }}-pr.tar'
+            cat ${{ matrix.workdir }}/dockle_scan_output.json
 
           echo "outcome=success" >> $GITHUB_OUTPUT
 

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
@@ -15,9 +15,11 @@
     "title": "Interim Constitution",
     "drawer": {
       "compare": "Compare",
-      "latestRevisions": "Latest Revisions",
-      "tableOfContents": "Content",
-      "latest": "Latest"
+      "versionHistory": "Version History",
+      "tableOfContents": "Contents",
+      "latest": "Latest",
+      "uploadNewVersion": "Upload new version",
+      "backToContents": "Back to contents"
     }
   },
   "Members": {

diff --git a/frontend/src/components/organisms/Constitution/ConstitutionSidebar.tsx b/frontend/src/components/organisms/Constitution/ConstitutionSidebar.tsx
diff --git a/frontend/src/components/organisms/Constitution/TOCAccordion.tsx b/frontend/src/components/organisms/Constitution/TOCAccordion.tsx
@@ -4,7 +4,7 @@ import {
   Accordion,
   AccordionDetails,
   AccordionSummary,
-  Box
+  Box,
 } from "@mui/material";
 import { Children, useEffect, useState } from "react";
 import { TocNested } from "./TOCNested";
@@ -35,9 +35,9 @@ export const TocAccordion = ({ children }) => {
               sx={{
                 boxShadow: "none",
                 "&:before": {
-                  display: "none"
+                  display: "none",
                 },
-                width: "100%"
+                width: "100%",
               }}
               disableGutters
             >
@@ -49,9 +49,9 @@ export const TocAccordion = ({ children }) => {
                   padding: 0,
                   "& a": {
                     "&:active": {
-                      pointerEvents: "none" // disables the href activation on click but keep tooltip showing
-                    }
-                  }
+                      pointerEvents: "none", // disables the href activation on click but keep tooltip showing
+                    },
+                  },
                 }}
               >
                 {child.props.children[0]}
@@ -69,9 +69,9 @@ export const TocAccordion = ({ children }) => {
                       minHeight: "56px",
                       margin: "0",
                       "&:a": {
-                        margin: "auto"
-                      }
-                    }
+                        margin: "auto",
+                      },
+                    },
                   }}
                 >
                   {Array.isArray(child.props.children[1]?.props.children)
@@ -98,8 +98,8 @@ export const TocAccordion = ({ children }) => {
 
                 "& li": {
                   display: "flex",
-                  alignItems: "center"
-                }
+                  alignItems: "center",
+                },
               }}
             >
               {child}
@@ -111,8 +111,8 @@ export const TocAccordion = ({ children }) => {
                 padding: 0,
                 height: "56px",
                 "& li": {
-                  minHeight: "56px"
-                }
+                  minHeight: "56px",
+                },
               }}
             >
               {child}

diff --git a/frontend/src/components/organisms/VotesTable/VotesTableRow.tsx b/frontend/src/components/organisms/VotesTable/VotesTableRow.tsx
@@ -19,7 +19,7 @@ export const VotesTableRow = ({
   votes,
   disabled,
   actionTitle,
-  onActionClick,
+  onActionClick
 }: Props) => {
   const t = useTranslations("LatestUpdates");
   const {

diff --git a/ipfs-service/src/app.service.ts b/ipfs-service/src/app.service.ts
@@ -53,7 +53,6 @@ const libp2pOptions = {
     ],
   },
   transports: [
-    circuitRelayTransport({ discoverRelays: 1 }),
     tcp(),
     webSockets(),
   ],
@@ -80,21 +79,13 @@ const libp2pOptions = {
       createDelegatedRoutingV1HttpApiClient('https://delegated-ipfs.dev'),
     dht: kadDHT({
       clientMode: false,
-      initialQuerySelfInterval: 1000,
-      kBucketSize: 20,
       protocol: '/ipfs/kad/1.0.0',
-      maxInboundStreams: 32,
-      maxOutboundStreams: 64,
       validators: { ipns: ipnsValidator },
       selectors: { ipns: ipnsSelector },
     }),
     identify: identify(),
     keychain: keychain(),
     ping: ping(),
-    relay: circuitRelayServer({
-      advertise: true,
-      hopTimeout: 60000,
-    }),
     upnp: uPnPNAT(),
   },
 };