adds loadById for views

trathailoi · Mar 23, 2023 · 7888148 · 7888148
1 parent 3d56fad
commit 7888148
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx b/studio/components/layouts/TableEditorLayout/TableEditorLayout.tsx
@@ -52,20 +52,10 @@ const TableEditorLayout = ({
     }
   }, [ui.selectedProject?.ref])
 
-  // useEffect(() => {
-  //   if (selectedSchema && ui.selectedProject?.ref) {
-  //     meta.tables.loadBySchema(selectedSchema)
-  //     meta.views.loadBySchema(selectedSchema)
-  //   }
-  // }, [ui.selectedProject?.ref, selectedSchema])
-
   useEffect(() => {
     if (ui.selectedProject?.ref && id) {
-      // [Joshen] This is a little silly, but because fetching tables/views/foreign-tables
-      // are all through different endpoints, we need to discern them
-      if (type !== 'view' && type !== 'foreign') {
-        meta.tables.loadById(Number(id))
-      }
+      meta.tables.loadById(Number(id))
+      meta.views.loadById(Number(id))
     }
   }, [ui.selectedProject?.ref, id])
 

diff --git a/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx b/studio/components/layouts/TableEditorLayout/TableEditorMenu.tsx
@@ -289,7 +289,7 @@ const EntityListItem = ({
 
   return (
     <ProductMenuItem
-      url={`/project/${projectRef}/editor/${entity.id}?type=${entity.type}`}
+      url={`/project/${projectRef}/editor/${entity.id}`}
       name={entity.name}
       hoverText={entity.comment ? entity.comment : entity.name}
       isActive={isActive}

diff --git a/studio/stores/pgmeta/MetaStore.ts b/studio/stores/pgmeta/MetaStore.ts
@@ -14,7 +14,7 @@ import type {
 import { IS_PLATFORM, API_URL } from 'lib/constants'
 import { post } from 'lib/common/fetch'
 import { timeout } from 'lib/helpers'
-import { ResponseError, SchemaView } from 'types'
+import { ResponseError } from 'types'
 
 import { IRootStore } from '../RootStore'
 import ColumnStore from './ColumnStore'
@@ -43,7 +43,7 @@ import HooksStore from './HooksStore'
 import ExtensionsStore from './ExtensionsStore'
 import TypesStore from './TypesStore'
 import ForeignTableStore from './ForeignTableStore'
-import ViewStore from './ViewStore'
+import ViewStore, { IViewStore } from './ViewStore'
 import { FOREIGN_KEY_DELETION_ACTION } from 'data/database/database-query-constants'
 
 const BATCH_SIZE = 1000
@@ -56,7 +56,7 @@ export interface IMetaStore {
   tables: ITableStore
   columns: IPostgresMetaInterface<PostgresColumn>
   schemas: IPostgresMetaInterface<PostgresSchema>
-  views: IPostgresMetaInterface<SchemaView>
+  views: IViewStore
   foreignTables: IPostgresMetaInterface<Partial<PostgresTable>>
 
   hooks: IPostgresMetaInterface<any>

diff --git a/studio/stores/pgmeta/ViewStore.ts b/studio/stores/pgmeta/ViewStore.ts
@@ -1,6 +1,11 @@
-import { SchemaView } from 'types'
-import PostgresMetaInterface from '../common/PostgresMetaInterface'
+import { ResponseError, SchemaView } from 'types'
+import PostgresMetaInterface, { IPostgresMetaInterface } from '../common/PostgresMetaInterface'
 import { IRootStore } from '../RootStore'
+import { get } from 'lib/common/fetch'
+
+export interface IViewStore extends IPostgresMetaInterface<SchemaView> {
+  loadById: (id: number | string) => Promise<Partial<SchemaView> | { error: ResponseError }>
+}
 
 export default class ViewStore extends PostgresMetaInterface<SchemaView> {
   constructor(
@@ -13,4 +18,19 @@ export default class ViewStore extends PostgresMetaInterface<SchemaView> {
   ) {
     super(rootStore, dataUrl, headers, options)
   }
+
+  async loadById(id: number | string) {
+    try {
+      const url = `${this.url}?id=${id}`
+      const response = await get(url, { headers: this.headers })
+      if (response.error) throw response.error
+
+      const data = response as Partial<SchemaView>
+      // @ts-ignore
+      this.data[id] = data
+      return data
+    } catch (error: any) {
+      return { error }
+    }
+  }
 }