Merge pull request #889 from cloud-pi-native/develop

Develop

.github/workflows/cd.yml

@@ -8,9 +8,10 @@ on:
 env:
   REGISTRY: "ghcr.io"
   NAMESPACE: "${{ github.repository }}"
-  MULTI_ARCH: true
+  # TODO : remettre à true quand runner restaurés
+  MULTI_ARCH: false
   USE_QEMU: false
-  NODE_VERSION: "20.10.0"
+  NODE_VERSION: "20.11.0"
   PNPM_VERSION: "8"
 
 jobs:

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: "20.10.0"
+  NODE_VERSION: "20.11.0"
   PNPM_VERSION: "8"
   REGISTRY: "ghcr.io"
   NAMESPACE: "${{ github.repository }}"

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ on:
         description: Nodejs version used to run tests
         required: true
         type: string
-        default: "20.10.0"
+        default: "20.11.0"
       PNPM_VERSION:
         description: Pnpm version used to run tests
         required: true

.github/workflows/npm.yml

@@ -9,7 +9,7 @@ on:
       NODE_VERSION:
         required: true
         type: string
-        default: "20.10.0"
+        default: "20.11.0"
       MAJOR_TAG:
         type: string
         description: "Major version tag"
@@ -29,7 +29,7 @@ on:
       NODE_VERSION:
         required: true
         type: string
-        default: "20.10.0"
+        default: "20.11.0"
       MAJOR_TAG:
         type: string
         description: "Major version tag"
@@ -52,26 +52,28 @@ jobs:
     steps:
       - name: Checks-out repository
         uses: actions/checkout@v3
+
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
           node-version: "${{ inputs.NODE_VERSION }}"
           registry-url: https://registry.npmjs.org/
+
       - name: Install pnpm
         uses: pnpm/action-setup@v2
         id: pnpm-install
         with:
           version: "${{ inputs.PNPM_VERSION }}"
           run_install: true
+
       - name: Prepare packages
         run: |
           pnpm run db:generate
-          echo '//registry.npmjs.org/:_authToken=${npm_token}' >> .npmrc
+          echo '//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}' >> .npmrc
+
       - name: Publish on npmjs.org
         run: |
           pnpm publish --no-git-checks --access public \
-          --filter server \
-          --filter client \
-          --filter shared
-        env:
-          npm_token: ${{secrets.NPM_TOKEN}}
+            --filter server \
+            --filter client \
+            --filter shared

.github/workflows/tests-component.yml

@@ -18,7 +18,7 @@ on:
         description: Nodejs version used to run tests
         required: true
         type: string
-        default: "20.10.0"
+        default: "20.11.0"
       PNPM_VERSION:
         description: Pnpm version used to run tests
         required: true

.github/workflows/tests-e2e.yml

@@ -21,7 +21,7 @@ on:
         description: Nodejs version used to run tests
         required: true
         type: string
-        default: "20.10.0"
+        default: "20.11.0"
       PNPM_VERSION:
         description: Pnpm version used to run tests
         required: true

.github/workflows/tests-unit.yml

@@ -22,7 +22,7 @@ on:
         description: Nodejs version used to run tests
         required: true
         type: string
-        default: "20.10.0"
+        default: "20.11.0"
       PNPM_VERSION:
         description: Pnpm version used to run tests
         required: true
@@ -189,7 +189,7 @@ jobs:
             -Dsonar.scm.provider=git
             ${{ github.event_name == 'pull_request' && steps.sonar-args.outputs.SONAR_ARGS_PR || steps.sonar-args.outputs.SONAR_ARGS_BRANCH }}
         continue-on-error: true
-            
+
       - name: SonarQube Quality Gate check
         id: sonarqube-quality-gate-check
         uses: sonarsource/sonarqube-quality-gate-action@master

.gitignore

@@ -51,6 +51,8 @@ keycloak/data
 # dist
 dist
 build
+auto-imports.d.ts
+components.d.ts
 
 #types
 apps/server/types/

.vscode/settings.json

@@ -2,7 +2,7 @@
   // Format
   "editor.wordWrap": "on",
   "editor.codeActionsOnSave": {
-    "source.fixAll": true,
+    "source.fixAll": "explicit"
   },
   "eslint.packageManager": "pnpm",
   "eslint.enable": true,
@@ -34,6 +34,7 @@
   "scss.validate": false,
   // JS
   "javascript.preferences.importModuleSpecifierEnding": "js",
+  "typescript.preferences.importModuleSpecifierEnding": "js",
   "javascript.preferences.quoteStyle": "single",
   "[javascript]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint",

apps/client/.eslintrc-auto-import.json

@@ -0,0 +1,88 @@
+{
+  "globals": {
+    "Component": true,
+    "ComponentPublicInstance": true,
+    "ComputedRef": true,
+    "EffectScope": true,
+    "ExtractDefaultPropTypes": true,
+    "ExtractPropTypes": true,
+    "ExtractPublicPropTypes": true,
+    "InjectionKey": true,
+    "PropType": true,
+    "Ref": true,
+    "VNode": true,
+    "WritableComputedRef": true,
+    "acceptHMRUpdate": true,
+    "computed": true,
+    "createApp": true,
+    "createPinia": true,
+    "customRef": true,
+    "defineAsyncComponent": true,
+    "defineComponent": true,
+    "defineStore": true,
+    "effectScope": true,
+    "getActivePinia": true,
+    "getCurrentInstance": true,
+    "getCurrentScope": true,
+    "h": true,
+    "inject": true,
+    "isProxy": true,
+    "isReactive": true,
+    "isReadonly": true,
+    "isRef": true,
+    "mapActions": true,
+    "mapGetters": true,
+    "mapState": true,
+    "mapStores": true,
+    "mapWritableState": true,
+    "markRaw": true,
+    "nextTick": true,
+    "onActivated": true,
+    "onBeforeMount": true,
+    "onBeforeRouteLeave": true,
+    "onBeforeRouteUpdate": true,
+    "onBeforeUnmount": true,
+    "onBeforeUpdate": true,
+    "onDeactivated": true,
+    "onErrorCaptured": true,
+    "onMounted": true,
+    "onRenderTracked": true,
+    "onRenderTriggered": true,
+    "onScopeDispose": true,
+    "onServerPrefetch": true,
+    "onUnmounted": true,
+    "onUpdated": true,
+    "provide": true,
+    "reactive": true,
+    "readonly": true,
+    "ref": true,
+    "resolveComponent": true,
+    "setActivePinia": true,
+    "setMapStoreSuffix": true,
+    "shallowReactive": true,
+    "shallowReadonly": true,
+    "shallowRef": true,
+    "storeToRefs": true,
+    "toRaw": true,
+    "toRef": true,
+    "toRefs": true,
+    "toValue": true,
+    "triggerRef": true,
+    "unref": true,
+    "useAttrs": true,
+    "useCssModule": true,
+    "useCssVars": true,
+    "useLink": true,
+    "useRoute": true,
+    "useRouter": true,
+    "useScheme": true,
+    "useSlots": true,
+    "useTabs": true,
+    "watch": true,
+    "watchEffect": true,
+    "watchPostEffect": true,
+    "watchSyncEffect": true,
+    "OhVueIcon": true,
+    "addIcons": true
+  }
+}

apps/client/.eslintrc.json

@@ -3,7 +3,8 @@
   "extends": [
     "@dso-console/eslint-config-base",
     "plugin:vue/vue3-recommended",
-    "@vue/eslint-config-typescript"
+    "@vue/eslint-config-typescript",
+    "./.eslintrc-auto-import.json"
   ],
   "plugins": [
     "vue",

apps/client/.stylelintrc.cjs

@@ -20,7 +20,6 @@ module.exports = {
         ],
       },
     ],
-    'declaration-block-trailing-semicolon': null,
     'no-descending-specificity': null,
     'selector-class-pattern': '^((sm|md|lg|xl|2xl):)?[a-z][-_/a-z0-9]*$'
   },

apps/client/Dockerfile

@@ -1,15 +1,16 @@
 # Dev stage
-FROM docker.io/node:20.10.0-bullseye-slim AS dev
+FROM docker.io/node:20.11.0-bullseye-slim AS dev
 
 WORKDIR /app
-RUN npm install --location=global pnpm@8.6.10
+RUN npm install --ignore-scripts --location=global pnpm@8.14.1
 COPY --chown=node:root package.json pnpm-workspace.yaml pnpm-lock.yaml .npmrc ./
+COPY --chown=node:root patches ./patches
 COPY --chown=node:root apps/client/package.json ./apps/client/package.json
 COPY --chown=node:root packages/eslintconfig/package.json ./packages/eslintconfig/package.json
 COPY --chown=node:root packages/shared/package.json ./packages/shared/package.json
 COPY --chown=node:root packages/test-utils/package.json ./packages/test-utils/package.json
 COPY --chown=node:root packages/tsconfig/package.json ./packages/tsconfig/package.json
-RUN pnpm install --no-optional
+RUN pnpm install --ignore-scripts # --no-optional
 COPY --chown=node:root packages/ ./packages/
 RUN pnpm --filter shared run build
 COPY --chown=node:root apps/client/ ./apps/client/

apps/client/cypress.config.ts

@@ -40,7 +40,7 @@ export default defineConfig({
   },
 
   component: {
-    specPattern: 'cypress/components/specs/**/*.{cy,ct}.{j,t}s',
+    specPattern: '{cypress/components/specs,src/components}/**/*.{cy,ct}.{j,t}s',
     supportFile: 'cypress/components/support/index.ts',
     indexHtmlFile: 'cypress/components/support/component-index.html',
     video: false,

apps/client/cypress/components/specs/cluster-form.ct.ts

@@ -1,14 +1,19 @@
-import { Pinia, createPinia, setActivePinia } from 'pinia'
+import { type Pinia, createPinia, setActivePinia } from 'pinia'
+import { getRandomCluster, getRandomEnv, getRandomProject, getRandomStage, repeatFn } from '@dso-console/test-utils'
+
 import '@gouvfr/dsfr/dist/dsfr.min.css'
 import '@gouvfr/dsfr/dist/utility/icons/icons.min.css'
 import '@gouvfr/dsfr/dist/utility/utility.main.min.css'
 import '@gouvminint/vue-dsfr/styles'
 import '@/main.css'
+
 import ClusterForm from '@/components/ClusterForm.vue'
-import { getRandomCluster, getRandomEnv, getRandomProject, getRandomStage, repeatFn } from '@dso-console/test-utils'
 import { useSnackbarStore } from '@/stores/snackbar.js'
 import { useAdminClusterStore } from '@/stores/admin/cluster.js'
 
+const repeatFn5Times = repeatFn(5)
+const get5RandomProjects = () => repeatFn5Times(getRandomProject)
+
 describe('ClusterForm.vue', () => {
   let pinia: Pinia
 
@@ -21,7 +26,7 @@ describe('ClusterForm.vue', () => {
   it('Should mount a new cluster ClusterForm', () => {
     useSnackbarStore()
 
-    const allProjects = repeatFn(5)(getRandomProject)
+    const allProjects = get5RandomProjects()
     const allStages = repeatFn(4)(getRandomStage)
 
     const props = {
@@ -53,7 +58,7 @@ describe('ClusterForm.vue', () => {
     useSnackbarStore()
     const adminClusterStore = useAdminClusterStore()
 
-    const allProjects = repeatFn(5)(getRandomProject)
+    const allProjects = get5RandomProjects()
     const allStages = repeatFn(2)(getRandomStage)
     adminClusterStore.clusters = [getRandomCluster([allProjects[0].id], [allStages[1].id])]
 
@@ -103,7 +108,7 @@ describe('ClusterForm.vue', () => {
     useSnackbarStore()
     const adminClusterStore = useAdminClusterStore()
 
-    const allProjects = repeatFn(5)(getRandomProject)
+    const allProjects = get5RandomProjects()
     const allStages = repeatFn(2)(getRandomStage)
     // @ts-ignore
     adminClusterStore.clusters = [getRandomCluster([allProjects[0].id], [allStages[1].id])]
@@ -152,7 +157,7 @@ describe('ClusterForm.vue', () => {
   it('Should disable project selector when privacy is public', () => {
     useSnackbarStore()
 
-    const allProjects = repeatFn(5)(getRandomProject)
+    const allProjects = get5RandomProjects()
 
     const props = {
       allProjects,

apps/client/cypress/components/specs/environment-form.ct.ts

@@ -1,11 +1,13 @@
-import { Pinia, createPinia, setActivePinia } from 'pinia'
+import { type Pinia, createPinia, setActivePinia } from 'pinia'
+import { createRandomDbSetup } from '@dso-console/test-utils'
+
 import '@gouvfr/dsfr/dist/dsfr.min.css'
 import '@gouvfr/dsfr/dist/utility/icons/icons.min.css'
 import '@gouvfr/dsfr/dist/utility/utility.main.min.css'
 import '@gouvminint/vue-dsfr/styles'
 import '@/main.css'
+
 import EnvironmentForm from '@/components/EnvironmentForm.vue'
-import { createRandomDbSetup } from '@dso-console/test-utils'
 import { useSnackbarStore } from '@/stores/snackbar.js'
 import { useProjectEnvironmentStore } from '@/stores/project-environment.js'
 
@@ -62,7 +64,7 @@ describe('EnvironmentForm.vue', () => {
     cy.getByDataTestid('cancelEnvironmentBtn').should('be.enabled')
 
     cy.getByDataTestid('environmentNameInput')
-      .clear().type('prod-0')
+      .clear().type('prod0')
     cy.get('select#stage-select > option')
       .should('have.length', randomDbSetup.stages.length + 1)
     cy.get('select#stage-select')