fix error upload img

This commit is contained in:
Jean Andreani
2024-05-15 12:45:46 +00:00
parent 16bfbfd4da
commit e5bc6323a3
8 changed files with 26 additions and 17 deletions

View File

@@ -24,21 +24,21 @@ cache:
install: install:
stage: Install stage: Install
image: node:21.7.2 image: node:20.9.0
script: script:
- yarn install - yarn install
- ls node_modules/.bin/cypress - ls node_modules/.bin/cypress
test:unit: test:unit:
stage: Test stage: Test
image: node:21.7.2 image: node:20.9.0-alpine
script: script:
- yarn test:unit - yarn test:unit
coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/ coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
test:e2e: test:e2e:
stage: Test stage: Test
image: node:21.7.2-alpine image: node:20.9.0-alpine
services: services:
- docker:dind - docker:dind
script: script:
@@ -57,7 +57,7 @@ test:e2e:
deploy: deploy:
stage: Deploy stage: Deploy
image: node:21.7.2 image: node:20.9.0
cache: cache:
paths: paths:
- node_modules - node_modules

View File

@@ -2,7 +2,7 @@
#- Build image #- Build image
#- #-
FROM node:21.7.2-alpine AS build FROM node:20.9.0-alpine AS build
WORKDIR /opt/geovisio WORKDIR /opt/geovisio

View File

@@ -1,7 +1,7 @@
# Docker-compose used in gitlab-ci to run a container having access to all the other containers # Docker-compose used in gitlab-ci to run a container having access to all the other containers
services: services:
web: web:
image: node:21.7.2-alpine image: node:20.9.0-alpine
volumes: volumes:
- $PROJECT_DIR:/src - $PROJECT_DIR:/src
working_dir: /src working_dir: /src

View File

@@ -2,7 +2,7 @@
"name": "geovisio-website", "name": "geovisio-website",
"version": "2.6.1", "version": "2.6.1",
"engines": { "engines": {
"node": "21" "node": "20.9.0"
}, },
"private": true, "private": true,
"scripts": { "scripts": {

View File

@@ -185,6 +185,7 @@
"cancel_message": "⚠️ Please note, the download will be interrupted if you validate and the sequence will be deleted.", "cancel_message": "⚠️ Please note, the download will be interrupted if you validate and the sequence will be deleted.",
"sequence_title": "Sequence ", "sequence_title": "Sequence ",
"error_upload": "Sequence creation error", "error_upload": "Sequence creation error",
"error_upload_img": "An error has occurred",
"import": "Uploads", "import": "Uploads",
"upload_pending": "Upload in progress…", "upload_pending": "Upload in progress…",
"images_count_text": "Pictures uploaded", "images_count_text": "Pictures uploaded",

View File

@@ -185,6 +185,7 @@
"cancel_message": "⚠️ Attention, le téléchargement sera interrompu si vous validez et la séquence sera supprimée.", "cancel_message": "⚠️ Attention, le téléchargement sera interrompu si vous validez et la séquence sera supprimée.",
"sequence_title": "Séquence du ", "sequence_title": "Séquence du ",
"error_upload": "Erreur de création de la séquence", "error_upload": "Erreur de création de la séquence",
"error_upload_img": "Une erreur est survenue",
"import": "Imports", "import": "Imports",
"upload_pending": "Transfert en cours…", "upload_pending": "Transfert en cours…",
"images_count_text": "Images chargées", "images_count_text": "Images chargées",

View File

@@ -184,6 +184,7 @@
"cancel_message": "⚠️ Felhívjuk figyelmét, hogy a letöltés megszakad, ha érvényesíti, és a sorozat törlődik.", "cancel_message": "⚠️ Felhívjuk figyelmét, hogy a letöltés megszakad, ha érvényesíti, és a sorozat törlődik.",
"sequence_title": "Sorozat ", "sequence_title": "Sorozat ",
"error_upload": "Sorozat létrehozási hiba", "error_upload": "Sorozat létrehozási hiba",
"error_upload_img": "Hiba történt",
"import": "Feltöltések", "import": "Feltöltések",
"upload_pending": "Feltöltés folyamatban…", "upload_pending": "Feltöltés folyamatban…",
"images_count_text": "Feltöltött képek", "images_count_text": "Feltöltött képek",

View File

@@ -315,17 +315,23 @@ async function uploadPicture(): Promise<void> {
] ]
calcPercentage() calcPercentage()
} catch (err: any) { } catch (err: any) {
picturesUploadingSize.value = picturesUploadingSize.value + el.size if (
const picturesOnError = { err.response.data.message === 'Impossible to parse picture metadata'
message: err.response.data.message, ) {
details: { error: err.response.data.details.error }, picturesUploadingSize.value = picturesUploadingSize.value + el.size
name: el.name const picturesOnError = {
message: err.response.data.message,
details: { error: err.response.data.details.error },
name: el.name
}
uploadedSequence.value.picturesOnError = [
...uploadedSequence.value.picturesOnError,
picturesOnError
]
calcPercentage()
} else {
uploadError.value = t('pages.upload.error_upload_img')
} }
uploadedSequence.value.picturesOnError = [
...uploadedSequence.value.picturesOnError,
picturesOnError
]
calcPercentage()
} }
} }
pictures.value = [] pictures.value = []