fix: pinia persisted store changes

Signed-off-by: Alexander Trost <[email protected]>
fivenet-app · Sep 12, 2024 · 82ceb3e · 82ceb3e
1 parent 7ae0bb3
commit 82ceb3e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 33 deletions.
diff --git a/app/store/auth.ts b/app/store/auth.ts
@@ -42,7 +42,7 @@ export const useAuthStore = defineStore('auth', {
             } as JobProps,
         }) as AuthState,
     persist: {
-        paths: ['accessTokenExpiration', 'lastCharID', 'username'],
+        pick: ['accessTokenExpiration', 'lastCharID', 'username'],
     },
     actions: {
         loginStart(): void {

diff --git a/app/store/calendar.ts b/app/store/calendar.ts
@@ -43,10 +43,8 @@ export const useCalendarStore = defineStore('calendar', {
             entries: [],
         }) as CalendarState,
     persist: {
-        key(id) {
-            return `state-${useAuthStore().activeChar?.userId}-${id}`;
-        },
-        paths: ['activeCalendarIds', 'weeklyView'],
+        key: (id: string) => `state-${useAuthStore().activeChar?.userId}-${id}`,
+        pick: ['activeCalendarIds', 'weeklyView'],
     },
     actions: {
         // Calendars

diff --git a/app/store/settings.ts b/app/store/settings.ts
@@ -69,7 +69,7 @@ export const useSettingsStore = defineStore('settings', {
             featureGates: {},
         }) as SettingsState,
     persist: {
-        paths: [
+        pick: [
             'version',
             'locale',
             'nuiEnabled',

diff --git a/app/utils/array.ts b/app/utils/array.ts
@@ -77,5 +77,7 @@ export function checkAccess<L = number>(
         }
     }
 
-    return (lowestAccess ?? 0) >= level;
+    console.log('level', level, 'lowestAccess', lowestAccess, activeChar.firstname, activeChar.jobGrade);
+
+    return level <= (lowestAccess ?? 0);
 }
diff --git a/flake.nix b/flake.nix
@@ -26,6 +26,9 @@
 
       devShells = forEachSupportedSystem ({ pkgs }: {
         default = pkgs.mkShell {
+          # Workaround CGO issue https://nixos.wiki/wiki/Go#Using_cgo_on_NixOS
+          hardeningDisable = [ "fortify" ];
+
           packages = with pkgs; [
             # go (version is specified by overlay)
             go

diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -16,7 +16,7 @@ export default defineNuxtConfig({
         '@nuxtjs/fontaine',
         '@vueuse/nuxt',
         '@pinia/nuxt',
-        '@pinia-plugin-persistedstate/nuxt',
+        'pinia-plugin-persistedstate/nuxt',
         'nuxt-zod-i18n',
         '@nuxtjs/i18n',
         '@galexrt/nuxt-update',

diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
         "@nuxt/eslint-config": "0.5.7",
         "@nuxtjs/fontaine": "0.4.3",
         "@nuxtjs/i18n": "8.5.3",
-        "@pinia-plugin-persistedstate/nuxt": "1.2.1",
+        "pinia-plugin-persistedstate": "4.0.1",
         "@protobuf-ts/plugin": "2.9.4",
         "@total-typescript/ts-reset": "0.6.1",
         "@types/google-protobuf": "3.15.12",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml