Changes to owner

pyproject.toml

@@ -29,7 +29,7 @@ dash = ">=2.15.0"
 pydantic = "==2.5.2"
 dash-bootstrap-components = ">=1.1.0"
 pandas = ">=1.4.2"
-ssb-datadoc-model = "==4.2.0"
+ssb-datadoc-model = "==4.3.1"
 dapla-toolbelt = ">=1.3.3"
 gunicorn = ">=21.2.0"
 flask-healthz = ">=0.0.3"

src/datadoc/app.py

@@ -14,9 +14,9 @@
 
 from datadoc import config
 from datadoc import state
+from datadoc.backend.code_list import CodeList
 from datadoc.backend.datadoc_metadata import DataDocMetadata
 from datadoc.backend.statistic_subject_mapping import StatisticSubjectMapping
-from datadoc.backend.unit_types import UnitTypes
 from datadoc.enums import SupportedLanguages
 from datadoc.frontend.callbacks.register_callbacks import register_callbacks
 from datadoc.frontend.callbacks.register_callbacks import (
@@ -139,10 +139,14 @@ def collect_data_from_external_sources() -> None:
         config.get_statistical_subject_source_url(),
     )
 
-    state.unit_types = UnitTypes(
+    state.unit_types = CodeList(
         config.get_unit_code(),
     )
 
+    state.organisational_units = CodeList(
+        config.get_organisational_unit_code(),
+    )
+
 
 def main(dataset_path: str | None = None) -> None:
     """Entrypoint when running as a script."""

src/datadoc/backend/unit_types.py → src/datadoc/backend/code_list.py

@@ -16,37 +16,40 @@
 
 
 @dataclass
-class UnitType:
-    """Data structure for the a unit type."""
+class CodeListItem:
+    """Data structure for the a code list item."""
 
     titles: dict[str, str]
     unit_code: str
 
     def get_title(self, language: SupportedLanguages) -> str:
         """Get the title in the given language."""
         try:
-            return self.titles[
-                (
-                    # Adjust to language codes in the UnitTypes structure.
-                    "nb"
-                    if language
-                    in [
-                        SupportedLanguages.NORSK_BOKMÅL,
-                        SupportedLanguages.NORSK_NYNORSK,
-                    ]
-                    else "en"
-                )
-            ]
+            return self.titles[language]
         except KeyError:
-            logger.exception(
-                "Could not find title for subject %s  and language: %s",
-                self,
-                language.name,
-            )
-            return ""
+            try:
+                return self.titles[
+                    (
+                        # Adjust to language codes in the unit_type codelist.
+                        "nb"
+                        if language
+                        in [
+                            SupportedLanguages.NORSK_BOKMÅL,
+                            SupportedLanguages.NORSK_NYNORSK,
+                        ]
+                        else "en"
+                    )
+                ]
+            except KeyError:
+                logger.exception(
+                    "Could not find title for subject %s  and language: %s",
+                    self,
+                    language.name,
+                )
+                return ""
 
 
-class UnitTypes(GetExternalSource):
+class CodeList(GetExternalSource):
     """Class for retrieving classifications from Klass."""
 
     def __init__(self, classification_id: int | None) -> None:
@@ -58,13 +61,9 @@ def __init__(self, classification_id: int | None) -> None:
             SupportedLanguages.NORSK_BOKMÅL.value,
             SupportedLanguages.ENGLISH.value,
         ]
-
-        self._classifications: list[UnitType] = []
-
+        self._classifications: list[CodeListItem] = []
         self.classification_id = classification_id
-
         self.classifications_dataframes: dict[str, pd.DataFrame] | None = None
-
         super().__init__()
 
     def _fetch_data_from_external_source(
@@ -85,7 +84,6 @@ def _fetch_data_from_external_source(
                     .get_codes()
                     .data
                 )
-
         except Exception:
             logger.exception(
                 "Exception while getting classifications from Klass",
@@ -113,7 +111,7 @@ def _extract_titles(
     def _create_unit_types_from_dataframe(
         self,
         classifications_dataframes: dict[SupportedLanguages, pd.DataFrame],
-    ) -> list[UnitType]:
+    ) -> list[CodeListItem]:
         """Method that finds the name column in the dataframe, and returns all values in a list."""
         classification_names = self._extract_titles(classifications_dataframes)
         classification_codes: list
@@ -128,7 +126,7 @@ def _create_unit_types_from_dataframe(
         unit_types = []
         for a, b in zip(classification_names, classification_codes):
             unit_types.append(
-                UnitType(a, b),
+                CodeListItem(a, b),
             )
         return unit_types
 
@@ -151,7 +149,7 @@ def _get_classification_dataframe_if_loaded(self) -> bool:
         return False
 
     @property
-    def classifications(self) -> list[UnitType]:
+    def classifications(self) -> list[CodeListItem]:
         """Getter for primary subjects."""
         self._get_classification_dataframe_if_loaded()
         logger.debug("Got %s classifications subjects", len(self._classifications))

src/datadoc/backend/external_sources/external_sources.py

@@ -21,7 +21,6 @@ def __init__(self) -> None:
         Initializes the future object.
         """
         self.future: concurrent.futures.Future[T | None] | None = None
-
         executor = concurrent.futures.ThreadPoolExecutor(max_workers=1)
         self.future = executor.submit(
             self._fetch_data_from_external_source,

src/datadoc/config.py

@@ -133,3 +133,8 @@ def get_oidc_token() -> str | None:
 def get_unit_code() -> int | None:
     """The code for the Unit Type code list in Klass."""
     return int(_get_config_item("DATADOC_UNIT_CODE") or 702)
+
+
+def get_organisational_unit_code() -> int | None:
+    """The code for the organisational units code list in Klass."""
+    return int(_get_config_item("DATADOC_ORGANISATIONAL_UNIT_CODE") or 83)

src/datadoc/frontend/fields/display_dataset.py

@@ -66,6 +66,19 @@ def get_unit_type_options(
     ]
 
 
+def get_owner_options(
+    language: SupportedLanguages,
+) -> list[dict[str, str]]:
+    """Collect the owner options for the given language."""
+    return [
+        {
+            "label": f"{option.unit_code} - {option.get_title(language)}",
+            "value": option.unit_code,
+        }
+        for option in state.organisational_units.classifications
+    ]
+
+
 class DatasetIdentifiers(str, Enum):
     """As defined here: https://statistics-norway.atlassian.net/l/c/aoSfEWJU."""
 
@@ -225,13 +238,14 @@ class DatasetIdentifiers(str, Enum):
         editable=False,
         value_getter=get_metadata_and_stringify,
     ),
-    DatasetIdentifiers.OWNER: DisplayDatasetMetadata(
+    DatasetIdentifiers.OWNER: DisplayDatasetMetadataDropdown(
         identifier=DatasetIdentifiers.OWNER.value,
         display_name="Eier",
         description="Maskingenerert seksjonstilhørighet til den som oppretter metadata om datasettet, men kan korrigeres manuelt",
         obligatory=True,
-        editable=False,
-        multiple_language_support=True,
+        editable=True,
+        multiple_language_support=False,
+        options_getter=get_owner_options,
     ),
     DatasetIdentifiers.FILE_PATH: DisplayDatasetMetadata(
         identifier=DatasetIdentifiers.FILE_PATH.value,

src/datadoc/state.py

@@ -13,9 +13,9 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
+    from datadoc.backend.code_list import CodeList
     from datadoc.backend.datadoc_metadata import DataDocMetadata
     from datadoc.backend.statistic_subject_mapping import StatisticSubjectMapping
-    from datadoc.backend.unit_types import UnitTypes
     from datadoc.enums import SupportedLanguages
 
 
@@ -26,4 +26,6 @@
 
 statistic_subject_mapping: StatisticSubjectMapping
 
-unit_types: UnitTypes
+unit_types: CodeList
+
+organisational_units: CodeList