Merge branch 'master' into fix/invalid_semantics

.circleci/config.yml

@@ -246,14 +246,23 @@ jobs:
     - post_steps
   e2e-test:
     docker:
-      - image: mcr.microsoft.com/playwright:v1.49.0-jammy
+      - image: mcr.microsoft.com/playwright:v1.49.1-jammy
     steps:
       - checkout
       - run: npm i -D @playwright/test
       - run:
           name: Install dependencies
           command: yarn install
           working_directory: apps
+      - run:
+          name: Test tailwind components
+          command: |
+            yarn playwright install chrome
+            echo "PR number: ${CIRCLE_PULL_REQUEST##*/}"
+            export E2E_BASE_URL=https://preview-emx2-pr-${CIRCLE_PULL_REQUEST##*/}.dev.molgenis.org/
+            echo $E2E_BASE_URL
+            yarn e2e
+          working_directory: apps/tailwind-components
       - run:
           name: Wait for catalogue e2e test data to be loaded, poll every 10 seconds
           command: |

.gitignore

@@ -67,3 +67,5 @@ venv
 requirements.txt
 e2e/.auth
 e2e/e2e/.auth
+e2e/test-results/
+apps/tailwind-components/test-results/.last-run.json

apps/aggregates/package.json

@@ -14,7 +14,7 @@
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
     "molgenis-viz": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/central/package.json

@@ -14,7 +14,7 @@
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
     "v-scroll-lock": "1.3.1",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/central/src/components/SchemaCreateModal.vue

@@ -152,6 +152,7 @@ export default {
         "FAIR_DATA_POINT",
         "BEACON_V2",
         "ERN_DASHBOARD",
+        "UI_DASHBOARD",
         "BIOBANK_DIRECTORY",
         "BIOBANK_DIRECTORY_STAGING",
         "SHARED_STAGING",

apps/central/src/components/admin/ManageUsers.vue

@@ -21,7 +21,11 @@
     <TableSimple class="bg-white" :rows="users" :columns="['email', 'enabled']">
       <template v-slot:rowheader="row">
         <template
-          v-if="row.row.email !== 'admin' && row.row.email !== 'anonymous'"
+          v-if="
+            row.row.email !== 'admin' &&
+            row.row.email !== 'anonymous' &&
+            row.row.email !== 'user'
+          "
         >
           <IconDanger
             icon="trash"

apps/cranio-provider/package.json

@@ -14,7 +14,7 @@
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
     "molgenis-viz": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/cranio-public/package.json

@@ -14,7 +14,7 @@
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
     "molgenis-viz": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/directory/package.json

@@ -25,13 +25,13 @@
     "molgenis-components": "*",
     "monaco-editor": "0.50.0",
     "pinia": "2.1.7",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-gtag": "2.0.1",
     "vue-router": "4.4.3",
     "vuedraggable": "4.1.0"
   },
   "devDependencies": {
-    "@playwright/test": "1.49.0",
+    "@playwright/test": "1.49.1",
     "@vitejs/plugin-vue": "4.6.2",
     "@vue/test-utils": "2.4.6",
     "@vue/vue3-jest": "29.2.6",

apps/emx2-analytics/package.json

@@ -13,7 +13,7 @@
     "checkFormat": "prettier src  --check --config ../.prettierrc.js"
   },
   "dependencies": {
-    "vue": "^3.4.29"
+    "vue":"3.5.13"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.5",

apps/ern-genturis/package.json

@@ -16,7 +16,7 @@
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
     "molgenis-viz": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/ern-ithaca/package.json

@@ -14,7 +14,7 @@
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
     "molgenis-viz": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/ern-reconnet/package.json

@@ -13,7 +13,7 @@
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
     "molgenis-viz": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/ern-skin/package.json

@@ -14,7 +14,7 @@
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
     "molgenis-viz": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/gportal/package.json

@@ -14,7 +14,7 @@
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
     "molgenis-viz": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/helloworld/package.json

@@ -13,7 +13,7 @@
     "graphql-request": "5.2.0",
     "metadata-utils": "*",
     "molgenis-components": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/imdhub-public/package.json

@@ -14,7 +14,7 @@
         "graphql-request": "5.2.0",
         "molgenis-components": "*",
         "molgenis-viz": "*",
-        "vue": "3.5.6",
+        "vue":"3.5.13",
         "vue-router": "4.4.3"
       },
       "devDependencies": {

apps/molgenis-components/package.json

@@ -38,7 +38,7 @@
     "cross-env": "7.0.3",
     "metadata-utils": "*",
     "universal-cookie": "4.0.4",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-gtag": "2.0.1",
     "vue-flatpickr-component": "11.0.5",
     "vue3-cookies": "^1.0.6",

apps/molgenis-viz/package.json

@@ -34,7 +34,7 @@
     "d3": "7.8.5",
     "graphql-request": "^6.1.0",
     "heroicons": "^2.0.18",
-    "vue": "3.5.6"
+    "vue":"3.5.13"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "4.6.2",

apps/nuxt3-ssr/package.json

@@ -19,8 +19,8 @@
   },
   "devDependencies": {
     "@nuxt/image": "1.7.0",
-    "@nuxt/test-utils": "3.14.2",
-    "@playwright/test": "1.49.0",
+    "@nuxt/test-utils": "3.14.4",
+    "@playwright/test": "1.49.1",
     "@tailwindcss/forms": "0.5.7",
     "@tailwindcss/typography": "0.5.13",
     "@vitejs/plugin-vue": "4.6.2",
@@ -40,14 +40,15 @@
     "tailwindcss": "3.4.4",
     "typescript": "5.6.2",
     "vitest": "2.1.1",
-    "vue-tsc": "2.1.6"
+    "vue-tsc": "2.1.6",
+    "nuxt": "3.14.1592"
   },
   "dependencies": {
     "@vueuse/core": "10.7.0",
     "floating-vue": "5.2.2",
     "metadata-utils": "*",
     "nuxt-gtag": "3.0.1",
     "vite": "5.4.6",
-    "vue": "3.5.6"
+    "vue": "3.5.13"
   }
 }

apps/nuxt3-ssr/playwright.config.ts

@@ -45,46 +45,7 @@ export default defineConfig<ConfigOptions>({
       },
       testMatch: '*/admin!*.spec.ts'
     },
-
-    // {
-    //   name: 'firefox',
-    //   use: { ...devices['Desktop Firefox'] },
-    // },
-
-    // {
-    //   name: 'webkit',
-    //   use: { ...devices['Desktop Safari'] },
-    // },
-
-    /* Test against mobile viewports. */
-    // {
-    //   name: 'Mobile Chrome',
-    //   use: { ...devices['Pixel 5'] },
-    // },
-    // {
-    //   name: 'Mobile Safari',
-    //   use: { ...devices['iPhone 12'] },
-    // },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ..devices['Desktop Chrome'], channel: 'chrome' },
-    // },
   ],
 
-  /* When CI, start our local dev server before starting the tests */
-  // webServer: {
-  //   command: '../gradlew run -p ../',
-  //   url: 'http://localhost:8080',
-  //   reuseExistingServer: !process.env.CI,
-  // },
 });
 
-function fileURLToPath(arg0: URL): string | undefined {
-  throw new Error('Function not implemented.');
-}

apps/package.json

@@ -32,9 +32,6 @@
     "emx2-analytics",
     "ui"
   ],
-  "devDependencies": {
-    "nuxt": "3.13.2"
-  },
   "scripts": {
     "build:libs": "yarn workspace molgenis-components run build && yarn workspace molgenis-viz run build"
   }

apps/pages/package.json

@@ -14,7 +14,7 @@
     "core-js": "3.34.0",
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/projectmanager/package.json

@@ -13,7 +13,7 @@
     "graphql-request": "5.2.0",
     "metadata-utils": "*",
     "molgenis-components": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/reports/package.json

@@ -13,7 +13,7 @@
     "core-js": "3.34.0",
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/schema/package.json

@@ -15,7 +15,7 @@
     "graphql-tag": "2.12.6",
     "metadata-utils": "*",
     "molgenis-components": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3",
     "vue-scrollto": "2.20.0",
     "vuedraggable": "4.1.0",

apps/settings/package.json

@@ -13,7 +13,7 @@
     "molgenis-components": "*",
     "core-js": "3.34.0",
     "graphql-request": "5.2.0",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3",
     "vue3-colorpicker": "2.2.3",
     "vuedraggable": "4.1.0"

apps/settings/src/components/Members.vue

@@ -5,13 +5,7 @@
       <MessageError v-if="graphqlError">{{ graphqlError }}</MessageError>
       <MessageSuccess v-if="success">{{ success }}</MessageSuccess>
     </div>
-    <div
-      v-if="
-        session &&
-        (session.email == 'admin' ||
-          (session.roles && session.roles.length > 0))
-      "
-    >
+    <div v-if="session?.email === 'admin' || session?.roles?.length">
       <h5 class="card-title">Manage members</h5>
       <p>Use table below to add, edit or remove members</p>
       <form v-if="canEdit" class="form-inline">
@@ -106,13 +100,11 @@ export default {
       loading: false,
     };
   },
-
   computed: {
     canEdit() {
       return (
-        this.session != null &&
-        (this.session.email == "admin" ||
-          this.session.roles.includes("Manager"))
+        this.session?.email === "admin" ||
+        this.session?.roles.includes("Manager")
       );
     },
   },
@@ -127,7 +119,7 @@ export default {
         `mutation drop($member:[String]){drop(members:$member){message}}`,
         { member: name }
       )
-        .then((data) => {
+        .then(() => {
           this.loadMembers();
         })
         .catch((error) => {

apps/tables/package.json

@@ -13,7 +13,7 @@
     "core-js": "3.34.0",
     "graphql-request": "5.2.0",
     "molgenis-components": "*",
-    "vue": "3.5.6",
+    "vue":"3.5.13",
     "vue-router": "4.4.3"
   },
   "devDependencies": {

apps/tailwind-components/assets/css/main.css

@@ -21,7 +21,7 @@
     --color-blue-700: #015CB6;
     --color-blue-800: #014F9E;
     --color-blue-900: #013F7E;
-    --color-grey-50: #F9F9F9;
+    --color-gray-50: #F9F9F9;
     --color-gray-100: #F4F4F4;
     --color-gray-200: #E2E2E2;
     --color-gray-400: #C0C0C0;
@@ -91,7 +91,7 @@
     --text-color-button-outline-hover: var(--color-blue-700);
     --text-color-button-disabled: var(--color-gray-600);
     --text-color-button-disabled-hover: var(--color-gray-600);
-    --text-color-menu: var(--color-blue-800);
+    --text-color-menu: var(--text-color-title);
     --text-color-sub-menu: var(--color-blue-500);
     --text-color-sub-menu-hover: var(--color-blue-700);
     --text-color-breadcrumb-arrow: var(--color-gray-400);