From 47866c7a19d9045fe808483a982089abe47b0204 Mon Sep 17 00:00:00 2001
From: Hedda Hubertz <hhz@ssb.no>
Date: Mon, 27 May 2024 13:13:56 +0200
Subject: [PATCH 1/6] [ui] Update all instances of StatBus to Statbus for
 consistency

---
 app/src/app/dashboard/page.tsx               | 4 ++--
 app/src/app/getting-started/page.tsx         | 2 +-
 app/src/app/getting-started/summary/page.tsx | 8 ++++----
 app/src/app/layout.tsx                       | 2 +-
 app/src/app/login/page.tsx                   | 2 +-
 app/src/app/page.tsx                         | 2 +-
 app/src/app/reports/page.tsx                 | 4 ++--
 app/src/app/search/page.tsx                  | 2 +-
 app/src/components/navbar.tsx                | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/app/dashboard/page.tsx b/app/src/app/dashboard/page.tsx
index 186288590..ba32c0c0e 100644
--- a/app/src/app/dashboard/page.tsx
+++ b/app/src/app/dashboard/page.tsx
@@ -13,13 +13,13 @@ import { StatisticalVariableCountCard } from "@/app/dashboard/statistical-variab
 import { Database, Gauge } from "lucide-react";
 
 export const metadata: Metadata = {
-  title: "StatBus | Dashboard",
+  title: "Statbus | Dashboard",
 };
 
 export default async function Dashboard() {
   return (
     <main className="mx-auto flex max-w-5xl flex-col px-2 py-8 md:py-24 w-full space-y-8 lg:space-y-12">
-      <h1 className="text-center text-2xl">StatBus Status Dashboard</h1>
+      <h1 className="text-center text-2xl">Statbus Status Dashboard</h1>
 
       <DashboardSection
         title="Data Metrics"
diff --git a/app/src/app/getting-started/page.tsx b/app/src/app/getting-started/page.tsx
index c02108f43..6df4fcaaf 100644
--- a/app/src/app/getting-started/page.tsx
+++ b/app/src/app/getting-started/page.tsx
@@ -6,7 +6,7 @@ export default async function GettingStartedPage() {
     <div className="space-y-6 text-center">
       <h1 className="text-center text-2xl">Welcome</h1>
       <p>
-        In this onboarding guide we will try to help you get going with StatBus.
+        In this onboarding guide we will try to help you get going with Statbus.
         We will assist you in selecting an activity standard and you will get to
         upload your first region data set.
       </p>
diff --git a/app/src/app/getting-started/summary/page.tsx b/app/src/app/getting-started/summary/page.tsx
index d1ebe9bbd..444414a9c 100644
--- a/app/src/app/getting-started/summary/page.tsx
+++ b/app/src/app/getting-started/summary/page.tsx
@@ -30,16 +30,16 @@ export default async function OnboardingCompletedPage() {
       <h1 className="text-center text-2xl">Summary</h1>
       <p className="leading-loose">
         The following steps needs to be complete in order to have a fully
-        functional StatBus. If you have not completed some of the steps, you can
+        functional Statbus. If you have not completed some of the steps, you can
         click the links to complete the steps.
       </p>
 
       <div className="space-y-6">
         <SummaryBlock
           success={!!settings?.[0]?.activity_category_standard}
-          successText={`You have configured StatBus to use the activity category standard ${settings?.[0]?.activity_category_standard?.name}.`}
+          successText={`You have configured Statbus to use the activity category standard ${settings?.[0]?.activity_category_standard?.name}.`}
           failureText={
-            "You have not configured StatBus to use an activity category standard"
+            "You have not configured Statbus to use an activity category standard"
           }
           failureLink={"/getting-started/activity-standard"}
         />
@@ -71,7 +71,7 @@ export default async function OnboardingCompletedPage() {
       numberOfLegalUnits ? (
         <div className="text-center">
           <Link className="underline" href="/">
-            Start using StatBus
+            Start using Statbus
           </Link>
         </div>
       ) : null}
diff --git a/app/src/app/layout.tsx b/app/src/app/layout.tsx
index cddbb845d..190f2c788 100644
--- a/app/src/app/layout.tsx
+++ b/app/src/app/layout.tsx
@@ -13,7 +13,7 @@ import TimeContextProvider from "@/app/time-context-provider";
 const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
-  title: "StatBus",
+  title: "Statbus",
   description: "Simple To Use, Simple To Understand, Simply useful!",
 };
 
diff --git a/app/src/app/login/page.tsx b/app/src/app/login/page.tsx
index b6cbf55a5..d9b5f40d5 100644
--- a/app/src/app/login/page.tsx
+++ b/app/src/app/login/page.tsx
@@ -18,7 +18,7 @@ export default function LoginPage() {
       <div className="sm:mx-auto sm:w-full sm:max-w-sm">
         <Image
           src={logo}
-          alt="StatBus Logo"
+          alt="Statbus Logo"
           width={32}
           height={32}
           className="mx-auto h-10 w-auto"
diff --git a/app/src/app/page.tsx b/app/src/app/page.tsx
index 5df20be8d..894b0a05c 100644
--- a/app/src/app/page.tsx
+++ b/app/src/app/page.tsx
@@ -2,7 +2,7 @@ import { Metadata } from "next";
 import Dashboard from "@/app/dashboard/page";
 
 export const metadata: Metadata = {
-  title: "StatBus | Home",
+  title: "Statbus | Home",
 };
 
 export default async function Home() {
diff --git a/app/src/app/reports/page.tsx b/app/src/app/reports/page.tsx
index 5d31dd24a..2a0255c23 100644
--- a/app/src/app/reports/page.tsx
+++ b/app/src/app/reports/page.tsx
@@ -6,7 +6,7 @@ import { DrillDown } from "@/app/reports/types/drill-down";
 import { createServerLogger } from "@/lib/server-logger";
 
 export const metadata: Metadata = {
-  title: "StatBus | Reports",
+  title: "Statbus | Reports",
 };
 
 export default async function ReportsPage() {
@@ -28,7 +28,7 @@ export default async function ReportsPage() {
 
   return (
     <main className="mx-auto flex w-full max-w-5xl flex-col px-2 py-8 md:py-24">
-      <h1 className="mb-3 text-center text-2xl">StatBus Data Drilldown</h1>
+      <h1 className="mb-3 text-center text-2xl">Statbus Data Drilldown</h1>
       <p className="mb-12 text-center">
         Gain data insights by drilling through the bar charts below
       </p>
diff --git a/app/src/app/search/page.tsx b/app/src/app/search/page.tsx
index 163f60186..4ffde61e6 100644
--- a/app/src/app/search/page.tsx
+++ b/app/src/app/search/page.tsx
@@ -10,7 +10,7 @@ import { CartProvider } from "@/app/search/cart-provider";
 import { createClient } from "@/lib/supabase/server";
 
 export const metadata: Metadata = {
-  title: "StatBus | Search statistical units",
+  title: "Statbus | Search statistical units",
 };
 
 export default async function SearchPage({
diff --git a/app/src/components/navbar.tsx b/app/src/components/navbar.tsx
index 0e22f0c02..f098c00f5 100644
--- a/app/src/components/navbar.tsx
+++ b/app/src/components/navbar.tsx
@@ -13,7 +13,7 @@ export function NavbarSkeleton() {
   return (
     <header className="bg-ssb-dark text-white">
       <div className="mx-auto flex max-w-screen-xl items-center justify-between gap-4 p-2 lg:px-4">
-        <Image src={logo} alt="StatBus Logo" className="h-10 w-10" />
+        <Image src={logo} alt="Statbus Logo" className="h-10 w-10" />
       </div>
     </header>
   );
@@ -26,7 +26,7 @@ export default async function Navbar() {
     <header className="bg-ssb-dark text-white">
       <div className="mx-auto flex max-w-screen-xl items-center justify-between gap-4 p-2 lg:px-4">
         <a href="/" className="flex items-center space-x-3 rtl:space-x-reverse">
-          <Image src={logo} alt="StatBus Logo" className="h-10 w-10" />
+          <Image src={logo} alt="Statbus Logo" className="h-10 w-10" />
         </a>
         {session.data.session?.user && (
           <div className="flex-1 space-x-3 flex items-center justify-end">

From 0f92eac9536a433adba72c04c2fab9a7ba526778 Mon Sep 17 00:00:00 2001
From: Hedda Hubertz <hhz@ssb.no>
Date: Mon, 27 May 2024 13:39:57 +0200
Subject: [PATCH 2/6] [ui] Make command palette accessible with both
 'command+shift+K' and 'command+shift+k'

---
 app/src/components/command-palette/command-palette.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/components/command-palette/command-palette.tsx b/app/src/components/command-palette/command-palette.tsx
index 7ff6cf8bd..109f1052c 100644
--- a/app/src/components/command-palette/command-palette.tsx
+++ b/app/src/components/command-palette/command-palette.tsx
@@ -42,7 +42,11 @@ export function CommandPalette() {
     };
 
     const keydown = (e: KeyboardEvent) => {
-      if (e.key === "k" && (e.metaKey || e.ctrlKey) && e.shiftKey) {
+      if (
+        (e.key === "k" || e.key === "K") &&
+        (e.metaKey || e.ctrlKey) &&
+        e.shiftKey
+      ) {
         e.preventDefault();
         open();
       }

From b3f82ed600d5802890962c27309a7e0872e08065 Mon Sep 17 00:00:00 2001
From: Hedda Hubertz <hhz@ssb.no>
Date: Mon, 27 May 2024 14:00:40 +0200
Subject: [PATCH 3/6] [ui] Update CSV export to include turnover

---
 app/src/app/api/search/export/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/app/api/search/export/route.ts b/app/src/app/api/search/export/route.ts
index 890110960..f9da0dbd7 100644
--- a/app/src/app/api/search/export/route.ts
+++ b/app/src/app/api/search/export/route.ts
@@ -18,7 +18,7 @@ export async function GET(request: Request) {
 
   searchParams.set(
     "select",
-    "tax_ident, name, unit_type, primary_activity_category_id, physical_region_id, employees, physical_country_iso_2, sector_code, sector_name, legal_form_code, legal_form_name"
+    "tax_ident, name, unit_type, primary_activity_category_id, physical_region_id, employees, turnover, physical_country_iso_2, sector_code, sector_name, legal_form_code, legal_form_name"
   );
 
   const statisticalUnitsResponse = await getStatisticalUnits(searchParams);

From 7befb2456798d3ed05a381fd3fe7344b79099db6 Mon Sep 17 00:00:00 2001
From: Hedda Hubertz <hhz@ssb.no>
Date: Wed, 29 May 2024 11:29:41 +0200
Subject: [PATCH 4/6] [ui] Fix layout issue on getting started page in Edge

---
 app/src/app/getting-started/layout.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/app/getting-started/layout.tsx b/app/src/app/getting-started/layout.tsx
index f8227fda3..b05d24fac 100644
--- a/app/src/app/getting-started/layout.tsx
+++ b/app/src/app/getting-started/layout.tsx
@@ -8,11 +8,11 @@ export default function GettingStartedLayout({
   readonly progress: React.ReactNode;
 }) {
   return (
-    <main className="w-full mx-auto max-w-screen-xl px-2 py-8 md:py-24 grid xl:grid-cols-12 gap-8">
-      <aside className="p-6 col-span-12 xl:col-span-4 bg-ssb-light">
+    <main className="w-full mx-auto max-w-screen-xl px-2 py-8 md:py-24 grid lg:grid-cols-12 gap-8">
+      <aside className="p-6 col-span-12 lg:col-span-4 bg-ssb-light">
         {progress}
       </aside>
-      <div className="flex-1 col-span-12 xl:col-span-8">
+      <div className="flex-1 col-span-12 lg:col-span-8">
         <div className="max-w-2xl mx-auto">{children}</div>
       </div>
     </main>

From e79b02dd9d437f73923e646ac18a9ccb26d9f8d7 Mon Sep 17 00:00:00 2001
From: Hedda Hubertz <hhz@ssb.no>
Date: Wed, 29 May 2024 14:11:30 +0200
Subject: [PATCH 5/6] [ui] Add 'Upload Establisments' link to command palette

---
 app/src/components/command-palette/command-palette.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/components/command-palette/command-palette.tsx b/app/src/components/command-palette/command-palette.tsx
index 109f1052c..2c663b807 100644
--- a/app/src/components/command-palette/command-palette.tsx
+++ b/app/src/components/command-palette/command-palette.tsx
@@ -151,6 +151,13 @@ export function CommandPalette() {
             <Upload className="mr-2 h-4 w-4" />
             <span>Upload Legal Units</span>
           </CommandItem>
+          <CommandItem
+            onSelect={() => navigate("/getting-started/upload-establishments")}
+            value="Upload Establishments"
+          >
+            <Upload className="mr-2 h-4 w-4" />
+            <span>Upload Establishments</span>
+          </CommandItem>
           <CommandItem onSelect={() => navigate("/profile")} value="Profile">
             <User className="mr-2 h-4 w-4" />
             <span>Profile</span>

From e246929df925f914d18a8f94d740d80ff3f8274d Mon Sep 17 00:00:00 2001
From: Hedda Hubertz <hhz@ssb.no>
Date: Fri, 31 May 2024 11:03:23 +0200
Subject: [PATCH 6/6] [ui] Add hierarchy to sector filter

---
 .../search/filters/sector/sector-filter.tsx    | 12 +++++-------
 .../search/filters/sector/sector-options.tsx   | 18 ++++++++++--------
 .../app/search/filters/url-search-params.ts    |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/app/search/filters/sector/sector-filter.tsx b/app/src/app/search/filters/sector/sector-filter.tsx
index 795714cd9..5d134c20a 100644
--- a/app/src/app/search/filters/sector/sector-filter.tsx
+++ b/app/src/app/search/filters/sector/sector-filter.tsx
@@ -7,17 +7,15 @@ interface IProps {
 
 export default async function SectorFilter({ urlSearchParam }: IProps) {
   const client = createClient();
-  const sectors = await client
-    .from("sector_used")
-    .select()
-    .not("code", "is", null);
+  const sectors = await client.from("sector_used").select();
 
   return (
     <SectorOptions
       options={
-        sectors.data?.map(({ code, name }) => ({
-          label: `${code} ${name}`,
-          value: code,
+        sectors.data?.map(({ code, path, name }) => ({
+          label: code ? `${code} ${name}` : `${name}`,
+          value: path as string,
+          humanReadableValue: code ? `${code} ${name}` : `${name}`,
         })) ?? []
       }
       selected={urlSearchParam ? urlSearchParam.split(",") : []}
diff --git a/app/src/app/search/filters/sector/sector-options.tsx b/app/src/app/search/filters/sector/sector-options.tsx
index 57d85b2e3..77bfc225f 100644
--- a/app/src/app/search/filters/sector/sector-options.tsx
+++ b/app/src/app/search/filters/sector/sector-options.tsx
@@ -17,19 +17,21 @@ export default function SectorOptions({
       values: { [SECTOR]: selected = [] },
     },
   } = useSearchContext();
-
+  const buildQuery = (values: (string | null)[]) => {
+    const path = values[0];
+    if (path) return `cd.${path}`;
+    if (path === null) return "is.null";
+    return null;
+  };
   const toggle = useCallback(
     ({ value }: SearchFilterOption) => {
-      const next = selected.includes(value)
-        ? selected.filter((v) => v !== value)
-        : [...selected, value];
-
+      const values = selected.includes(value) ? [] : [value];
       dispatch({
         type: "set_query",
         payload: {
           name: SECTOR,
-          query: next.length ? `in.(${next.join(",")})` : null,
-          values: next,
+          query: buildQuery(values),
+          values,
         },
       });
     },
@@ -53,7 +55,7 @@ export default function SectorOptions({
         type: "set_query",
         payload: {
           name: SECTOR,
-          query: `in.(${initialSelected.join(",")})`,
+          query: buildQuery(initialSelected),
           values: initialSelected,
         },
       });
diff --git a/app/src/app/search/filters/url-search-params.ts b/app/src/app/search/filters/url-search-params.ts
index 2e4cecf53..b52a9d997 100644
--- a/app/src/app/search/filters/url-search-params.ts
+++ b/app/src/app/search/filters/url-search-params.ts
@@ -4,5 +4,5 @@ export const UNIT_TYPE = "unit_type";
 export const INVALID_CODES = "invalid_codes";
 export const REGION = "physical_region_path";
 export const LEGAL_FORM = "legal_form_code";
-export const SECTOR = "sector_code";
+export const SECTOR = "sector_path";
 export const ACTIVITY_CATEGORY_PATH = "primary_activity_category_path";