Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/pages/views/components/ViewSection.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from "react";
import React, { useMemo, useState } from "react";
import { useQuery } from "@tanstack/react-query";
import { IoChevronDownOutline } from "react-icons/io5";
import { getViewDataByNamespace } from "../../../api/services/views";
Expand All @@ -12,11 +12,13 @@ import { ErrorViewer } from "@flanksource-ui/components/ErrorViewer";
interface ViewSectionProps {
section: Section;
hideVariables?: boolean;
variables?: Record<string, string>;
}

const ViewSection: React.FC<ViewSectionProps> = ({
section,
hideVariables
hideVariables,
variables: defaultVariables
}) => {
const [isExpanded, setIsExpanded] = useState(true);
const { namespace, name } = section.viewRef;
Expand All @@ -25,7 +27,14 @@ const ViewSection: React.FC<ViewSectionProps> = ({
// NOTE: Backend uses view variables (template parameters) to partition the rows in the view table.
// We must remove the global query parameters from the URL params.
const [viewVarParams] = usePrefixedSearchParams(VIEW_VAR_PREFIX, false);
const currentViewVariables = Object.fromEntries(viewVarParams.entries());
const paramVariables = useMemo(
() => Object.fromEntries(viewVarParams.entries()),
[viewVarParams]
);
const currentViewVariables = useMemo(
() => ({ ...(defaultVariables ?? {}), ...paramVariables }),
[defaultVariables, paramVariables]
);

// Fetch section view data with independent variables
const {
Expand Down
7 changes: 6 additions & 1 deletion src/pages/views/components/ViewWithSections.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const ViewWithSections: React.FC<ViewWithSectionsProps> = ({
key={`${namespace || "default"}:${name}`}
section={primaryViewSection}
hideVariables
variables={currentVariables}
/>
</div>
)}
Expand All @@ -70,7 +71,11 @@ const ViewWithSections: React.FC<ViewWithSectionsProps> = ({
key={`${section.viewRef.namespace || "default"}:${section.viewRef.name}`}
className="mt-4"
>
<ViewSection section={section} hideVariables />
<ViewSection
section={section}
hideVariables
variables={currentVariables}
/>
</div>
))}
</>
Expand Down
Loading