fix bgColor and make team required

kartverket · Oct 30, 2024 · 961d763 · 961d763
1 parent 7ade01f
commit 961d763
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/components/function-card-edit.tsx b/src/components/function-card-edit.tsx
@@ -57,7 +57,7 @@ export function FunctionCardEdit({ functionId }: { functionId: number }) {
 	}
 
 	return (
-		<Flex flexDirection="column" paddingLeft="10px" p="2">
+		<Flex flexDirection="column" paddingLeft="10px" p="2" bgColor="white">
 			<Text fontSize="xs" fontWeight="700" mb="4px">
 				Funksjonsnavn*
 			</Text>
@@ -76,7 +76,7 @@ export function FunctionCardEdit({ functionId }: { functionId: number }) {
 				}}
 			/>
 			<Text fontSize="xs" fontWeight="700" mb="4px">
-				Ansvarlig team for denne funksjonen?
+				Ansvarlig team for denne funksjonen?*
 			</Text>
 			<Skeleton isLoaded={!!teams.data} fitContent>
 				<Select
@@ -87,7 +87,6 @@ export function FunctionCardEdit({ functionId }: { functionId: number }) {
 					borderRadius="5px"
 					defaultValue={currentTeam.data?.id}
 				>
-					<option value="no-team">Ingen team</option>
 					{teams.data?.map((team) => (
 						<option key={team.id} value={team.id}>
 							{team.displayName}
@@ -99,7 +98,7 @@ export function FunctionCardEdit({ functionId }: { functionId: number }) {
 				Svar på sikkerhetsspørsmål som er relevant for denne funksjonen
 			</Text>
 			<SchemaButton functionId={functionId} />
-			<Flex gap="12px" mt="32px">
+			<Flex gap="10px" mt="32px">
 				<Button
 					aria-label="decline"
 					variant="secondary"
@@ -129,6 +128,7 @@ export function FunctionCardEdit({ functionId }: { functionId: number }) {
 					leftIcon="delete"
 					size="sm"
 					colorScheme="blue"
+					ml="auto"
 					onClick={onOpen}
 				>
 					Slett funksjon

diff --git a/src/components/function-card.tsx b/src/components/function-card.tsx
@@ -21,7 +21,9 @@ export function FunctionCard({
 				style={{ borderRadius: "inherit" }}
 			>
 				<Flex
-					bgColor={selected ? "blue.50" : undefined}
+					bgColor={
+						selected && search.edit === undefined ? "blue.50" : undefined
+					}
 					display="flex"
 					borderRadius="inherit"
 					alignItems="center"

diff --git a/src/components/function-column.tsx b/src/components/function-column.tsx
@@ -47,7 +47,13 @@ export function FunctionColumn({ functionId }: FunctionFolderProps) {
 					Funksjon nivå {currentLevel + 1}
 				</Text>
 			</Box>
-			<Box border="1px" p="20px" borderColor="gray.400" minH="100%">
+			<Box
+				border="1px"
+				p="20px"
+				borderColor="gray.400"
+				minH="100%"
+				backgroundColor="white"
+			>
 				<Skeleton isLoaded={!!children.data} minH={60}>
 					<List display="flex" flexDirection="column" gap={2} marginBottom="2">
 						{children.data?.map((child) => (
@@ -115,10 +121,10 @@ export function FunctionColumn({ functionId }: FunctionFolderProps) {
 									size="sm"
 									borderRadius="5px"
 									mb="20px"
-                                    autoFocus
+									autoFocus
 								/>
 								<Text fontSize="xs" fontWeight="700" mb="4px">
-									Ansvarlig team for denne funksjonen?
+									Ansvarlig team for denne funksjonen?*
 								</Text>
 								<Skeleton isLoaded={!!teams.data} fitContent>
 									<Select
@@ -128,6 +134,7 @@ export function FunctionColumn({ functionId }: FunctionFolderProps) {
 										mb="30px"
 										size="sm"
 										borderRadius="5px"
+										required
 									>
 										{teams.data?.map((team) => (
 											<option key={team.id} value={team.id}>