Merge branch 'master' into fix/better-theme-defaults

molgenis · Jan 17, 2025 · 430165e · 430165e
2 parents e68296b + 55656b8
commit 430165e
Show file tree

Hide file tree

Showing 73 changed files with 3,041 additions and 2,388 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -246,7 +246,7 @@ 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

diff --git a/.gitignore b/.gitignore
@@ -67,3 +67,4 @@ venv
 requirements.txt
 e2e/.auth
 e2e/e2e/.auth
+e2e/test-results/
diff --git a/apps/aggregates/package.json b/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": {

diff --git a/apps/central/package.json b/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": {

diff --git a/apps/central/src/components/admin/ManageUsers.vue b/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"

diff --git a/apps/cranio-provider/package.json b/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": {

diff --git a/apps/cranio-public/package.json b/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": {

diff --git a/apps/directory/package.json b/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",

diff --git a/apps/emx2-analytics/package.json b/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",

diff --git a/apps/ern-genturis/package.json b/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": {

diff --git a/apps/ern-ithaca/package.json b/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": {

diff --git a/apps/ern-reconnet/package.json b/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": {

diff --git a/apps/ern-skin/package.json b/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": {

diff --git a/apps/gportal/package.json b/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": {

diff --git a/apps/helloworld/package.json b/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": {

diff --git a/apps/imdhub-public/package.json b/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": {

diff --git a/apps/molgenis-components/package.json b/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",

diff --git a/apps/molgenis-viz/package.json b/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",

diff --git a/apps/nuxt3-ssr/package.json b/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"
   }
 }
diff --git a/apps/package.json b/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"
   }

diff --git a/apps/pages/package.json b/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": {

diff --git a/apps/projectmanager/package.json b/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": {

diff --git a/apps/reports/package.json b/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": {

diff --git a/apps/schema/package.json b/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",

diff --git a/apps/settings/package.json b/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"

diff --git a/apps/settings/src/components/Members.vue b/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) => {

diff --git a/apps/tables/package.json b/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": {

diff --git a/apps/tailwind-components/components/Header.vue b/apps/tailwind-components/components/Header.vue
@@ -9,6 +9,8 @@
           <!-- <SearchBar /> -->
         </div>
 
+        <slot name="admin" />
+
         <slot name="account">
           <!-- <HeaderButton label="Favorites" icon="star" /> -->
           <HeaderButton label="Account" icon="user" />

diff --git a/apps/tailwind-components/components/Modal.vue b/apps/tailwind-components/components/Modal.vue
@@ -10,7 +10,7 @@ function showModal() {
   visible.value = true;
 }
 
-const closeModal = (returnVal?: string) => {
+const closeModal = () => {
   visible.value = false;
 };
 
@@ -20,6 +20,7 @@ defineExpose({
   visible,
 });
 </script>
+
 <template>
   <section
     v-show="visible"
@@ -29,11 +30,12 @@ defineExpose({
     class="fixed min-h-lvh w-full top-0 left-0 flex z-20"
   >
     <a
-      @click="closeModal('close from backdrop')"
+      id="backdrop"
+      @click="closeModal()"
       class="w-full h-full absolute left-0 bg-black/60"
       href="#"
       tabindex="-1"
-    ></a>
+    />
 
     <div class="bg-white w-3/4 relative m-auto h-3/4 rounded-50px max-w-xl">
       <header class="pt-[36px] px-[50px] overflow-y-auto">
@@ -43,38 +45,23 @@ defineExpose({
         </h2>
 
         <button
-          @click="closeModal('close from btn')"
+          @click="closeModal()"
           aria-label="Close modal"
           class="absolute top-7 right-8 p-1"
         >
           <BaseIcon class="text-blue-500" name="cross" />
         </button>
 
-        <slot name="header"></slot>
+        <slot name="header" />
       </header>
 
       <div class="px-[50px] overflow-y-auto py-4 max-h-[calc(80vh-232px)]">
-        <slot></slot>
+        <slot />
       </div>
 
       <footer class="bg-modal-footer px-[50px] rounded-b-50px">
         <menu class="flex items-center justify-left h-[116px]">
-          <slot name="footer">
-            <div class="flex flex-wrap gap-5">
-              <button
-                @click="closeModal('close from btn')"
-                class="flex items-center border rounded-full h-10.5 px-5 text-heading-lg gap-3 tracking-widest uppercase font-display bg-button-primary text-button-primary border-button-primary hover:bg-button-primary-hover hover:text-button-primary-hover hover:border-button-primary-hover"
-              >
-                Primary
-              </button>
-              <button
-                @click="closeModal('close from btn')"
-                class="flex items-center border rounded-full h-10.5 px-5 text-heading-lg gap-3 tracking-widest uppercase font-display bg-button-secondary text-button-secondary border-button-secondary hover:bg-button-secondary-hover hover:text-button-secondary-hover hover:border-button-secondary-hover"
-              >
-                Secondary
-              </button>
-            </div>
-          </slot>
+          <slot name="footer" />
         </menu>
       </footer>
     </div>

diff --git a/apps/tailwind-components/components/Navigation.vue b/apps/tailwind-components/components/Navigation.vue
@@ -22,7 +22,6 @@ const mainButtons = computed(() =>
 const subButtons = computed(() =>
   props.navigation.slice(props.maximumButtonShown)
 );
-const active = "underline";
 </script>
 
 <template>

diff --git a/apps/tailwind-components/components/Table.vue b/apps/tailwind-components/components/Table.vue
@@ -1,4 +1,3 @@
-<!-- eslint-disable vue/multi-word-component-names -->
 <template>
   <table class="w-full table-auto">
     <thead>