From a691f5a77b2f30b8a312465dab9a9955a50866c1 Mon Sep 17 00:00:00 2001
From: hegeaal <hegeaal@gmail.com>
Date: Wed, 22 Jan 2025 12:35:28 +0100
Subject: [PATCH] fix: should be possible to not select accessRight

---
 .../dataset-form-access-rights-section.tsx    |  9 ++--
 .../distribution-details.tsx                  | 16 +++---
 .../dataset-form/components/theme-section.tsx | 51 ++++++++++---------
 .../utils/dataset-initial-values.tsx          |  1 -
 .../components/access-rights-details.tsx      |  6 +--
 .../utils/src/lib/language/dataset.form.nb.ts |  5 --
 libs/utils/src/lib/language/nb.ts             |  7 +++
 7 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/apps/dataset-catalog/components/dataset-form/components/access-rights.tsx/dataset-form-access-rights-section.tsx b/apps/dataset-catalog/components/dataset-form/components/access-rights.tsx/dataset-form-access-rights-section.tsx
index 7f5de65cf..52a5ca97e 100644
--- a/apps/dataset-catalog/components/dataset-form/components/access-rights.tsx/dataset-form-access-rights-section.tsx
+++ b/apps/dataset-catalog/components/dataset-form/components/access-rights.tsx/dataset-form-access-rights-section.tsx
@@ -7,9 +7,10 @@ import { AccessRightsUriTable } from './access-rights-uri-table';
 import styles from '../../dataset-form.module.css';
 
 const accessRightsOptions = [
-  { value: AccessRights.PUBLIC, label: localization.datasetForm.accessRight.public },
-  { value: AccessRights.RESTRICTED, label: localization.datasetForm.accessRight.restricted },
-  { value: AccessRights.NON_PUBLIC, label: localization.datasetForm.accessRight.nonPublic },
+  { value: '', label: localization.accessRight.none },
+  { value: AccessRights.PUBLIC, label: localization.accessRight.public },
+  { value: AccessRights.RESTRICTED, label: localization.accessRight.restricted },
+  { value: AccessRights.NON_PUBLIC, label: localization.accessRight.nonPublic },
 ];
 
 export const AccessRightFields = () => {
@@ -34,7 +35,7 @@ export const AccessRightFields = () => {
           <Combobox
             id='accessRights.uri-combobox'
             size='sm'
-            value={[values.accessRights?.uri || AccessRights.PUBLIC]}
+            value={[values?.accessRights?.uri || '']}
             onValueChange={(values) => setFieldValue('accessRights.uri', values.toString())}
             virtual
           >
diff --git a/apps/dataset-catalog/components/dataset-form/components/distribution-section/distribution-details.tsx b/apps/dataset-catalog/components/dataset-form/components/distribution-section/distribution-details.tsx
index 6256c7fab..abcf8f684 100644
--- a/apps/dataset-catalog/components/dataset-form/components/distribution-section/distribution-details.tsx
+++ b/apps/dataset-catalog/components/dataset-form/components/distribution-section/distribution-details.tsx
@@ -58,8 +58,8 @@ export const DistributionDetails = ({ distribution, searchEnv, referenceDataEnv,
                 size='2xs'
               >{`${localization.datasetForm.fieldLabel.mediaType}:`}</Heading>
               <ul className={styles.list}>
-                {distribution?.mediaType?.map((uri, index) => (
-                  <li key={`mediatype-${uri}-${index}`}>
+                {distribution?.mediaType?.map((uri) => (
+                  <li key={`mediatype-${uri}`}>
                     <Tag
                       size='sm'
                       color='info'
@@ -88,10 +88,10 @@ export const DistributionDetails = ({ distribution, searchEnv, referenceDataEnv,
                 </Table.Head>
                 <Table.Body>
                   {distribution.accessServiceUris &&
-                    distribution.accessServiceUris.map((uri, i) => {
+                    distribution.accessServiceUris.map((uri) => {
                       const match = selectedDataServices?.find((type) => type.uri === uri);
                       return match ? (
-                        <Table.Row key={`accessSerivce-row-${i}`}>
+                        <Table.Row key={`accessSerivce-row-${uri}`}>
                           <Table.Cell>
                             <Link href={getDataNorgeUri(match.id, 'data-services')}>
                               {getTranslateText(match?.title, language) || localization.noTitleAvailable}
@@ -99,9 +99,7 @@ export const DistributionDetails = ({ distribution, searchEnv, referenceDataEnv,
                           </Table.Cell>
                           <Table.Cell>{getTranslateText(match?.organization?.prefLabel)}</Table.Cell>
                         </Table.Row>
-                      ) : (
-                        <></>
-                      );
+                      ) : null;
                     })}
                 </Table.Body>
               </Table>
@@ -140,8 +138,8 @@ export const DistributionDetails = ({ distribution, searchEnv, referenceDataEnv,
                   </Table.Row>
                 </Table.Head>
                 <TableBody>
-                  {distribution?.conformsTo.map((conform, index) => (
-                    <Table.Row key={`conformsTo-${index}-${conform.uri}`}>
+                  {distribution?.conformsTo.map((conform) => (
+                    <Table.Row key={`conformsTo-${conform.uri}`}>
                       <Table.Cell>{getTranslateText(conform.prefLabel, language)}</Table.Cell>
                       <Table.Cell>{conform.uri}</Table.Cell>
                     </Table.Row>
diff --git a/apps/dataset-catalog/components/dataset-form/components/theme-section.tsx b/apps/dataset-catalog/components/dataset-form/components/theme-section.tsx
index b8019488d..dba85ef3e 100644
--- a/apps/dataset-catalog/components/dataset-form/components/theme-section.tsx
+++ b/apps/dataset-catalog/components/dataset-form/components/theme-section.tsx
@@ -1,9 +1,8 @@
 import { Dataset, DataTheme, LosTheme, Option } from '@catalog-frontend/types';
 import { LabelWithHelpTextAndTag } from '@catalog-frontend/ui';
-import { Combobox } from '@digdir/designsystemet-react';
+import { Combobox, Fieldset } from '@digdir/designsystemet-react';
 import { getTranslateText, localization } from '@catalog-frontend/utils';
 import { FastField, useFormikContext } from 'formik';
-import styles from '../dataset-form.module.css';
 
 type Props = {
   losThemes: LosTheme[];
@@ -18,16 +17,18 @@ export const ThemeSection = ({ losThemes, euDataThemes }: Props) => {
 
   return (
     <>
-      <div className={styles.fieldContainer}>
-        <LabelWithHelpTextAndTag
-          tagTitle={localization.tag.required}
-          helpAriaLabel={localization.datasetForm.fieldLabel.euDataTheme}
-          helpText={localization.datasetForm.helptext.euDataTheme}
-          fieldId='euDataTheme-combobox'
-        >
-          {localization.datasetForm.fieldLabel.euDataTheme}
-        </LabelWithHelpTextAndTag>
-
+      <Fieldset
+        legend={
+          <LabelWithHelpTextAndTag
+            tagTitle={localization.tag.required}
+            helpAriaLabel={localization.datasetForm.fieldLabel.euDataTheme}
+            helpText={localization.datasetForm.helptext.euDataTheme}
+            fieldId='euDataTheme-combobox'
+          >
+            {localization.datasetForm.fieldLabel.euDataTheme}
+          </LabelWithHelpTextAndTag>
+        }
+      >
         <FastField
           id='euDataTheme-combobox'
           as={Combobox}
@@ -38,7 +39,7 @@ export const ThemeSection = ({ losThemes, euDataThemes }: Props) => {
           value={values.euDataTheme}
           onValueChange={(values: string[]) => setFieldValue('euDataTheme', values)}
           size='sm'
-          virtual
+          portal={false}
         >
           <Combobox.Empty>{localization.search.noHits}</Combobox.Empty>
           {euDataThemes &&
@@ -51,16 +52,19 @@ export const ThemeSection = ({ losThemes, euDataThemes }: Props) => {
               </Combobox.Option>
             ))}
         </FastField>
-      </div>
-      <div className={styles.fieldContainer}>
-        <LabelWithHelpTextAndTag
-          helpAriaLabel={localization.datasetForm.fieldLabel.losTheme}
-          helpText={localization.datasetForm.helptext.losTheme}
-          fieldId='losTheme-combobox'
-        >
-          {localization.datasetForm.fieldLabel.losTheme}
-        </LabelWithHelpTextAndTag>
+      </Fieldset>
 
+      <Fieldset
+        legend={
+          <LabelWithHelpTextAndTag
+            helpAriaLabel={localization.datasetForm.fieldLabel.losTheme}
+            helpText={localization.datasetForm.helptext.losTheme}
+            fieldId='losTheme-combobox'
+          >
+            {localization.datasetForm.fieldLabel.losTheme}
+          </LabelWithHelpTextAndTag>
+        }
+      >
         <FastField
           id='losTheme-combobox'
           as={Combobox}
@@ -70,7 +74,6 @@ export const ThemeSection = ({ losThemes, euDataThemes }: Props) => {
           placeholder={`${localization.search.search}...`}
           onValueChange={(values: string[]) => setFieldValue('losTheme', values)}
           size='sm'
-          virtual
         >
           <Combobox.Empty>{localization.search.noHits}</Combobox.Empty>
           {losThemes?.map((theme) => (
@@ -82,7 +85,7 @@ export const ThemeSection = ({ losThemes, euDataThemes }: Props) => {
             </Combobox.Option>
           ))}
         </FastField>
-      </div>
+      </Fieldset>
     </>
   );
 };
diff --git a/apps/dataset-catalog/components/dataset-form/utils/dataset-initial-values.tsx b/apps/dataset-catalog/components/dataset-form/utils/dataset-initial-values.tsx
index bd7346d59..0f7154458 100644
--- a/apps/dataset-catalog/components/dataset-form/utils/dataset-initial-values.tsx
+++ b/apps/dataset-catalog/components/dataset-form/utils/dataset-initial-values.tsx
@@ -66,7 +66,6 @@ export const datasetToBeCreatedTemplate = (): DatasetToBeCreated => {
     losTheme: [],
     type: undefined,
     keywordList: { nb: [] },
-    keyword: [{ nb: '' }],
     conceptList: [],
     provenance: undefined,
     accrualPeriodicity: undefined,
diff --git a/apps/dataset-catalog/components/details-page-columns/components/access-rights-details.tsx b/apps/dataset-catalog/components/details-page-columns/components/access-rights-details.tsx
index dafd97300..887e2c91c 100644
--- a/apps/dataset-catalog/components/details-page-columns/components/access-rights-details.tsx
+++ b/apps/dataset-catalog/components/details-page-columns/components/access-rights-details.tsx
@@ -46,9 +46,9 @@ export const AccessRightsDetails = ({ dataset }: Props) => {
 
   const accessRightsOptions = useMemo(
     () => [
-      { value: AccessRights.PUBLIC, label: localization.datasetForm.accessRight.public },
-      { value: AccessRights.RESTRICTED, label: localization.datasetForm.accessRight.restricted },
-      { value: AccessRights.NON_PUBLIC, label: localization.datasetForm.accessRight.nonPublic },
+      { value: AccessRights.PUBLIC, label: localization.accessRight.public },
+      { value: AccessRights.RESTRICTED, label: localization.accessRight.restricted },
+      { value: AccessRights.NON_PUBLIC, label: localization.accessRight.nonPublic },
     ],
     [],
   );
diff --git a/libs/utils/src/lib/language/dataset.form.nb.ts b/libs/utils/src/lib/language/dataset.form.nb.ts
index 9cce5b299..11bb9846b 100644
--- a/libs/utils/src/lib/language/dataset.form.nb.ts
+++ b/libs/utils/src/lib/language/dataset.form.nb.ts
@@ -80,11 +80,6 @@ export const datasetFormNb = {
     informationModel: 'Informasjonsmodell',
     contactPoint: 'Kontaktpunkt',
   },
-  accessRight: {
-    public: 'Allmenn tilgang',
-    restricted: 'Betinget tilgang',
-    nonPublic: 'Ikke-allmenn tilgang',
-  },
   fieldLabel: {
     losTheme: 'LOS-tema(er)',
     euDataTheme: 'Hovedtema(er)',
diff --git a/libs/utils/src/lib/language/nb.ts b/libs/utils/src/lib/language/nb.ts
index 0d0105393..46c1247c5 100644
--- a/libs/utils/src/lib/language/nb.ts
+++ b/libs/utils/src/lib/language/nb.ts
@@ -496,4 +496,11 @@ export const nb = {
   icon: {
     trash: 'Søppelikon',
   },
+
+  accessRight: {
+    public: 'Allmenn tilgang',
+    restricted: 'Betinget tilgang',
+    nonPublic: 'Ikke-allmenn tilgang',
+    none: 'Ingen tilgangsrettighet valgt',
+  },
 };