Skip to content

Commit 6f8976c

Browse files
committed
fix: coderabbit comments
1 parent 5033aae commit 6f8976c

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

src/pages/views/components/ViewWithSections.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const ViewWithSections: React.FC<ViewWithSectionsProps> = ({
6767
<>
6868
{viewResult.sections.map((section) => (
6969
<div
70-
key={`${section.viewRef.namespace}:${section.viewRef.name}`}
70+
key={`${section.viewRef.namespace || "default"}:${section.viewRef.name}`}
7171
className="mt-4"
7272
>
7373
<ViewSection section={section} hideVariables />

src/pages/views/hooks/useViewData.ts

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ export function useViewData({
3636

3737
const isDisplayPluginMode = !!configId;
3838

39-
const { data: displayPluginVariables } = useQuery({
39+
const {
40+
data: displayPluginVariables,
41+
isLoading: isLoadingDisplayPluginVariables,
42+
isFetching: isFetchingDisplayPluginVariables,
43+
error: displayPluginVariablesError
44+
} = useQuery({
4045
queryKey: ["viewDisplayPluginVariables", viewId, configId],
4146
queryFn: () => getViewDisplayPluginVariables(viewId, configId!),
4247
enabled: isDisplayPluginMode
@@ -46,9 +51,9 @@ export function useViewData({
4651

4752
const {
4853
data: viewResult,
49-
isLoading,
50-
isFetching,
51-
error,
54+
isLoading: isLoadingViewResult,
55+
isFetching: isFetchingViewResult,
56+
error: viewResultError,
5257
refetch
5358
} = useQuery({
5459
queryKey: isDisplayPluginMode
@@ -70,12 +75,12 @@ export function useViewData({
7075
return [];
7176
}
7277
const refs: ViewRef[] = [
73-
{ namespace: viewResult.namespace, name: viewResult.name }
78+
{ namespace: viewResult.namespace ?? "", name: viewResult.name }
7479
];
7580
if (viewResult?.sections) {
7681
viewResult.sections.forEach((section) => {
7782
refs.push({
78-
namespace: section.viewRef.namespace,
83+
namespace: section.viewRef.namespace ?? "",
7984
name: section.viewRef.name
8085
});
8186
});
@@ -110,14 +115,18 @@ export function useViewData({
110115
}
111116

112117
const sectionsToRefresh =
113-
allSectionRefs.length > 0 &&
114-
allSectionRefs[0].namespace &&
115-
allSectionRefs[0].name
118+
allSectionRefs.length > 0 && allSectionRefs[0].name
116119
? allSectionRefs
117-
: result.data?.namespace && result.data.name
118-
? [{ namespace: result.data.namespace, name: result.data.name }]
120+
: result.data?.name
121+
? [{ namespace: result.data.namespace ?? "", name: result.data.name }]
119122
: [];
120123

124+
if (isDisplayPluginMode) {
125+
await queryClient.invalidateQueries({
126+
queryKey: ["viewDisplayPluginVariables", viewId, configId]
127+
});
128+
}
129+
121130
await queryClient.invalidateQueries({
122131
queryKey: isDisplayPluginMode
123132
? ["viewDataById", viewId, configId, variables]
@@ -149,9 +158,9 @@ export function useViewData({
149158

150159
return {
151160
viewResult,
152-
isLoading,
153-
isFetching,
154-
error,
161+
isLoading: isLoadingViewResult || isLoadingDisplayPluginVariables,
162+
isFetching: isFetchingViewResult || isFetchingDisplayPluginVariables,
163+
error: displayPluginVariablesError || viewResultError,
155164
aggregatedVariables: isDisplayPluginMode ? [] : aggregatedVariables,
156165
currentVariables,
157166
handleForceRefresh

0 commit comments

Comments
 (0)