V3 - feat: add employee list filters

messages/en.json

@@ -20,8 +20,8 @@
     "read_more": "Read more"
   },
   "employee_card": {
-    "show": "Show",
-    "of": "of",
+    "show": "Showing",
+    "of": "out of",
     "consultants": "consultants"
   }
 }

messages/no.json

@@ -20,7 +20,7 @@
     "read_more": "Les mer"
   },
   "employee_card": {
-    "show": "Vis",
+    "show": "Viser",
     "of": "av",
     "consultants": "konsulenter"
   }

messages/se.json

@@ -20,8 +20,8 @@
     "read_more": "Läs mer"
   },
   "employee_card": {
-    "show": "Visa",
+    "show": "Visar",
     "of": "av",
-    "consultants": "konsulentar"
+    "consultants": "konsulter"
   }
 }

src/components/sections/employees/EmployeeList.tsx

@@ -0,0 +1,194 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+import { useState } from "react";
+
+import Button from "src/components/buttons/Button";
+import EmployeeCard from "src/components/employeeCard/EmployeeCard";
+import Text from "src/components/text/Text";
+import { ChewbaccaEmployee, Competence } from "src/types/employees";
+
+import styles from "./employees.module.css";
+
+const competences: Competence[] = [
+  "Utvikling",
+  "Administasjon",
+  "Design",
+  "Project Management",
+];
+
+function countCompetences(employees: ChewbaccaEmployee[]) {
+  const competenceCounts: Record<Competence, number> = {
+    Utvikling: 0,
+    Administasjon: 0,
+    Design: 0,
+    "Project Management": 0,
+  };
+
+  employees
+    .flatMap((e) => e.competences)
+    .forEach((c) => (competenceCounts[c] += 1));
+
+  return competenceCounts;
+}
+
+function countLocations(employees: ChewbaccaEmployee[]) {
+  const locationCounts: Record<string, number> = {};
+
+  employees
+    .flatMap((e) => e.officeName)
+    .filter((o) => !!o)
+    .forEach((o) =>
+      !locationCounts[o!]
+        ? (locationCounts[o!] = 1)
+        : (locationCounts[o!] += 1),
+    );
+
+  return locationCounts;
+}
+
+export interface EmployeesProps {
+  employees: ChewbaccaEmployee[];
+  language: string;
+  employeesPageSlug: string;
+}
+
+interface EmployeeFilters {
+  competenceFilter: Competence | null;
+  locationFilter: string | null;
+}
+
+export default function EmployeeList({
+  employees,
+  language,
+  employeesPageSlug,
+}: EmployeesProps) {
+  const competenceCounts = countCompetences(employees);
+  const locationCounts = countLocations(employees);
+  const locations = Object.keys(locationCounts);
+
+  const t = useTranslations("employee_card");
+
+  const [filteredEmployees, setFilteredEmployees] =
+    useState<ChewbaccaEmployee[]>(employees);
+
+  const [employeeFilters, setEmployeeFilters] = useState<EmployeeFilters>({
+    competenceFilter: null,
+    locationFilter: null,
+  });
+
+  function filterEmployees(newFilters: Partial<EmployeeFilters>) {
+    const combinedFilters = { ...employeeFilters, ...newFilters };
+    setEmployeeFilters(combinedFilters);
+
+    const newFilteredEmployees = employees.filter((e) => {
+      if (
+        combinedFilters.competenceFilter !== null &&
+        !e.competences.includes(combinedFilters.competenceFilter)
+      ) {
+        return false;
+      }
+
+      if (
+        combinedFilters.locationFilter !== null &&
+        e.officeName !== combinedFilters.locationFilter
+      ) {
+        return false;
+      }
+
+      return true;
+    });
+
+    setFilteredEmployees(newFilteredEmployees);
+  }
+
+  return (
+    <>
+      <div className={styles.employeeFiltersWrapper}>
+        <div className={styles.employeeFilterWrapper}>
+          <Text type="labelSemibold" className={styles.employeeFilterLabel}>
+            Fag
+          </Text>
+          <Button
+            size="small"
+            type={
+              employeeFilters.competenceFilter == null
+                ? "secondaryFilled"
+                : "secondary"
+            }
+            onClick={() => filterEmployees({ competenceFilter: null })}
+          >
+            Alle
+          </Button>
+          {competences.map((competence) => {
+            const active = employeeFilters.competenceFilter == competence;
+            return (
+              <Button
+                size="small"
+                key={competence}
+                type={active ? "secondaryFilled" : "secondary"}
+                onClick={() =>
+                  filterEmployees({ competenceFilter: competence })
+                }
+              >
+                {competence} ({competenceCounts[competence]})
+              </Button>
+            );
+          })}
+        </div>
+        <div className={styles.employeeFilterWrapper}>
+          <Text type="labelSemibold" className={styles.employeeFilterLabel}>
+            Lokasjon
+          </Text>
+          <Button
+            size="small"
+            type={
+              employeeFilters.locationFilter == null
+                ? "secondaryFilled"
+                : "secondary"
+            }
+            onClick={() => filterEmployees({ locationFilter: null })}
+          >
+            Alle
+          </Button>
+          {locations.map((location) => {
+            const active = employeeFilters.locationFilter == location;
+            return (
+              <Button
+                size="small"
+                key={location}
+                type={active ? "secondaryFilled" : "secondary"}
+                onClick={() => filterEmployees({ locationFilter: location })}
+              >
+                {location} ({locationCounts[location]})
+              </Button>
+            );
+          })}
+        </div>
+      </div>
+
+      <div className={styles.employeeCountWrapper}>
+        <div style={{ display: "flex" }}></div>
+
+        <p className={styles.employeeCount}>
+          {t("show")}{" "}
+          <span className={styles.employeeCountValue}>{employees.length}</span>{" "}
+          {t("of")}{" "}
+          <span className={styles.employeeCountValue}>{employees.length}</span>{" "}
+          {t("consultants")}
+        </p>
+      </div>
+
+      <div className={styles.peopleContainer}>
+        {filteredEmployees.map((employee) => (
+          <EmployeeCard
+            employee={employee}
+            employeePageSlug={employeesPageSlug}
+            language={language}
+            key={employee.name}
+          />
+        ))}
+      </div>
+    </>
+  );
+}

src/components/sections/employees/Employees.tsx

@@ -1,7 +1,5 @@
 import { headers } from "next/headers";
-import { getTranslations } from "next-intl/server";
 
-import EmployeeCard from "src/components/employeeCard/EmployeeCard";
 import {
   domainFromEmail,
   fetchAllChewbaccaEmployees,
@@ -11,14 +9,14 @@ import { EmployeesSection } from "studio/lib/interfaces/pages";
 import { EMPLOYEE_PAGE_SLUG_QUERY } from "studio/lib/queries/siteSettings";
 import { loadStudioQuery } from "studio/lib/store";
 
+import EmployeeList from "./EmployeeList";
 import styles from "./employees.module.css";
 export interface EmployeesProps {
   language: string;
   section: EmployeesSection;
 }
 
 export default async function Employees({ language, section }: EmployeesProps) {
-  const t = await getTranslations("employee_card");
   const employeesPageRes = await loadStudioQuery<{ slug: string }>(
     EMPLOYEE_PAGE_SLUG_QUERY,
     {
@@ -39,31 +37,16 @@ export default async function Employees({ language, section }: EmployeesProps) {
     (employee) =>
       employee.email != null && domainFromEmail(employee.email) === domain,
   );
-  const total = employees.length;
 
   return (
     <div className={styles.wrapper}>
       <div className={styles.employees}>
         <h1 className={styles.header}>{section.basicTitle}</h1>
-        <div className={styles.employeeCountWrapper}>
-          <p className={styles.employeeCount}>
-            {t("show")}
-            <span className={styles.employeeCountValue}>{total}</span>
-            {t("of")}
-            <span className={styles.employeeCountValue}>{total}</span>{" "}
-            {t("consultants")}
-          </p>
-        </div>
-        <div className={styles.peopleContainer}>
-          {employees.map((employee) => (
-            <EmployeeCard
-              employee={employee}
-              employeePageSlug={employeesPageSlug}
-              language={language}
-              key={employee.name}
-            />
-          ))}
-        </div>
+        <EmployeeList
+          employees={employees}
+          employeesPageSlug={employeesPageSlug}
+          language={language}
+        />
       </div>
     </div>
   );

src/components/sections/employees/employees.module.css

@@ -13,6 +13,27 @@
   align-self: flex-start;
 }
 
+.employeeFiltersWrapper {
+  padding: 1.5rem 0;
+  align-self: flex-start;
+  display: flex;
+  flex-direction: column;
+  gap: 0.75rem;
+}
+
+.employeeFilterWrapper {
+  flex-wrap: wrap;
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+}
+
+.employeeFilterLabel {
+  flex-shrink: 0;
+  min-width: 4.5rem;
+  width: 4.5rem;
+}
+
 .employeeCountWrapper {
   width: 100%;
 }

src/components/text/Text.tsx

@@ -34,11 +34,11 @@ const elementMap: { [key in TextType]: keyof JSX.IntrinsicElements } = {
   h6: "h6",
   desktopLink: "p",
   desktopLinkBig: "p",
-  labelSmall: "p",
-  labelLight: "p",
-  labelRegular: "p",
-  labelSemibold: "p",
-  labelBold: "p",
+  labelSmall: "span",
+  labelLight: "span",
+  labelRegular: "span",
+  labelSemibold: "span",
+  labelBold: "span",
   quoteItalic: "p",
   quoteNormal: "p",
   bodyExtraSmall: "p",

src/components/text/text.module.css

@@ -122,6 +122,13 @@
   line-height: 120%;
 }
 
+.labelBold {
+  font-size: 1rem;
+  font-style: normal;
+  font-weight: 800;
+  line-height: 120%;
+}
+
 .quoteNormal {
   font-size: 1.5rem;
   font-style: normal;

src/types/employees.ts

@@ -16,6 +16,12 @@ export function isChewbaccaEmployeesResponse(
   );
 }
 
+export type Competence =
+  | "Project Management"
+  | "Design"
+  | "Utvikling"
+  | "Administasjon";
+
 export interface ChewbaccaEmployee {
   email?: string | null;
   name?: string | null;
@@ -24,7 +30,7 @@ export interface ChewbaccaEmployee {
   imageThumbUrl?: string | null;
   officeName?: string | null;
   startDate?: string | null;
-  competences: string[];
+  competences: Competence[];
 }
 
 export function isChewbaccaEmployee(