From 1d0faf12ea0006c79c7c446bdcfafb81c4a35d3b Mon Sep 17 00:00:00 2001
From: nichenqin <nichenqin@hotmail.com>
Date: Tue, 17 Sep 2024 19:14:03 +0800
Subject: [PATCH] fix: fix always refetch data

---
 apps/frontend/schema.graphql                                | 1 +
 .../src/lib/components/blocks/base/base-detail.svelte       | 6 +++---
 apps/frontend/src/lib/store/base.store.ts                   | 2 +-
 apps/frontend/src/lib/store/modal.store.ts                  | 6 ++++++
 .../src/routes/(authed)/(space)/bases/[baseId]/+layout.gql  | 1 +
 .../src/routes/(authed)/(space)/bases/[baseId]/+page.svelte | 2 +-
 apps/frontend/src/routes/(authed)/+layout.ts                | 6 +++---
 packages/graphql/src/index.ts                               | 1 +
 8 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/apps/frontend/schema.graphql b/apps/frontend/schema.graphql
index a40d055a3..28e765029 100644
--- a/apps/frontend/schema.graphql
+++ b/apps/frontend/schema.graphql
@@ -13,6 +13,7 @@ type Audit {
 type Base {
   id: ID!
   name: String!
+  option: JSON
   share: Share
   tables: [Table]!
 }
diff --git a/apps/frontend/src/lib/components/blocks/base/base-detail.svelte b/apps/frontend/src/lib/components/blocks/base/base-detail.svelte
index 44ab4b11f..505b86cff 100644
--- a/apps/frontend/src/lib/components/blocks/base/base-detail.svelte
+++ b/apps/frontend/src/lib/components/blocks/base/base-detail.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { CREATE_TABLE_MODAL, IMPORT_TABLE_MODAL, toggleModal } from "$lib/store/modal.store"
+  import { CREATE_TABLE_MODAL, IMPORT_TABLE_MODAL, openModal, toggleModal } from "$lib/store/modal.store"
   import { DatabaseIcon, ImportIcon, PlusCircleIcon, PlusIcon } from "lucide-svelte"
   import * as Table from "$lib/components/ui/table"
   import { goto } from "$app/navigation"
@@ -28,7 +28,7 @@
         class="flex h-32 w-80 flex-col justify-between rounded-lg border bg-gray-100 px-4 py-7 text-left transition-all hover:bg-gray-200/50 hover:shadow-lg"
         on:click={() => {
           baseId.set(base.id)
-          toggleModal(CREATE_TABLE_MODAL)
+          openModal(CREATE_TABLE_MODAL)
         }}
       >
         <PlusCircleIcon class="text-muted-foreground" />
@@ -40,7 +40,7 @@
         class="flex h-32 w-80 flex-col justify-between rounded-lg border bg-gray-100 px-4 py-7 text-left transition-all hover:bg-gray-200/50 hover:shadow-lg"
         on:click={() => {
           baseId.set(base.id)
-          toggleModal(IMPORT_TABLE_MODAL)
+          openModal(IMPORT_TABLE_MODAL)
         }}
       >
         <ImportIcon class="text-muted-foreground" />
diff --git a/apps/frontend/src/lib/store/base.store.ts b/apps/frontend/src/lib/store/base.store.ts
index 082ce8fa1..25657cadd 100644
--- a/apps/frontend/src/lib/store/base.store.ts
+++ b/apps/frontend/src/lib/store/base.store.ts
@@ -3,7 +3,7 @@ import type { GetIndexQuery$result } from "$houdini"
 import { derived, writable } from "svelte/store"
 import { queryParam, ssp } from "sveltekit-search-params"
 
-export const baseId = queryParam("baseId", ssp.string())
+export const baseId = queryParam("baseId", ssp.string(), { pushHistory: false })
 
 export const bases = writable<GetIndexQuery$result["bases"]>()
 
diff --git a/apps/frontend/src/lib/store/modal.store.ts b/apps/frontend/src/lib/store/modal.store.ts
index 92bbe9b89..424d113a8 100644
--- a/apps/frontend/src/lib/store/modal.store.ts
+++ b/apps/frontend/src/lib/store/modal.store.ts
@@ -50,6 +50,12 @@ export const isModalOpen = derived(modal, ($modal) => {
   return (type: ModalType) => $modal?.includes(type) ?? false
 })
 
+export const openModal = (type: ModalType) => {
+  modal.update(($modal) => {
+    return $modal?.includes(type) ? $modal : [...($modal ?? []), type]
+  })
+}
+
 export const closeModal = (type: ModalType) => {
   modal.update(($modal) => {
     return $modal?.filter((m) => m !== type) ?? null
diff --git a/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+layout.gql b/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+layout.gql
index 22d60a55d..fb3d65558 100644
--- a/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+layout.gql
+++ b/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+layout.gql
@@ -2,6 +2,7 @@ query GetBaseQuery($baseId: ID!) {
   base(id: $baseId) {
     id
     name
+    option
 
     share {
       enabled
diff --git a/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+page.svelte b/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+page.svelte
index 3916de3d1..5689c484e 100644
--- a/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+page.svelte
+++ b/apps/frontend/src/routes/(authed)/(space)/bases/[baseId]/+page.svelte
@@ -4,7 +4,7 @@
 
   export let data: PageData
 
-  $: getBaseStore = data.getBaseStore
+  let getBaseStore = data.getBaseStore
   $: base = $getBaseStore.data?.base
 </script>
 
diff --git a/apps/frontend/src/routes/(authed)/+layout.ts b/apps/frontend/src/routes/(authed)/+layout.ts
index 23b3d588f..b9c7118c9 100644
--- a/apps/frontend/src/routes/(authed)/+layout.ts
+++ b/apps/frontend/src/routes/(authed)/+layout.ts
@@ -4,11 +4,11 @@ import type { LayoutLoad } from "./$types"
 export const ssr = false
 
 export const load: LayoutLoad = async (event) => {
-  const redirectURL = encodeURIComponent(event.url.pathname)
+  // const redirectURL = encodeURIComponent(event.url.pathname)
 
-  const search = new URLSearchParams({ redirect: redirectURL })
+  // const search = new URLSearchParams({ redirect: redirectURL })
 
-  const me = await event.fetch("/api/me?" + search.toString())
+  const me = await event.fetch("/api/me")
   if (me.redirected) {
     throw redirect(301, me.url)
   }
diff --git a/packages/graphql/src/index.ts b/packages/graphql/src/index.ts
index d4d6763ca..3cc2ba1a8 100644
--- a/packages/graphql/src/index.ts
+++ b/packages/graphql/src/index.ts
@@ -258,6 +258,7 @@ export class Graphql {
       type Base {
         id: ID!
         name: String!
+        option: JSON
 
         share: Share
         tables: [Table]!