Merge remote-tracking branch 'origin/ui/status-fix'

jhf · jhf · commit 1a4fd2cc1005 · 2025-10-14T14:22:54.000+02:00
diff --git a/app/src/app/dashboard/dashboard-client-content.tsx b/app/src/app/dashboard/dashboard-client-content.tsx
@@ -45,10 +45,9 @@ export const DashboardClientContent = ({
     : null;
 
   const lastEditBy = data?.last_edit_by_user_id
-    ? statbusUsers
-        .find((u: Tables<"user">) => u.id === editInfo.data?.last_edit_by_user_id)
-        ?.email?.split("@")[0]
-        .replace(/\./, " ")
+    ? statbusUsers.find(
+        (u: Tables<"user">) => u.id === editInfo.data?.last_edit_by_user_id
+      )?.display_name
     : null;
 
   return (
diff --git a/app/src/app/establishments/[id]/statistical-variables/statistical-variables-form.tsx b/app/src/app/establishments/[id]/statistical-variables/statistical-variables-form.tsx
@@ -6,6 +6,7 @@ import UnitNotFound from "@/components/statistical-unit-details/unit-not-found";
 import { useActionState, useEffect, useState } from "react";
 import { updateStatisticalVariables } from "@/app/legal-units/[id]/update-legal-unit-server-actions";
 import { EditableFieldWithMetadata } from "@/components/form/editable-field-with-metadata";
+import { InfoBox } from "@/components/info-box";
 
 export default function StatisticalVariablesForm({
   id,
@@ -41,6 +42,15 @@ export default function StatisticalVariablesForm({
 
   return (
     <div>
+      {data?.establishment?.[0].status?.used_for_counting === false && (
+        <InfoBox>
+          <p className="text-sm">
+            This unit has status{" "}
+            <strong>{data?.establishment?.[0].status?.name}</strong>, therefore
+            the statistical variables are not included in aggregates.
+          </p>
+        </InfoBox>
+      )}
       {statDefinitions.map((statDefinition) => {
         const stat = stats?.find(
           (s) => s.stat_definition_id === statDefinition.id
@@ -51,7 +61,8 @@ export default function StatisticalVariablesForm({
           <EditableFieldWithMetadata
             key={statDefinition.code}
             label={statDefinition.name ?? statDefinition.code!}
-            fieldId={`value_${statDefinition.type}`}
+            fieldId={statDefinition.code!}
+            fieldName={`value_${statDefinition.type}`}
             value={value || ""}
             response={statsState}
             formAction={statsAction}
diff --git a/app/src/app/import/components/time-context-selector.tsx b/app/src/app/import/components/time-context-selector.tsx
@@ -51,20 +51,20 @@ export function TimeContextSelector({ unitType }: TimeContextSelectorProps) {
     const options: ValidityOption[] = [];
     const jobProvidedDef = availableDefinitions.find(d => d.valid_time_from === 'job_provided');
     if (jobProvidedDef) {
-        options.push({
-            id: 'job_provided_time_context',
-            label: 'Apply a validity period to all records',
-            description: 'Select a predefined validity period to apply to all imported records.',
-            definition: jobProvidedDef,
-            useExplicitDates: false,
-        });
-        options.push({
-            id: 'job_provided_explicit_dates',
-            label: 'Provide an explicit start and end date',
-            description: 'These dates will be used as the default validity for all imported records.',
-            definition: jobProvidedDef,
-            useExplicitDates: true,
-        });
+      options.push({
+        id: 'job_provided_time_context',
+        label: 'Apply a validity period to all records',
+        description: 'Select a predefined validity period to apply to all imported records.',
+        definition: jobProvidedDef,
+        useExplicitDates: false,
+      });
+      // options.push({
+      //     id: 'job_provided_explicit_dates',
+      //     label: 'Provide an explicit start and end date',
+      //     description: 'These dates will be used as the default validity for all imported records.',
+      //     definition: jobProvidedDef,
+      //     useExplicitDates: true,
+      // });
     }
     const sourceColumnsDefs = availableDefinitions.filter(d => d.valid_time_from === 'source_columns');
     sourceColumnsDefs.forEach(def => {
diff --git a/app/src/app/legal-units/[id]/statistical-variables/statistical-variables-form.tsx b/app/src/app/legal-units/[id]/statistical-variables/statistical-variables-form.tsx
@@ -7,6 +7,7 @@ import { Tables } from "@/lib/database.types";
 import { useActionState, useEffect, useState } from "react";
 import { EditableFieldWithMetadata } from "@/components/form/editable-field-with-metadata";
 import { updateStatisticalVariables } from "../update-legal-unit-server-actions";
+import { InfoBox } from "@/components/info-box";
 
 export default function StatisticalVariablesForm({
   id,
@@ -40,6 +41,15 @@ export default function StatisticalVariablesForm({
   }
   return (
     <div>
+      {data?.legal_unit?.[0].status?.used_for_counting === false && (
+        <InfoBox>
+          <p className="text-sm">
+            This unit has status{" "}
+            <strong>{data?.legal_unit?.[0].status?.name}</strong>, therefore the
+            statistical variables are not included in aggregates.
+          </p>
+        </InfoBox>
+      )}
       {statDefinitions.map(
         (statDefinition: Tables<"stat_definition_active">) => {
           const stat = stats?.find(
@@ -51,7 +61,8 @@ export default function StatisticalVariablesForm({
             <EditableFieldWithMetadata
               key={statDefinition.code}
               label={statDefinition.name ?? statDefinition.code!}
-              fieldId={`value_${statDefinition.type}`}
+              fieldId={statDefinition.code!}
+              fieldName={`value_${statDefinition.type}`}
               value={value || ""}
               response={statsState}
               formAction={statsAction}
diff --git a/app/src/app/search/SearchResults.tsx b/app/src/app/search/SearchResults.tsx
@@ -20,6 +20,7 @@ import {
   regionDeriveStateUpdateFromSearchParams,
   sectorDeriveStateUpdateFromSearchParams,
   statusDeriveStateUpdateFromSearchParams,
+  lastEditByUserDeriveStateUpdateFromSearchParams,
   statisticalVariablesDeriveStateUpdateFromSearchParams,
   unitSizeDeriveStateUpdateFromSearchParams,
   unitTypeDeriveStateUpdateFromSearchParams,
@@ -55,15 +56,34 @@ const deriveStateFromUrl = (
   const sectorAction = sectorDeriveStateUpdateFromSearchParams(urlSearchParams);
   const activityCategoryAction = activityCategoryDeriveStateUpdateFromSearchParams(urlSearchParams);
   const statusAction = statusDeriveStateUpdateFromSearchParams(urlSearchParams);
-  const unitSizeAction = unitSizeDeriveStateUpdateFromSearchParams(urlSearchParams);
-  const dataSourceAction = dataSourceDeriveStateUpdateFromSearchParams(urlSearchParams);
-  const externalIdentActions = externalIdentTypes.map((extType) => externalIdentDeriveStateUpdateFromSearchParams(extType, urlSearchParams));
-  const statVarActions = statisticalVariablesDeriveStateUpdateFromSearchParams(statDefinitions, urlSearchParams);
+  const lastEditByUserAction =
+    lastEditByUserDeriveStateUpdateFromSearchParams(urlSearchParams);
+  const unitSizeAction =
+    unitSizeDeriveStateUpdateFromSearchParams(urlSearchParams);
+  const dataSourceAction =
+    dataSourceDeriveStateUpdateFromSearchParams(urlSearchParams);
+  const externalIdentActions = externalIdentTypes.map((extType) =>
+    externalIdentDeriveStateUpdateFromSearchParams(extType, urlSearchParams)
+  );
+  const statVarActions = statisticalVariablesDeriveStateUpdateFromSearchParams(
+    statDefinitions,
+    urlSearchParams
+  );
 
   const allActions = [
-    ftsAction, unitTypeAction, invalidCodesAction, legalFormAction, regionAction,
-    sectorAction, activityCategoryAction, statusAction, unitSizeAction, dataSourceAction,
-    ...externalIdentActions, ...statVarActions,
+    ftsAction,
+    unitTypeAction,
+    invalidCodesAction,
+    legalFormAction,
+    regionAction,
+    sectorAction,
+    activityCategoryAction,
+    statusAction,
+    lastEditByUserAction,
+    unitSizeAction,
+    dataSourceAction,
+    ...externalIdentActions,
+    ...statVarActions,
   ].filter(Boolean) as SearchAction[];
 
   let newInitialQuery = '';
diff --git a/app/src/app/search/components/statistical-unit-table-row.tsx b/app/src/app/search/components/statistical-unit-table-row.tsx
@@ -105,8 +105,7 @@ export const StatisticalUnitTableRow = ({
 
   const lastEditBy = statbusUsers
     .find((user: Tables<'user'>) => user.id === unit.last_edit_by_user_id)
-    ?.email?.split("@")[0]
-    .replace(/\./, " ");
+    ?.display_name
 
   const getCellClassName = (column: TableColumn) => {
     return cn(
@@ -160,10 +159,11 @@ export const StatisticalUnitTableRow = ({
                       <span className="font-medium">{unit.name}</span>
                     )}
                     <small className="text-gray-700 flex items-center space-x-1">
-                      <span className="flex">
+                      <span className="flex text-wrap">
                         {externalIdentTypes
                           ?.map(
-                            ({ code }: Tables<'external_ident_type_active'>) => unit.external_idents[code!] || "-"
+                            ({ code }: Tables<"external_ident_type_active">) =>
+                              unit.external_idents[code!] || "-"
                           )
                           .join(" | ")}
                       </span>
diff --git a/app/src/app/search/components/table-toolbar.tsx b/app/src/app/search/components/table-toolbar.tsx
@@ -15,6 +15,7 @@ import DataSourceFilter from "../filters/data-source/data-source-filter";
 import { ColumnSelectorButton } from "./column-selector-button";
 import StatusFilter from "../filters/status/status-filter";
 import UnitSizeFilter from "../filters/unit-size/unit-size-filter";
+import LastEditByUserFilter from "../filters/last-edit-by-user/last-edit-by-user-filter";
 
 export default function TableToolbar() {
   return (
@@ -45,6 +46,9 @@ export default function TableToolbar() {
       <FilterWrapper columnCode="data_sources">
         <DataSourceFilter />
       </FilterWrapper>
+      <FilterWrapper columnCode="last_edit">
+        <LastEditByUserFilter />
+      </FilterWrapper>
       <StatisticalVariablesFilter />
       <InvalidCodesFilter />
       <ResetFilterButton />
diff --git a/app/src/app/search/filters/last-edit-by-user/last-edit-by-user-filter.tsx b/app/src/app/search/filters/last-edit-by-user/last-edit-by-user-filter.tsx
@@ -0,0 +1,20 @@
+"use client";
+import LastEditByUserOptions from "@/app/search/filters/last-edit-by-user/last-edit-by-user-options";
+import { useBaseData } from "@/atoms/base-data";
+import { useMemo } from "react";
+
+export default function LastEditByUserFilter() {
+  const { statbusUsers } = useBaseData(); 
+
+  return (
+    <LastEditByUserOptions
+      options={
+        statbusUsers?.map(({ id, display_name }) => ({
+          label: display_name!,
+          value: id?.toString()!,
+          humanReadableValue: display_name!,
+        })) ?? []
+      }
+    />
+  );
+}
diff --git a/app/src/app/search/filters/last-edit-by-user/last-edit-by-user-options.tsx b/app/src/app/search/filters/last-edit-by-user/last-edit-by-user-options.tsx
@@ -0,0 +1,59 @@
+"use client";
+
+import { SearchFilterOption } from "../../search.d";
+import { OptionsFilter } from "../../components/options-filter";
+import { useCallback, useMemo } from "react";
+import { useSearchFilters } from "@/atoms/search";
+import { LAST_EDIT_BY_USER } from "../url-search-params";
+
+export default function LastEditByUserOptions({
+  options,
+}: {
+  readonly options: SearchFilterOption[];
+}) {
+  const { filters, updateFilters } = useSearchFilters();
+  const filterValue = filters[LAST_EDIT_BY_USER];
+  const selected = useMemo(() => {
+    if (Array.isArray(filterValue)) {
+      return filterValue as (string | null)[];
+    }
+    if (typeof filterValue === "string") {
+      return [filterValue];
+    }
+    return [];
+  }, [filterValue]);
+
+  const toggle = useCallback(
+    async ({ value }: SearchFilterOption) => {
+      const newSelectedValues = selected.includes(value)
+        ? selected.filter((v) => v !== value)
+        : [...selected, value];
+
+      const newFilters = {
+        ...filters,
+        [LAST_EDIT_BY_USER]: newSelectedValues,
+      };
+      updateFilters(newFilters);
+    },
+    [selected, filters, updateFilters]
+  );
+
+  const reset = useCallback(async () => {
+    const newFilters = {
+      ...filters,
+      [LAST_EDIT_BY_USER]: [],
+    };
+    updateFilters(newFilters);
+  }, [filters, updateFilters]);
+
+  return (
+    <OptionsFilter
+      className="p-2 h-9"
+      title="Last Edit By"
+      options={options}
+      selectedValues={selected}
+      onToggle={toggle}
+      onReset={reset}
+    />
+  );
+}
diff --git a/app/src/app/search/filters/url-search-params.ts b/app/src/app/search/filters/url-search-params.ts
@@ -229,6 +229,31 @@ export function unitSizeDeriveStateUpdateFromValues(
   return result;
 }
 
+export const LAST_EDIT_BY_USER = "last_edit_by_user_id";
+
+export function lastEditByUserDeriveStateUpdateFromSearchParams(
+  urlSearchParams: URLSearchParams
+): SearchAction {
+  const initialValue = urlSearchParams.get(LAST_EDIT_BY_USER);
+  const initialValues = parseInitialValues(initialValue);
+  return lastEditByUserDeriveStateUpdateFromValues(initialValues);
+}
+
+export function lastEditByUserDeriveStateUpdateFromValues(
+  values: (string | null)[]
+): SearchAction {
+  let result = {
+    type: "set_query",
+    payload: {
+      app_param_name: LAST_EDIT_BY_USER,
+      api_param_name: LAST_EDIT_BY_USER,
+      api_param_value: values.length ? `in.(${values.join(",")})` : null,
+      app_param_values: values,
+    },
+  } as SearchAction;
+  return result;
+}                               
+
 export const DATA_SOURCE = "data_source";
 
 export function dataSourceDeriveStateUpdateFromSearchParams(urlSearchParams: URLSearchParams): SearchAction {
diff --git a/app/src/app/search/hooks/useSearchUrlSync.ts b/app/src/app/search/hooks/useSearchUrlSync.ts
@@ -34,6 +34,7 @@ import {
   regionDeriveStateUpdateFromSearchParams,
   sectorDeriveStateUpdateFromSearchParams,
   statusDeriveStateUpdateFromSearchParams,
+  lastEditByUserDeriveStateUpdateFromSearchParams,
   statisticalVariablesDeriveStateUpdateFromSearchParams,
   unitSizeDeriveStateUpdateFromSearchParams,
   unitTypeDeriveStateUpdateFromSearchParams,
@@ -142,6 +143,7 @@ export function useSearchUrlSync() {
       sectorDeriveStateUpdateFromSearchParams(urlParams),
       activityCategoryDeriveStateUpdateFromSearchParams(urlParams),
       statusDeriveStateUpdateFromSearchParams(urlParams),
+      lastEditByUserDeriveStateUpdateFromSearchParams(urlParams),
       unitSizeDeriveStateUpdateFromSearchParams(urlParams),
       dataSourceDeriveStateUpdateFromSearchParams(urlParams),
     ];
diff --git a/app/src/atoms/edits.ts b/app/src/atoms/edits.ts
@@ -172,7 +172,7 @@ const detailsPageDataPromiseAtom = atomWithRefresh<Promise<DetailsPageData>>(
         client.from("data_source_available").select(),
         client.from("region").select(),
         client.from("country").select(),
-        client.from("status").select(),
+        client.from("status").select().eq("active", true),
         client.from("activity_category_available").select(),
         client.from("legal_form_available").select(),
         client.from("sector_available").select(),
diff --git a/app/src/atoms/search.ts b/app/src/atoms/search.ts
@@ -26,6 +26,7 @@ import {
   sectorDeriveStateUpdateFromValues,
   activityCategoryDeriveStateUpdateFromValues,
   statusDeriveStateUpdateFromValues,
+  lastEditByUserDeriveStateUpdateFromValues,
   unitSizeDeriveStateUpdateFromValues,
   dataSourceDeriveStateUpdateFromValues,
   externalIdentDeriveStateUpdateFromValues,
@@ -38,6 +39,7 @@ import {
   SECTOR,
   ACTIVITY_CATEGORY_PATH,
   STATUS,
+  LAST_EDIT_BY_USER,
   UNIT_SIZE,
   DATA_SOURCE,
 } from '../app/search/filters/url-search-params'
@@ -734,6 +736,18 @@ const derivedApiSearchParamsAtomUnstable = atom((get) => {
         if (unitSizeAction.type === "set_query")
           actionPayloadPart = unitSizeAction.payload;
         break;
+      case LAST_EDIT_BY_USER:
+        const ensuredLastEditByUserValues = Array.isArray(appParamValue)
+          ? appParamValue.map((v) => (v == null ? null : String(v)))
+          : appParamValue != null
+            ? [String(appParamValue)]
+            : [];
+        const lastEditByUserAction = lastEditByUserDeriveStateUpdateFromValues(
+          ensuredLastEditByUserValues
+        );
+        if (lastEditByUserAction.type === "set_query")
+          actionPayloadPart = lastEditByUserAction.payload;
+        break;
       case DATA_SOURCE:
         const ensuredDataSourceValues = Array.isArray(appParamValue)
           ? appParamValue.map((v) => (v == null ? null : String(v)))
diff --git a/app/src/components/form/editable-field-with-metadata.tsx b/app/src/components/form/editable-field-with-metadata.tsx
diff --git a/app/src/components/form/metadata-tooltip.tsx b/app/src/components/form/metadata-tooltip.tsx
diff --git a/app/src/components/statistical-unit-hierarchy/topology-item.tsx b/app/src/components/statistical-unit-hierarchy/topology-item.tsx
