Merge pull request 'legacy_preprod' (#11) from legacy_preprod into main

Reviewed-on: #11

.github/workflows/demo.yml

@@ -0,0 +1,76 @@
+name: Demo - Build & Deploy to Scaleway
+
+on:
+    push:
+        - [legacy_dev]
+
+env:
+    PROJECT_ID_LECOFFRE: 72d08499-37c2-412b-877e-f8af0471654a
+    NAMESPACE_ID_LECOFFRE: c992c042-bdb6-4974-becf-aa5039b9ec58
+    CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffredemovts5gdxg
+
+    IMAGE_NAME: front
+    CONTAINER_NAME: front
+
+jobs:
+    build-and-push-image-lecoffre:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                ref: cicd
+            - name: Setup SSH
+              run: |
+                  mkdir -p ~/.ssh
+                  echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+                  chmod 600 ~/.ssh/id_rsa
+                  ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+              env:
+                  SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+            - name: Copy SSH
+              run: cp ~/.ssh/id_rsa id_rsa
+            - name: Login to Scaleway Container Registry
+              uses: docker/login-action@v3
+              with:
+                  username: nologin
+                  password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+                  registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
+            - name: Build the Docker Image
+              run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+            - name: Push the Docker Image to Scaleway Container Registry
+              run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+    deploy-to-scaleway-lecoffre:
+        needs: build-and-push-image-lecoffre
+        runs-on: ubuntu-latest
+        environment: demo
+        steps:
+            - name: Install CLI
+              uses: scaleway/action-scw@v0
+            - name: Get container ID
+              run: |
+                  echo "CONTAINER_ID=$(scw container container list namespace-id=${{env.NAMESPACE_ID_LECOFFRE}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV
+              env:
+                  SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+                  SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+                  SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+                  SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
+            - name: Deploy the container based on the new image
+              run: |
+                  env_string=""
+                  while IFS= read -r line; do
+                    if [[ "$line" == *"="* ]]; then
+                      key=$(echo "$line" | cut -d '=' -f 1)
+                      value=$(echo "$line" | cut -d '=' -f 2-)
+                      if [[ -n "$key" ]]; then
+                        env_string+="environment-variables.$key=$value "
+                      fi
+                    fi
+                  done <<< "$ENV_VARS"
+                  env_string=$(echo $env_string | sed 's/ $//')
+                  scw container container update ${{ env.CONTAINER_ID }} $env_string
+              env:
+                  ENV_VARS: ${{ secrets.ENV }}
+                  SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+                  SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+                  SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+                  SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}

.github/workflows/prd.yml

@@ -1,8 +1,8 @@
 name: Prod - Build & Deploy to Scaleway
 
 on:
-  push:
-    branches: [main]
+    push:
+        branches: [main]
 
 env:
   
@@ -18,16 +18,16 @@ jobs:
       runs-on: ubuntu-latest
       steps:
         - uses: actions/checkout@v4
-        - name: Setup SSH
-          run: |
-            mkdir -p ~/.ssh
-            echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-            chmod 600 ~/.ssh/id_rsa
-            ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
-          env:
-            SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-        - name: Copy SSH
-          run: cp ~/.ssh/id_rsa id_rsa
+        #- name: Setup SSH
+        #  run: |
+        #    mkdir -p ~/.ssh
+        #    echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+        #    chmod 600 ~/.ssh/id_rsa
+        #    ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+        #  env:
+        #    SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        #- name: Copy SSH
+        #  run: cp ~/.ssh/id_rsa id_rsa
         - name: Login to Scaleway Container Registry
           uses: docker/login-action@v3
           with:

.github/workflows/test.yml

@@ -0,0 +1,78 @@
+name: Test - Build & Deploy to Scaleway
+
+on:
+  push:
+    branches: [test]
+
+env:  
+  PROJECT_ID_LECOFFRE: 72d08499-37c2-412b-877e-f8af0471654a
+  NAMESPACE_ID_LECOFFRE: e2036b1d-b5c1-4cdd-b168-d895c498f679
+  CONTAINER_REGISTRY_ENDPOINT_LECOFFRE: rg.fr-par.scw.cloud/funcscwlecoffretestfhhn6rcl
+  
+  IMAGE_NAME: front
+  CONTAINER_NAME: front
+
+jobs:
+  build-and-push-image-lecoffre:
+      runs-on: ubuntu-latest
+      steps:
+        - uses: actions/checkout@v4
+        - name: Setup SSH
+          run: |
+            mkdir -p ~/.ssh
+            echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+            chmod 600 ~/.ssh/id_rsa
+            ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts
+          env:
+            SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+        - name: Copy SSH
+          run: cp ~/.ssh/id_rsa id_rsa
+        - name: Login to Scaleway Container Registry
+          uses: docker/login-action@v3
+          with:
+            username: nologin
+            password: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+            registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}
+        - name: Get Git Commit SHA
+          id: vars
+          run: echo "COMMIT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        - name: Build the Docker Image
+          run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+        - name: Push the Docker Image to Scaleway Container Registry
+          run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT_LECOFFRE }}/${{ env.IMAGE_NAME }}
+  deploy-to-scaleway-lecoffre:
+    needs: build-and-push-image-lecoffre
+    runs-on: ubuntu-latest
+    environment: preprod
+    steps:
+      - name: Install CLI
+        uses: scaleway/action-scw@v0
+      - name: Get container ID
+        run: |
+          echo "CONTAINER_ID=$(scw container container list namespace-id=${{env.NAMESPACE_ID_LECOFFRE}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV
+        env:
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
+      - name: Deploy the container based on the new image
+        run: |
+            env_string=""
+            while IFS= read -r line; do
+              if [[ "$line" == *"="* ]]; then
+                key=$(echo "$line" | cut -d '=' -f 1)
+                value=$(echo "$line" | cut -d '=' -f 2-)
+                if [[ -n "$key" ]]; then
+                  env_string+="environment-variables.$key=$value "
+                fi
+              fi
+            done <<< "$ENV_VARS"
+            env_string=$(echo $env_string | sed 's/ $//')
+            scw container container update ${{ env.CONTAINER_ID }} $env_string       
+        env:
+          ENV_VARS: ${{ secrets.ENV }}
+          SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY_LECOFFRE }}
+          SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY_LECOFFRE }}
+          SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID_LECOFFRE }}
+          SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID_LECOFFRE }}
+        

Dockerfile

@@ -7,10 +7,10 @@ COPY package.json ./
 
 RUN apk update && apk add openssh-client git
 
-COPY id_rsa /root/.ssh/id_rsa
-RUN chmod 600 ~/.ssh/id_rsa
-RUN eval "$(ssh-agent -s)" && ssh-add /root/.ssh/id_rsa
-RUN ssh-keyscan github.com smart-chain-fr/leCoffre-resources.git >> /root/.ssh/known_hosts
+#COPY id_rsa /root/.ssh/id_rsa
+#RUN chmod 600 ~/.ssh/id_rsa
+#RUN eval "$(ssh-agent -s)" && ssh-add /root/.ssh/id_rsa
+#RUN ssh-keyscan github.com smart-chain-fr/leCoffre-resources.git >> /root/.ssh/known_hosts
 
 RUN npm install --frozen-lockfile
 

package.json

@@ -30,7 +30,7 @@
 		"heroicons": "^2.1.5",
 		"jszip": "^3.10.1",
 		"jwt-decode": "^3.1.2",
-		"le-coffre-resources": "git@github.com:smart-chain-fr/leCoffre-resources.git#v2.167",
+		"le-coffre-resources": "git+https://git.4nkweb.com/4nk/lecoffre-ressources.git#v2.167",
 		"next": "^14.2.3",
 		"prettier": "^2.8.7",
 		"react": "18.2.0",

src/front/Components/Layouts/Folder/FolderInformation/ClientView/DocumentTables/index.tsx

@@ -313,10 +313,11 @@ export default function DocumentTables(props: IProps) {
 	);
 
 	const progress = useMemo(() => {
-		const total = askedDocuments.length + toValidateDocuments.length + validatedDocuments.length + refusedDocuments.length;
+		// Exclude refused documents from total - only count documents that are still in progress
+		const total = askedDocuments.length + toValidateDocuments.length + validatedDocuments.length;
 		if (total === 0) return 0;
 		return (validatedDocuments.length / total) * 100;
-	}, [askedDocuments.length, refusedDocuments.length, toValidateDocuments.length, validatedDocuments.length]);
+	}, [askedDocuments.length, toValidateDocuments.length, validatedDocuments.length]);
 
 	if (documents.length === 0 && documentsNotary.length === 0) return <NoDocument />;
 

src/front/Components/Layouts/Folder/FolderInformation/index.tsx

@@ -47,8 +47,10 @@ export default function FolderInformation(props: IProps) {
 		let validatedDocuments = 0;
 		folder?.customers?.forEach((customer) => {
 			const documents = customer.documents;
-			total += documents?.length ?? 0;
-			validatedDocuments += documents?.filter((document) => document.document_status === EDocumentStatus.VALIDATED).length ?? 0;
+			// Only count documents that are not refused (still in progress)
+			const activeDocuments = documents?.filter((document) => document.document_status !== EDocumentStatus.REFUSED) ?? [];
+			total += activeDocuments.length;
+			validatedDocuments += activeDocuments.filter((document) => document.document_status === EDocumentStatus.VALIDATED).length;
 		});
 		if (total === 0) return 0;
 		const percentage = (validatedDocuments / total) * 100;

src/front/Components/Layouts/Login/StepEmail/index.tsx

@@ -83,7 +83,7 @@ export default function StepEmail(props: IProps) {
 			<div className={classes["content"]}>
 				<div className={classes["section"]}>
 					<Typography typo={ETypo.TITLE_H6} color={ETypoColor.TEXT_ACCENT} className={classes["section-title"]}>
-						Pour les notaires et les colaborateurs :
+						Pour les notaires et les collaborateurs :
 					</Typography>
 					<Button onClick={redirectUserOnConnection} rightIcon={<Image alt="id-not-logo" src={idNoteLogo} />}>
 						S'identifier avec ID.not