fix: changes suggested by Majk

goat-community · Oct 31, 2023 · 0e3623f · 0e3623f
1 parent da439df
commit 0e3623f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/apps/web/components/map/panels/filter/Filter.tsx b/apps/web/components/map/panels/filter/Filter.tsx
@@ -58,8 +58,6 @@ const FilterPanel = (props: FilterPanelProps) => {
   const { data: updatedData, mutate } = getFilterQueryExpressions(
     layerToBeFiltered,
   );
-
-  console.log(updatedData)
 
   const [logicalOperator, setLogicalOperatorVal] = useState<string>(
     "match_all_expressions",

diff --git a/apps/web/components/map/panels/layer/Layer.tsx b/apps/web/components/map/panels/layer/Layer.tsx
@@ -65,8 +65,8 @@ const LayerPanel = ({
   const { t } = useTranslation("maps");
 
   const [resultProjectLayers, setResultProjectLayers] = useState<
-    Layer[] | null
-  >(null);
+    Layer[]
+  >([]);
 
   function filterConditionals(layer: Layer) {
     if (["none", "All"].includes(activeFilter)) {
@@ -100,7 +100,7 @@ const LayerPanel = ({
   useEffect(() => {
     getProjectLayers(projectId).then((data) => {
       console.log(data)
-      const layers = data.map((layer) => ({ ...layer, active: false }));
+      const layers = data.map((layer: Layer) => ({ ...layer, active: false }));
       setResultProjectLayers(layers);
       dispatch(setLayers(layers));
     });

diff --git a/apps/web/lib/api/projects.ts b/apps/web/lib/api/projects.ts
@@ -4,11 +4,11 @@ import useSWR from "swr";
 import { fetchWithAuth, fetcher } from "@/lib/api/fetcher";
 import type {
   ProjectPaginated,
-  ProjectLayers,
   Project,
   PostProject,
 } from "@/lib/validations/project";
 import type { GetContentQueryParams } from "@/lib/validations/common";
+import type { Layer } from "@/lib/validations/layer";
 
 export const PROJECTS_API_BASE_URL = new URL(
   "api/v2/project",
@@ -63,7 +63,7 @@ export const createProject = async (
 
 export const getProjectLayers = async (id: string) => {
   try {
-    const data: Promise<ProjectLayers[]> = (
+    const data: Promise<Layer[]> = (
       await fetchWithAuth(`${PROJECTS_API_BASE_URL}/${id}/layer`)
     ).json();
     return data;

diff --git a/apps/web/lib/validations/layer.ts b/apps/web/lib/validations/layer.ts
@@ -25,6 +25,7 @@ export const layerMetadataSchema = contentMetadataSchema.extend({
 
 export const layerSchema = layerMetadataSchema.extend({
   active: z.boolean().optional(),
+  name: z.string().optional(),
   updated_at: z.string(),
   created_at: z.string(),
   extent: z.string(),