fixes cost surfaces sorting

Vizzuality · Oct 30, 2023 · 9f23aaf · 9f23aaf
1 parent a381d20
commit 9f23aaf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/app/layout/project/sidebar/project/inventory-panel/cost-surfaces/index.tsx b/app/layout/project/sidebar/project/inventory-panel/cost-surfaces/index.tsx
@@ -62,20 +62,21 @@ const InventoryPanelCostSurface = ({ noData: noDataMessage }: { noData: string }
   );
 
   const filteredData = useMemo(() => {
+    if (!allProjectCostSurfacesQuery.data.length) return allProjectCostSurfacesQuery.data;
     let sortedData = allProjectCostSurfacesQuery.data;
 
-    if (filters.sort === '-name') {
-      sortedData = orderBy(allProjectCostSurfacesQuery.data, 'name', 'desc');
+    switch (filters.sort) {
+      case 'name':
+        sortedData = orderBy(allProjectCostSurfacesQuery.data, 'name', 'asc');
+        break;
+      case '-name':
+        sortedData = orderBy(allProjectCostSurfacesQuery.data, 'name', 'desc');
+        break;
     }
 
-    if (search) {
-      sortedData = sortedData.filter((cs) =>
-        cs.name.toLocaleLowerCase().includes(search.toLocaleLowerCase())
-      );
-    }
-
-    // the API assumes the default sort is ascending
-    return sortedData;
+    return sortedData.filter((cs) =>
+      cs.name.toLocaleLowerCase().includes(search?.toLocaleLowerCase())
+    );
   }, [filters, allProjectCostSurfacesQuery.data, search]);
 
   const costSurfaceIds = filteredData?.map((cs) => cs.id);

diff --git a/app/layout/project/sidebar/project/inventory-panel/features/modals/upload/index.tsx b/app/layout/project/sidebar/project/inventory-panel/features/modals/upload/index.tsx
@@ -283,7 +283,7 @@ export const FeatureUploadModal = ({
 
                 <UploadTabs mode={uploadMode} onChange={(mode) => saveUploadMode(mode)} />
                 {uploadMode === 'csv' && (
-                  <p className="!mt-4 text-sm text-gray-100">
+                  <p className="!mt-4 text-sm text-gray-900">
                     Please download and fill in the{' '}
                     <button
                       className="text-primary-500 underline hover:no-underline"