From 41ce9954392a853ef0b2b92bbaafa8769600361e Mon Sep 17 00:00:00 2001 From: TzeYiing Date: Fri, 24 Jun 2022 14:51:12 +0800 Subject: [PATCH] fix: fixes saved log sql snippets --- .../project/[ref]/logs-explorer/saved.tsx | 42 ++++++++----------- studio/stores/content/ProjectContentStore.ts | 9 ++-- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/studio/pages/project/[ref]/logs-explorer/saved.tsx b/studio/pages/project/[ref]/logs-explorer/saved.tsx index 42f28a2ed9d..1d0ef597bb1 100644 --- a/studio/pages/project/[ref]/logs-explorer/saved.tsx +++ b/studio/pages/project/[ref]/logs-explorer/saved.tsx @@ -18,8 +18,7 @@ export const LogsSavedPage: NextPageWithLayout = () => { if (content.isLoading) { return {null} } - const saved = content.logSqlSnippets() - + const saved = content.savedLogSqlSnippets() return ( <>
@@ -30,34 +29,29 @@ export const LogsSavedPage: NextPageWithLayout = () => { <> Name Description - Created - Last updated - - - } - body={ - <> - {saved.length > 0 && - saved.map((item: any) => )} + Created + Last updated + } + body={saved.map((item) => ( + + ))} /> )}
{saved.length === 0 && ( - <> -
- -

No Saved Queries Yet

-

- Saved queries will appear here. Queries can be saved from the{' '} - - Query - {' '} - tab. -

-
- +
+ +

No Saved Queries Yet

+

+ Saved queries will appear here. Queries can be saved from the{' '} + + Query + {' '} + tab. +

+
)} ) diff --git a/studio/stores/content/ProjectContentStore.ts b/studio/stores/content/ProjectContentStore.ts index 391b93ec93b..0f136ea941a 100644 --- a/studio/stores/content/ProjectContentStore.ts +++ b/studio/stores/content/ProjectContentStore.ts @@ -34,7 +34,7 @@ export interface IProjectContentStore { list: (filter?: any) => any[] reports: (filter?: any) => any[] sqlSnippets: (filter?: any) => any[] - logSqlSnippets: (filter?: CustomFilter) => UserContent[] + savedLogSqlSnippets: (filter?: CustomFilter) => UserContent[] addRecentLogSqlSnippet: (snippet: Partial) => void clearRecentLogSqlSnippets: () => void setProjectRef: (ref?: string) => void @@ -111,7 +111,8 @@ export default class ProjectContentStore implements IProjectContentStore { if (response.error) { throw response.error } - this.data = keyBy(response.data ?? response, 'id') + console.log(response) + this.data = keyBy(response.data, 'id') return response } @@ -209,8 +210,8 @@ export default class ProjectContentStore implements IProjectContentStore { ;(window as any).localStorage.setItem(this.recentLogSqlKey, JSON.stringify([])) } - logSqlSnippets(filter?: CustomFilter) { - let arr = ((Object.values(this.data)[0] as any) || []) as UserContent[] + savedLogSqlSnippets(filter?: CustomFilter) { + let arr = Object.values(this.data) as UserContent[] let snippets = arr.filter((c) => c.type === 'log_sql') if (filter) { snippets = snippets.filter(filter)