Merge pull request #52 from plezanje-net/fix-gs-usage

Fix usages of gradingSystems object
plezanje-net · Nov 2, 2024 · f52697d · f52697d
2 parents 198acdf + 0695084
commit f52697d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/app/[lang]/crags/components/crags-context.tsx b/src/app/[lang]/crags/components/crags-context.tsx
@@ -615,7 +615,7 @@ const getSlugToNameMap = <T extends Area | Country>(entities: T[]) => {
 
 const getMinMaxDifficulty = () => {
   // For now we can only filter by french grades. Should add other grading systems in a future task?
-  const frenchGrades = gradingSystems.find((gs) => gs.id === "french")?.grades!;
+  const frenchGrades = gradingSystems["french"].grades;
 
   return {
     minDifficulty: frenchGrades[0].difficulty,
@@ -624,7 +624,7 @@ const getMinMaxDifficulty = () => {
 };
 
 const getDifficultyGradeMap = () => {
-  const frenchGrades = gradingSystems.find((gs) => gs.id === "french")?.grades!;
+  const frenchGrades = gradingSystems["french"].grades;
 
   return frenchGrades.reduce((prev: Record<string, string>, cur) => {
     prev[cur.difficulty] = cur.name;

diff --git a/src/app/[lang]/crags/components/filters-pane.tsx b/src/app/[lang]/crags/components/filters-pane.tsx
@@ -53,7 +53,7 @@ function FiltersPane({ open, filtersData, onResetAll }: TFiltersPane) {
       <div className="mt-5 border-t border-neutral-200 px-8 pb-5 pt-4">
         <Button variant="tertiary" onClick={onResetAll}>
           <span className="flex gap-2">
-            <IconReset size={IconSize.regular} />
+            <IconReset />
             Ponastavi vse
           </span>
         </Button>

diff --git a/src/components/grade-selector.tsx b/src/components/grade-selector.tsx
@@ -1,5 +1,5 @@
 import { Select, Option } from "./ui/select";
-import { gradingSystems } from "@/utils/grading-systems";
+import { TGradingSystemId, gradingSystems } from "@/utils/grading-systems";
 import IconPlus from "./ui/icons/plus";
 import Button from "./ui/button";
 import IconMinus from "./ui/icons/minus";
@@ -93,8 +93,7 @@ export default GradeSelector;
 // Helpers
 
 const getGrades = (gradingSystemId: string, halfGrades: boolean = false) => {
-  const fullGrades =
-    gradingSystems.find((gs) => gs.id === gradingSystemId)?.grades || [];
+  const fullGrades = gradingSystems[gradingSystemId as TGradingSystemId].grades;
 
   let grades = [];