diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index ad6fa70d..b35fb7ce 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -40,19 +40,19 @@ jobs: npm run build:widget -- --base "https://cartobio-preprod.agencebio.org/notification-webcomponent/" npm run build:widget-demo -- --base "https://cartobio-preprod.agencebio.org/notification-webcomponent/" - - name: Install SSH Key - uses: shimataro/ssh-key-action@v2 - with: - key: ${{ secrets.AGENCEBIO_SSH_PRIVATE_KEY }} - known_hosts: ${{ secrets.AGENCEBIO_SSH_KNOWN_HOSTS }} + - name: Install SSH Key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.AGENCEBIO_SSH_PRIVATE_KEY }} + known_hosts: ${{ secrets.AGENCEBIO_PREPROD_SSH_KNOWN_HOSTS }} - - name: rsync - run: | - rsync -avzr --delete --exclude 'node_modules' --exclude '.git*' ./dist/ ${REMOTE_USER}@${REMOTE_HOST}:${REMOTE_PATH} - env: - REMOTE_HOST: ${{ secrets.AGENCEBIO_SSH_HOST }} - REMOTE_USER: ${{ secrets.AGENCEBIO_SSH_USERNAME }} - REMOTE_PATH: /var/www/cartobio-preprod.agencebio.org/ + - name: rsync + run: | + rsync -avzr --delete --exclude 'node_modules' --exclude '.git*' ./dist/ ${REMOTE_USER}@${REMOTE_HOST}:${REMOTE_PATH} + env: + REMOTE_HOST: ${{ secrets.AGENCEBIO_PREPROD_SSH_HOST }} + REMOTE_USER: ${{ secrets.AGENCEBIO_SSH_USERNAME }} + REMOTE_PATH: /var/www/cartobio-preprod.agencebio.org/ - id: version run: echo v=$(node -p "require('./package.json').version") >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d023d9b4..fe8985fc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,13 +45,13 @@ jobs: uses: shimataro/ssh-key-action@v2 with: key: ${{ secrets.AGENCEBIO_SSH_PRIVATE_KEY }} - known_hosts: ${{ secrets.AGENCEBIO_SSH_KNOWN_HOSTS }} + known_hosts: ${{ secrets.AGENCEBIO_PREPROD_SSH_KNOWN_HOSTS }} - name: rsync run: | rsync -avzr --delete --exclude 'node_modules' --exclude '.git*' ./dist/ ${REMOTE_USER}@${REMOTE_HOST}:${REMOTE_PATH} env: - REMOTE_HOST: ${{ secrets.AGENCEBIO_SSH_HOST }} + REMOTE_HOST: ${{ secrets.AGENCEBIO_PREPROD_SSH_HOST }} REMOTE_USER: ${{ secrets.AGENCEBIO_SSH_USERNAME }} REMOTE_PATH: /var/www/cartobio-test.agencebio.org/ diff --git a/package-lock.json b/package-lock.json index 449eee28..dcbde449 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@agencebio/cartobio-front", - "version": "2.30.1", + "version": "2.30.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@agencebio/cartobio-front", - "version": "2.30.1", + "version": "2.30.2", "dependencies": { "@agencebio/rosetta-cultures": "^2.1.0", "@algolia/autocomplete-js": "^1.8.3", diff --git a/package.json b/package.json index 503fb1e5..8af389ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@agencebio/cartobio-front", - "version": "2.30.1", + "version": "2.30.2", "private": true, "type": "module", "scripts": { diff --git a/src/components/map/CustomControlsParcelles.vue b/src/components/map/CustomControlsParcelles.vue index 8ae115d8..15e428d7 100644 --- a/src/components/map/CustomControlsParcelles.vue +++ b/src/components/map/CustomControlsParcelles.vue @@ -25,8 +25,12 @@ const props = defineProps({ type: Boolean, required: true, }, + disable: { + type: Boolean, + required: true, + }, }); -const currentMode = ref(props.mode); +const currentMode = ref(!props.disable ? props.mode : ""); const windowWidth = useWindowWidth(); const selectModif = () => { @@ -72,6 +76,7 @@ const redo = () => { title="Modifier" aria-label="Modifier" @click="selectModif()" + :disabled="disable" > Modifier @@ -83,6 +88,7 @@ const redo = () => { title="Diviser" aria-label="Diviser" @click="selectDivid()" + :disabled="disable" > Diviser @@ -95,6 +101,7 @@ const redo = () => { title="Découper les bordures" aria-label="Découper les bordures" @click="selectCutBorders()" + :disabled="disable" > {{ @@ -111,17 +118,24 @@ const redo = () => { :class="mesureActive ? 'selected-button' : ''" @click="selectMesure()" aria-label="Mesurer" + :disabled="disable" >
- - - @@ -129,7 +143,7 @@ const redo = () => { -