name changes

varianter · Sep 11, 2024 · efec4dd · efec4dd
1 parent 984d386
commit efec4dd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/src/compensations/Compensations.tsx b/src/compensations/Compensations.tsx
@@ -15,7 +15,7 @@ import {
 
 interface CompensationsProps {
   compensations: CompensationsPage;
-  locations: CompanyLocation;
+  locations: CompanyLocation[];
 }
 
 interface SalaryCalculatorFormState {
@@ -24,7 +24,9 @@ interface SalaryCalculatorFormState {
 }
 
 const Compensations = ({ compensations, locations }: CompensationsProps) => {
-  const [selectedLocation, setSelectedLocation] = useState<string>("trondheim");
+  const [selectedLocation, setSelectedLocation] = useState<string>(
+    locations[0]._id,
+  );
   const currentYear = new Date().getFullYear();
   const [salary, setSalary] = useState<number | null>(null);
   const [formState, setFormState] = useState<SalaryCalculatorFormState>({
@@ -57,13 +59,9 @@ const Compensations = ({ compensations, locations }: CompensationsProps) => {
     );
   };
 
-  const updateLocation = (id: string) => {
-    setSelectedLocation(id);
-  };
-
   const locationOptions: IOption[] = Object.values(locations).map(
     (companyLocation) => ({
-      id: companyLocation.companyLocationName.toLowerCase(),
+      id: companyLocation._id,
       label: companyLocation.companyLocationName,
     }),
   );
@@ -76,7 +74,7 @@ const Compensations = ({ compensations, locations }: CompensationsProps) => {
         label="Choose your location"
         options={locationOptions}
         selectedId={selectedLocation}
-        onValueChange={(selectedOption) => updateLocation(selectedOption.id)}
+        onValueChange={(option) => setSelectedLocation(option.id)}
       />
       {compensations.showSalaryCalculator && (
         <>

diff --git a/src/compensations/CompensationsPreview.tsx b/src/compensations/CompensationsPreview.tsx
@@ -9,7 +9,7 @@ import { COMPENSATIONS_PAGE_QUERY } from "studio/lib/queries/pages";
 
 interface CompensationsPreviewProps {
   initialCompensations: QueryResponseInitial<CompensationsPage>;
-  initialLocation: QueryResponseInitial<CompanyLocation>;
+  initialLocation: QueryResponseInitial<CompanyLocation[]>;
 }
 
 const CompensationsPreview = ({
@@ -22,7 +22,7 @@ const CompensationsPreview = ({
     { initial: initialCompensations },
   );
 
-  const { data: locationData } = useQuery<CompanyLocation>(
+  const { data: locationData } = useQuery<CompanyLocation[]>(
     COMPANY_LOCATIONS_QUERY,
     { initial: initialLocation },
   );

diff --git a/studio/lib/payloads/companyDetails.ts b/studio/lib/payloads/companyDetails.ts
@@ -20,5 +20,5 @@ export interface CompanyLocation {
   _key: string;
   _id: string;
   _updatedAt: string;
-  companyLocation: string;
+  companyLocationName: string;
 }
diff --git a/studio/lib/payloads/compensations.ts b/studio/lib/payloads/compensations.ts
@@ -8,10 +8,10 @@ export interface Benefit {
   richText: PortableTextBlock[];
 }
 
-export interface BenefitsGroup {
+export interface BenefitsByLocation {
   _key: string;
   location: string;
-  benefitsGroup: Benefit[];
+  benefits: Benefit[];
 }
 
 export interface SalariesPage {
@@ -30,6 +30,6 @@ export interface CompensationsPage {
   basicTitle: string;
   page: string;
   slug: Slug;
-  benefitsByLocation: BenefitsGroup[];
+  benefitsByLocation: BenefitsByLocation[];
   showSalaryCalculator: boolean;
 }