From 53ac4bc4fc5add184aa1c85b666b7080d392e6ab Mon Sep 17 00:00:00 2001 From: malinnsnieske Date: Mon, 13 Jan 2025 10:59:23 +0100 Subject: [PATCH 1/3] remove rr-skjema metadata from config (#207) Co-authored-by: Mailn Nifeli Snieske --- frisk.config.tsx | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/frisk.config.tsx b/frisk.config.tsx index b16bfa7..f821b70 100644 --- a/frisk.config.tsx +++ b/frisk.config.tsx @@ -72,33 +72,6 @@ export async function getConfig(): Promise { return { displayValue: "Utviklerportalen" }; }, }, - { - key: "rr-skjema", - type: "text", - displayName: "Skjema (legacy)", - label: "Regelrett skjema", - showOn: "readOnly", - isRequired: false, - placeholder: "Sett inn skjema", - inheritFromParent: false, - isDeletable: true, - getDisplayValue: async (input) => { - const [contextId, tableName, __] = input.value.split(":splitTarget:"); - const searchParams = new URLSearchParams({ - redirectBackUrl: window.location.href, - redirectBackTitle: "Funksjonsregisteret", - }); - const url = `${getregelrettFrontendUrl()}/context/${contextId}?${searchParams.toString()}`; - return { - displayValue: tableName.replaceAll("+", " "), - value: url, - displayOptions: { - type: "url", - isExternal: false, - }, - }; - }, - }, ...schemas.map( (schema): InputMetadata => ({ key: schema.id, From 09c1dfd0ebc51ca58534323c50bfb4ff7d09c74a Mon Sep 17 00:00:00 2001 From: malinnsnieske Date: Mon, 13 Jan 2025 10:59:43 +0100 Subject: [PATCH 2/3] add stopPropagation to make button clickable (#208) Co-authored-by: Mailn Nifeli Snieske --- src/components/metadata/metadata-view.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/metadata/metadata-view.tsx b/src/components/metadata/metadata-view.tsx index f3450a5..a5e3bf1 100644 --- a/src/components/metadata/metadata-view.tsx +++ b/src/components/metadata/metadata-view.tsx @@ -189,7 +189,10 @@ function LinkView({ variant="tertiary" size="sm" color="black" - onClick={onOpen} + onClick={(e) => { + e.stopPropagation(); + onOpen(); + }} /> )} {functionId && metadataId && ( From b1aa4e6d78bd278623c9073226c7142538e9d9d5 Mon Sep 17 00:00:00 2001 From: malinnsnieske Date: Mon, 13 Jan 2025 15:26:31 +0100 Subject: [PATCH 3/3] fix path in search field (#210) Co-authored-by: Mailn Nifeli Snieske --- src/components/search-field.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/search-field.tsx b/src/components/search-field.tsx index 9ba10c6..d040319 100644 --- a/src/components/search-field.tsx +++ b/src/components/search-field.tsx @@ -4,6 +4,7 @@ import { Route } from "@/routes"; export function SearchField() { const navigate = Route.useNavigate(); + const search = Route.useSearch(); return ( @@ -22,7 +23,7 @@ export function SearchField() { }} onChange={(newFunc: { value: string } | null) => { if (newFunc) { - navigate({ search: { path: [newFunc.value] } }); + navigate({ search: { ...search, path: [newFunc.value] } }); } }} placeholder="Søk på funksjonsnavnet her..."