Merge branch 'feature/consistency-before-first-prod-deployment'

Author: jhf

app/src/app/activity-categories/use-activity-categories.ts

@@ -16,13 +16,13 @@ export type Queries = {
 };
 
 type ActivityCategoryResult = {
-  activityCategories: Tables<"activity_category_available">[];
+  activityCategories: Tables<"activity_category_enabled">[];
   count: number;
 };
 
 const fetcher: Fetcher<ActivityCategoryResult, { pagination: Pagination; queries: Queries }> = async ({ pagination, queries }) => {
   const client = await getBrowserRestClient();
-  let query = client.from('activity_category_available').select('*', { count: 'exact' });
+  let query = client.from('activity_category_enabled').select('*', { count: 'exact' });
 
   const offset = pagination.pageNumber && pagination.pageSize
     ? (pagination.pageNumber - 1) * pagination.pageSize

app/src/app/dashboard/statistical-variable-count-card.tsx

@@ -9,7 +9,7 @@ import { useAtomValue } from 'jotai';
 import { statDefinitionsAtom } from '@/atoms/base-data'; // Assuming statDefinitionsAtom holds the active ones or we need a new atom
 
 export const StatisticalVariableCountCard = () => {
-  // This atom currently holds all stat_definition_active from baseDataAtom.
+  // This atom currently holds all stat_definition_enabled from baseDataAtom.
   // If you need a specific atom that just fetches the count, it should be created.
   // For now, we derive the count from the length of the statDefinitions array.
   const statDefinitions = useAtomValue(statDefinitionsAtom);

app/src/app/getting-started/getting-started-server-actions.ts

@@ -12,7 +12,7 @@ interface State {
 export type UploadView =
   | "region_upload"
   | "import_legal_unit_current"
-  | "activity_category_available_custom"
+  | "activity_category_enabled_custom"
   | "import_establishment_current_for_legal_unit"
   | "import_establishment_current_without_legal_unit"
   | "sector_custom_only"
@@ -98,10 +98,32 @@ export async function setSettings(formData: FormData) {
   }
 
   try {
+    // region_version_id is required — use form value if provided, else fetch the initial one
+    const regionVersionIdFormEntry = formData.get("region_version_id");
+    let regionVersionId: number;
+    if (regionVersionIdFormEntry) {
+      regionVersionId = parseInt(regionVersionIdFormEntry.toString(), 10);
+      if (isNaN(regionVersionId)) {
+        return { error: "Invalid region version provided" };
+      }
+    } else {
+      const { data: rv, error: rvError } = await client
+        .from("region_version")
+        .select("id")
+        .eq("code", "initial")
+        .limit(1)
+        .single();
+      if (rvError || !rv) {
+        return { error: "Could not find initial region version" };
+      }
+      regionVersionId = rv.id;
+    }
+
     const response = await client.from("settings").upsert(
       {
         activity_category_standard_id: activityCategoryStandardId,
         country_id: countryId,
+        region_version_id: regionVersionId,
       },
       {
         onConflict: "only_one_setting",

app/src/app/getting-started/upload-custom-activity-standard-codes/page.tsx

@@ -37,7 +37,7 @@ const CustomActivityCodesCountDisplay = () => {
         </InfoBox>
       )}
       <UploadCSVForm
-        uploadView="activity_category_available_custom"
+        uploadView="activity_category_enabled_custom"
         nextPage="/getting-started/upload-regions"
         refreshRelevantCounts={async () => refreshCodesCount()}
       />

app/src/app/legal-units/[id]/general-info/general-info-form.tsx

@@ -104,7 +104,7 @@ export default function GeneralInfoForm({ id }: { readonly id: string }) {
       />
       <div className="grid lg:grid-cols-2 gap-4 p-2">
         {externalIdentTypes.map(
-          (type: Tables<"external_ident_type_active">) => {
+          (type: Tables<"external_ident_type_enabled">) => {
             const value = legalUnit?.external_idents[type.code];
 
             // Use hierarchical field component for hierarchical identifier types

app/src/app/legal-units/[id]/statistical-variables/statistical-variables-form.tsx

@@ -51,7 +51,7 @@ export default function StatisticalVariablesForm({
         </InfoBox>
       )}
       {statDefinitions.map(
-        (statDefinition: Tables<"stat_definition_active">) => {
+        (statDefinition: Tables<"stat_definition_enabled">) => {
           const stat = stats?.find(
             (s) => s.stat_definition_id === statDefinition.id
           );

app/src/app/reports/ReportsPageClient.tsx

@@ -46,7 +46,7 @@ export default function ReportsPageClient({
   const statisticalVariables = useMemo(() => {
     return [
       { value: "count", label: "Count", title: "Number of enterprises" },
-      ...(statDefinitions.map(({ code, name }: Tables<'stat_definition_active'>) => ({
+      ...(statDefinitions.map(({ code, name }: Tables<'stat_definition_enabled'>) => ({
         value: code!,
         label: name!,
         title: name!,

app/src/app/search/SearchPageClient.tsx

@@ -19,7 +19,7 @@ interface SearchPageClientProps {
   readonly allStatuses: Tables<"status">[];
   readonly allUnitSizes: Tables<"unit_size">[];
   readonly allDataSources: Tables<"data_source_used">[];
-  readonly allExternalIdentTypes: Tables<"external_ident_type_active">[];
+  readonly allExternalIdentTypes: Tables<"external_ident_type_enabled">[];
   readonly allLegalForms: Tables<"legal_form_used">[];
   readonly allSectors: Tables<"sector_used">[];
   readonly initialUrlSearchParamsString: string;

app/src/app/search/SearchResults.tsx

@@ -33,7 +33,7 @@ interface SearchResultsProps {
   readonly allStatuses: Tables<"status">[];
   readonly allUnitSizes: Tables<"unit_size">[];
   readonly allDataSources: Tables<"data_source_used">[];
-  readonly allExternalIdentTypes: Tables<"external_ident_type_active">[];
+  readonly allExternalIdentTypes: Tables<"external_ident_type_enabled">[];
   readonly allLegalForms: Tables<"legal_form_used">[];
   readonly allSectors: Tables<"sector_used">[];
   readonly initialUrlSearchParamsString: string;
@@ -43,8 +43,8 @@ interface SearchResultsProps {
 // It is a pure function and is the single source of truth for URL -> State conversion.
 const deriveStateFromUrl = (
   urlSearchParams: URLSearchParams,
-  externalIdentTypes: Tables<'external_ident_type_active'>[],
-  statDefinitions: Tables<'stat_definition_active'>[]
+  externalIdentTypes: Tables<'external_ident_type_enabled'>[],
+  statDefinitions: Tables<'stat_definition_enabled'>[]
 ): { _initialQuery: string; _initialFilters: Record<string, any>; _initialPagination: SearchPagination; _initialSorting: SearchSorting } => {
 
   const ftsAction = fullTextSearchDeriveStateUpdateFromSearchParams(urlSearchParams);

app/src/app/search/components/statistical-unit-table-header.tsx

@@ -39,7 +39,7 @@ export function StatisticalUnitTableHeader({
                   key={`h-cell-${headerCellSuffix(column)}`}
                 >
                   <small className="flex">
-                    {externalIdentTypes.map(({ name }: Tables<'external_ident_type_active'>) => name).join(" | ")}
+                    {externalIdentTypes.map(({ name }: Tables<'external_ident_type_enabled'>) => name).join(" | ")}
                   </small>
                 </SortableTableHead>
               );
@@ -96,7 +96,7 @@ export function StatisticalUnitTableHeader({
               if (column.type === "Adaptable" && column.stat_code) {
                 // Retrieve the matching stat definition based on stat_code
                 const statDefinition = statDefinitions.find(
-                  (statDefinition: Tables<'stat_definition_active'>) => statDefinition.code === column.stat_code
+                  (statDefinition: Tables<'stat_definition_enabled'>) => statDefinition.code === column.stat_code
                 );
 
                 return (