From 740c725347769556b399645c70acee7ffd097908 Mon Sep 17 00:00:00 2001 From: Jeran Date: Mon, 2 Mar 2026 18:02:01 +0100 Subject: [PATCH 1/2] changed store paths --- src/GlobalStates/index.ts | 7 ------- src/components/LandingHome.tsx | 3 ++- src/components/plots/AnalysisInfo.tsx | 4 +++- src/components/plots/AnalysisWG.tsx | 4 +++- src/components/plots/AxisLines.tsx | 6 +++++- src/components/plots/CountryBorders.tsx | 4 +++- src/components/plots/DataCube.tsx | 3 ++- src/components/plots/FlatBlocks.tsx | 5 ++++- src/components/plots/FlatMap.tsx | 5 ++++- src/components/plots/KeyFramePreviewer.tsx | 4 +++- src/components/plots/MorphingPoints.tsx | 3 ++- src/components/plots/Plot.tsx | 5 ++++- src/components/plots/PointCloud.tsx | 4 +++- src/components/plots/Sphere.tsx | 4 +++- src/components/plots/SphereBlocks.tsx | 4 +++- src/components/plots/UVCube.tsx | 4 +++- src/components/plots/plotarea/FixedTicks.tsx | 3 ++- src/components/plots/plotarea/LinePlot.tsx | 2 +- src/components/plots/plotarea/PlotPoints.tsx | 3 ++- src/components/plots/plotarea/ThickLine.tsx | 3 ++- src/components/textures/TextureMakers.tsx | 2 +- src/components/ui/Colorbar.tsx | 4 +++- src/components/ui/Elements/AxisBars.tsx | 2 +- src/components/ui/Elements/Error.tsx | 2 +- src/components/ui/Elements/Loading.tsx | 2 +- src/components/ui/ExportExtent.tsx | 4 +++- src/components/ui/Footer.tsx | 2 +- src/components/ui/KeyFrames.tsx | 3 ++- src/components/ui/LinePlotArea/PlotLineOptions.tsx | 2 +- src/components/ui/MainPanel/AdjustPlot.tsx | 4 +++- src/components/ui/MainPanel/AnalysisOptions.tsx | 4 +++- src/components/ui/MainPanel/Colormaps.tsx | 2 +- src/components/ui/MainPanel/Dataset.tsx | 3 ++- src/components/ui/MainPanel/LocalNetCDF.tsx | 5 +++-- src/components/ui/MainPanel/LocalZarr.tsx | 3 ++- src/components/ui/MainPanel/MetaDataInfo.tsx | 5 ++++- src/components/ui/MainPanel/PlayButton.tsx | 5 ++++- src/components/ui/MainPanel/PlotType.tsx | 3 ++- src/components/ui/MainPanel/Variables.tsx | 2 +- src/components/ui/NavBar/ExportImageSettings.tsx | 4 +++- src/components/ui/NavBar/Navbar.tsx | 3 ++- src/components/ui/NavBar/PerformanceMode.tsx | 2 +- src/components/ui/NavBar/PlotLineButton.tsx | 3 ++- src/components/ui/ShaderEditor.tsx | 3 ++- src/components/zarr/GetMetadata.tsx | 2 +- src/components/zarr/MetadataText.tsx | 2 +- src/components/zarr/NCGetters.ts | 5 ++++- src/components/zarr/ZarrGetters.ts | 5 ++++- src/components/zarr/ZarrLoaderLRU.ts | 5 ++++- src/hooks/useCoordBounds.tsx | 2 +- src/hooks/useDataFetcher.tsx | 4 +++- src/utils/ExportCanvas.tsx | 4 +++- src/utils/HelperFuncs.ts | 5 ++++- 53 files changed, 128 insertions(+), 60 deletions(-) delete mode 100644 src/GlobalStates/index.ts diff --git a/src/GlobalStates/index.ts b/src/GlobalStates/index.ts deleted file mode 100644 index 8aed7910..00000000 --- a/src/GlobalStates/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { useZarrStore } from "./ZarrStore"; -export { useAnalysisStore } from "./AnalysisStore"; -export { usePlotStore } from "./PlotStore"; -export { useCacheStore } from "./CacheStore"; -export { useImageExportStore } from "./ImageExportStore"; -export { useGlobalStore } from "./GlobalStore"; -export { useErrorStore } from "./ErrorStore"; \ No newline at end of file diff --git a/src/components/LandingHome.tsx b/src/components/LandingHome.tsx index c4e006c8..5b8df3fc 100644 --- a/src/components/LandingHome.tsx +++ b/src/components/LandingHome.tsx @@ -7,7 +7,8 @@ import { useEffect, useMemo } from 'react'; import { PlotArea, Plot, LandingShapes } from '@/components/plots'; import { MainPanel } from '@/components/ui'; import { Loading, Navbar, Error as ErrorComponent } from '@/components/ui'; -import { useGlobalStore, useZarrStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; import { useShallow } from 'zustand/shallow'; async function sendPing() { diff --git a/src/components/plots/AnalysisInfo.tsx b/src/components/plots/AnalysisInfo.tsx index 61348ea5..feb61eeb 100644 --- a/src/components/plots/AnalysisInfo.tsx +++ b/src/components/plots/AnalysisInfo.tsx @@ -1,6 +1,8 @@ +'use client'; import React, {useEffect, useMemo} from 'react' import './Plots.css' -import { useAnalysisStore, useGlobalStore } from '@/GlobalStates' +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; import { useShallow } from 'zustand/shallow' import { parseLoc } from '@/utils/HelperFuncs' diff --git a/src/components/plots/AnalysisWG.tsx b/src/components/plots/AnalysisWG.tsx index dd19f416..9d64f889 100644 --- a/src/components/plots/AnalysisWG.tsx +++ b/src/components/plots/AnalysisWG.tsx @@ -3,7 +3,9 @@ import { ArrayMinMax, GetCurrentArray } from '@/utils/HelperFuncs'; import * as THREE from 'three'; import React, { useEffect, useRef } from 'react'; import { DataReduction, Convolve, Multivariate2D, Multivariate3D, CUMSUM3D, Convolve2D, CustomShader } from '../computation/webGPU'; -import { useGlobalStore, useAnalysisStore, usePlotStore } from '@/GlobalStates'; +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow'; import { GetArray } from '../zarr/ZarrLoaderLRU'; import { CreateTexture } from '../textures'; diff --git a/src/components/plots/AxisLines.tsx b/src/components/plots/AxisLines.tsx index b0c1a3e8..b21196bb 100644 --- a/src/components/plots/AxisLines.tsx +++ b/src/components/plots/AxisLines.tsx @@ -1,6 +1,10 @@ "use client"; -import { useAnalysisStore, useGlobalStore, useImageExportStore, usePlotStore, useZarrStore } from '@/GlobalStates' +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; +import { useImageExportStore } from '@/GlobalStates/ImageExportStore'; import React, {useState, useMemo} from 'react' import { useShallow } from 'zustand/shallow' import { Text } from '@react-three/drei' diff --git a/src/components/plots/CountryBorders.tsx b/src/components/plots/CountryBorders.tsx index fd4813c0..94d45696 100644 --- a/src/components/plots/CountryBorders.tsx +++ b/src/components/plots/CountryBorders.tsx @@ -1,6 +1,8 @@ "use client"; import React, {useEffect, useState, useMemo} from 'react' -import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates'; +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import * as THREE from 'three' import { useShallow } from 'zustand/shallow'; import { useFrame } from '@react-three/fiber'; diff --git a/src/components/plots/DataCube.tsx b/src/components/plots/DataCube.tsx index c6c24026..6d287d5b 100644 --- a/src/components/plots/DataCube.tsx +++ b/src/components/plots/DataCube.tsx @@ -1,7 +1,8 @@ import { useEffect, useMemo, useRef } from 'react' import * as THREE from 'three' import { vertexShader, fragmentShader, fragOpt, orthoVertex } from '@/components/textures/shaders'; -import { useGlobalStore, usePlotStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow'; import { invalidate, useFrame } from '@react-three/fiber'; import { deg2rad } from '@/utils/HelperFuncs'; diff --git a/src/components/plots/FlatBlocks.tsx b/src/components/plots/FlatBlocks.tsx index 5865262c..7bf1b084 100644 --- a/src/components/plots/FlatBlocks.tsx +++ b/src/components/plots/FlatBlocks.tsx @@ -1,5 +1,8 @@ import React, { useEffect, useMemo } from 'react' -import { useAnalysisStore, useErrorStore, useGlobalStore, usePlotStore } from '@/GlobalStates' +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useErrorStore } from '@/GlobalStates/ErrorStore'; import { useShallow } from 'zustand/shallow' import * as THREE from 'three' import { sphereBlocksFrag, flatBlocksVert, flatBlocksVert3D } from '../textures/shaders' diff --git a/src/components/plots/FlatMap.tsx b/src/components/plots/FlatMap.tsx index 37b71e20..4376263b 100644 --- a/src/components/plots/FlatMap.tsx +++ b/src/components/plots/FlatMap.tsx @@ -2,7 +2,10 @@ import React, {useMemo, useEffect, useRef, useState} from 'react' import * as THREE from 'three' -import { useAnalysisStore, useGlobalStore, usePlotStore, useZarrStore } from '@/GlobalStates' +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; import { vertShader } from '@/components/computation/shaders' import { flatFrag3D, fragmentFlat } from '../textures/shaders'; import { useShallow } from 'zustand/shallow' diff --git a/src/components/plots/KeyFramePreviewer.tsx b/src/components/plots/KeyFramePreviewer.tsx index 118492c3..b0091725 100644 --- a/src/components/plots/KeyFramePreviewer.tsx +++ b/src/components/plots/KeyFramePreviewer.tsx @@ -1,5 +1,7 @@ "use client"; -import { useGlobalStore, useImageExportStore, usePlotStore } from '@/GlobalStates' +import { useImageExportStore } from '@/GlobalStates/ImageExportStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { invalidate, useThree } from '@react-three/fiber'; import React, { useEffect, useMemo, useRef } from 'react' import { useShallow } from 'zustand/shallow' diff --git a/src/components/plots/MorphingPoints.tsx b/src/components/plots/MorphingPoints.tsx index 1a407095..1f9b0f35 100644 --- a/src/components/plots/MorphingPoints.tsx +++ b/src/components/plots/MorphingPoints.tsx @@ -7,7 +7,8 @@ import gsap from 'gsap'; import vertexShader from '@/components/textures/shaders/LandingVertex.glsl' import fragmentShader from '@/components/textures/shaders/LandingFrag.glsl' import './Plots.css'; -import { useGlobalStore, usePlotStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow'; diff --git a/src/components/plots/Plot.tsx b/src/components/plots/Plot.tsx index 0d4237aa..82cad3b0 100644 --- a/src/components/plots/Plot.tsx +++ b/src/components/plots/Plot.tsx @@ -4,7 +4,10 @@ import * as THREE from 'three'; import { PointCloud, UVCube, DataCube, FlatMap, Sphere, CountryBorders, AxisLines, SphereBlocks, FlatBlocks, KeyFramePreviewer } from '@/components/plots'; import { Canvas, invalidate, useThree, useLoader } from '@react-three/fiber'; import { CreateTexture } from '@/components/textures'; -import { useAnalysisStore, useGlobalStore, useImageExportStore, usePlotStore } from '@/GlobalStates'; +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useImageExportStore } from '@/GlobalStates/ImageExportStore'; import { useShallow } from 'zustand/shallow'; import { Navbar, Colorbar, ExportExtent, ShaderEditor, KeyFrames } from '../ui'; import AnalysisInfo from './AnalysisInfo'; diff --git a/src/components/plots/PointCloud.tsx b/src/components/plots/PointCloud.tsx index ec959ce6..71cb6889 100644 --- a/src/components/plots/PointCloud.tsx +++ b/src/components/plots/PointCloud.tsx @@ -1,7 +1,9 @@ import * as THREE from 'three' import { useEffect, useMemo, useState, useRef } from 'react' import { pointFrag, pointVert } from '@/components/textures/shaders' -import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates'; +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow'; import { parseUVCoords, getUnitAxis, GetTimeSeries, GetCurrentArray, deg2rad } from '@/utils/HelperFuncs'; import { evaluate_cmap } from 'js-colormaps-es'; diff --git a/src/components/plots/Sphere.tsx b/src/components/plots/Sphere.tsx index 4fbd4abf..e8d955ea 100644 --- a/src/components/plots/Sphere.tsx +++ b/src/components/plots/Sphere.tsx @@ -1,6 +1,8 @@ import React, {useRef, useMemo, useState, useEffect} from 'react' import * as THREE from 'three' -import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates' +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow' import { sphereVertex, sphereVertexFlat, sphereFrag, flatSphereFrag } from '../textures/shaders' import { parseUVCoords, GetTimeSeries, GetCurrentArray, deg2rad } from '@/utils/HelperFuncs'; diff --git a/src/components/plots/SphereBlocks.tsx b/src/components/plots/SphereBlocks.tsx index a445a680..e9530bb3 100644 --- a/src/components/plots/SphereBlocks.tsx +++ b/src/components/plots/SphereBlocks.tsx @@ -1,5 +1,7 @@ import React, { useEffect, useMemo } from 'react' -import { useErrorStore, useGlobalStore, usePlotStore } from '@/GlobalStates' +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useErrorStore } from '@/GlobalStates/ErrorStore'; import { useShallow } from 'zustand/shallow' import * as THREE from 'three' import { sphereBlocksVert, sphereBlocksVertFlat, sphereBlocksFrag } from '../textures/shaders' diff --git a/src/components/plots/UVCube.tsx b/src/components/plots/UVCube.tsx index bac6c1a1..db85a001 100644 --- a/src/components/plots/UVCube.tsx +++ b/src/components/plots/UVCube.tsx @@ -1,7 +1,9 @@ import * as THREE from 'three' import { useMemo, useState, useEffect, useRef } from 'react'; import { parseUVCoords, getUnitAxis, GetTimeSeries, GetCurrentArray } from '@/utils/HelperFuncs'; -import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates'; +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow'; import { evaluate_cmap } from 'js-colormaps-es'; diff --git a/src/components/plots/plotarea/FixedTicks.tsx b/src/components/plots/plotarea/FixedTicks.tsx index 1564b737..179b345c 100644 --- a/src/components/plots/plotarea/FixedTicks.tsx +++ b/src/components/plots/plotarea/FixedTicks.tsx @@ -3,7 +3,8 @@ import { useThree, useFrame } from '@react-three/fiber' import { useState, useMemo, useEffect, useRef } from 'react' import { parseTimeUnit } from '@/utils/HelperFuncs' import { Fragment } from 'react' -import { useGlobalStore, usePlotStore } from '@/GlobalStates' +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow' diff --git a/src/components/plots/plotarea/LinePlot.tsx b/src/components/plots/plotarea/LinePlot.tsx index 90c936f9..ef4dd954 100644 --- a/src/components/plots/plotarea/LinePlot.tsx +++ b/src/components/plots/plotarea/LinePlot.tsx @@ -4,7 +4,7 @@ import { FixedTicks, ThickLine } from '@/components/plots' import { RefObject, useEffect, useRef, useState } from 'react' import { ResizeBar, YScaler, XScaler, ShowLinePlot } from '@/components/ui' import './LinePlot.css' -import { useGlobalStore } from '@/GlobalStates' +import { useGlobalStore } from '@/GlobalStates/GlobalStore' import { useShallow } from 'zustand/shallow' import PlotLineOptions from '@/components/ui/LinePlotArea/PlotLineOptions' import { IoCloseCircleSharp } from "react-icons/io5"; diff --git a/src/components/plots/plotarea/PlotPoints.tsx b/src/components/plots/plotarea/PlotPoints.tsx index 36effaed..4afccb6b 100644 --- a/src/components/plots/plotarea/PlotPoints.tsx +++ b/src/components/plots/plotarea/PlotPoints.tsx @@ -1,7 +1,8 @@ import React, {useRef, useMemo, useEffect, useState} from 'react' import * as THREE from 'three' import { useFrame } from '@react-three/fiber' -import { useGlobalStore, usePlotStore } from '@/GlobalStates' +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow' interface pointSetters{ diff --git a/src/components/plots/plotarea/ThickLine.tsx b/src/components/plots/plotarea/ThickLine.tsx index f7c778d9..edb56da7 100644 --- a/src/components/plots/plotarea/ThickLine.tsx +++ b/src/components/plots/plotarea/ThickLine.tsx @@ -2,7 +2,8 @@ import React, {useEffect, useMemo, useRef, useState} from 'react' import * as THREE from 'three' -import { usePlotStore, useGlobalStore } from '@/GlobalStates' +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow' import vertexShader from '@/components/textures/shaders/thickLineVert.glsl' import { PlotPoints } from './PlotPoints'; diff --git a/src/components/textures/TextureMakers.tsx b/src/components/textures/TextureMakers.tsx index 9abd2119..6fef06c7 100644 --- a/src/components/textures/TextureMakers.tsx +++ b/src/components/textures/TextureMakers.tsx @@ -1,7 +1,7 @@ //This File will have functions converting the array information into 2D or 3D textures that we will pass to the corresponding 2D or 3D object import * as THREE from 'three' import { ArrayMinMax, TypedArray, TypedArrayBufferLike } from '@/utils/HelperFuncs'; -import { useGlobalStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; interface Array { data: TypedArray | TypedArrayBufferLike; diff --git a/src/components/ui/Colorbar.tsx b/src/components/ui/Colorbar.tsx index 1a2d6f96..3921e196 100644 --- a/src/components/ui/Colorbar.tsx +++ b/src/components/ui/Colorbar.tsx @@ -4,7 +4,9 @@ import { RxReset } from "react-icons/rx"; import { FaPlus, FaMinus } from "react-icons/fa"; import React, {useRef, useEffect, useMemo, useState} from 'react' -import { useGlobalStore, usePlotStore, useAnalysisStore } from '@/GlobalStates' +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow' import './css/Colorbar.css' import { linspace } from '@/utils/HelperFuncs'; diff --git a/src/components/ui/Elements/AxisBars.tsx b/src/components/ui/Elements/AxisBars.tsx index ee7d0d6c..9b8d1da3 100644 --- a/src/components/ui/Elements/AxisBars.tsx +++ b/src/components/ui/Elements/AxisBars.tsx @@ -1,6 +1,6 @@ import React from 'react' import "../css/AxisBars.css" -import { usePlotStore } from '@/GlobalStates' +import { usePlotStore } from '@/GlobalStates/PlotStore' import { useShallow } from 'zustand/shallow' import * as THREE from 'three' diff --git a/src/components/ui/Elements/Error.tsx b/src/components/ui/Elements/Error.tsx index bf32da21..5a8bc046 100644 --- a/src/components/ui/Elements/Error.tsx +++ b/src/components/ui/Elements/Error.tsx @@ -1,6 +1,6 @@ import React from 'react' import '../css/Error.css' -import { useErrorStore } from '@/GlobalStates' +import { useErrorStore } from '@/GlobalStates/ErrorStore' import { ErrorList } from './ErrorList' import { useShallow } from 'zustand/shallow' import { Button } from '@/components/ui' diff --git a/src/components/ui/Elements/Loading.tsx b/src/components/ui/Elements/Loading.tsx index a5cd333b..2cc6e648 100644 --- a/src/components/ui/Elements/Loading.tsx +++ b/src/components/ui/Elements/Loading.tsx @@ -1,4 +1,4 @@ -import { useGlobalStore } from "@/GlobalStates" +import { useGlobalStore } from "@/GlobalStates/GlobalStore" import '../css/Loading.css' import { useShallow } from "zustand/shallow" diff --git a/src/components/ui/ExportExtent.tsx b/src/components/ui/ExportExtent.tsx index d388977a..a51dda30 100644 --- a/src/components/ui/ExportExtent.tsx +++ b/src/components/ui/ExportExtent.tsx @@ -1,4 +1,6 @@ -import { useGlobalStore, useImageExportStore } from '@/GlobalStates' +import { useImageExportStore } from '@/GlobalStates/ImageExportStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; + import React from 'react' import { useShallow } from 'zustand/shallow' diff --git a/src/components/ui/Footer.tsx b/src/components/ui/Footer.tsx index aa417697..ca76296e 100644 --- a/src/components/ui/Footer.tsx +++ b/src/components/ui/Footer.tsx @@ -2,7 +2,7 @@ import Image from "next/image"; import { logoBGC_MPI, logoBGC, logoMPI } from "@/assets/index"; import './css/Footer.css'; -import { useImageExportStore } from "@/GlobalStates"; +import { useImageExportStore } from "@/GlobalStates/ImageExportStore"; import { useShallow } from "zustand/shallow"; const Footer = () => { diff --git a/src/components/ui/KeyFrames.tsx b/src/components/ui/KeyFrames.tsx index 6edfe8ca..71c614de 100644 --- a/src/components/ui/KeyFrames.tsx +++ b/src/components/ui/KeyFrames.tsx @@ -2,7 +2,8 @@ import React, {useEffect, useRef, useState } from 'react' import { Button } from './button' import { ButtonGroup } from "@/components/ui/button-group" -import { useImageExportStore, usePlotStore } from '@/GlobalStates' +import { useImageExportStore } from '@/GlobalStates/ImageExportStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow' import { Slider } from './slider' import './css/KeyFrames.css' diff --git a/src/components/ui/LinePlotArea/PlotLineOptions.tsx b/src/components/ui/LinePlotArea/PlotLineOptions.tsx index 3d34fb4b..375c0e93 100644 --- a/src/components/ui/LinePlotArea/PlotLineOptions.tsx +++ b/src/components/ui/LinePlotArea/PlotLineOptions.tsx @@ -9,7 +9,7 @@ import { DropdownMenuSeparator, DropdownMenuTrigger, } from "@/components/ui/dropdown-menu" -import { usePlotStore } from '@/GlobalStates' +import { usePlotStore } from '@/GlobalStates/PlotStore' import { useShallow } from 'zustand/shallow' import { Slider } from "@/components/ui/slider" diff --git a/src/components/ui/MainPanel/AdjustPlot.tsx b/src/components/ui/MainPanel/AdjustPlot.tsx index ae99d9a5..e085df1c 100644 --- a/src/components/ui/MainPanel/AdjustPlot.tsx +++ b/src/components/ui/MainPanel/AdjustPlot.tsx @@ -1,6 +1,8 @@ "use client"; import React, {useState, useEffect} from 'react' -import { useAnalysisStore, useGlobalStore, usePlotStore } from '@/GlobalStates'; +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import '../css/MainPanel.css' import { useShallow } from 'zustand/shallow'; import { SliderThumbs } from '@/components/ui/Widgets/SliderThumbs'; diff --git a/src/components/ui/MainPanel/AnalysisOptions.tsx b/src/components/ui/MainPanel/AnalysisOptions.tsx index 876ffa6e..7e40afbc 100644 --- a/src/components/ui/MainPanel/AnalysisOptions.tsx +++ b/src/components/ui/MainPanel/AnalysisOptions.tsx @@ -1,7 +1,9 @@ 'use client'; import React, { useEffect, useState, useRef } from 'react'; -import { useAnalysisStore, useGlobalStore, useZarrStore } from '@/GlobalStates'; +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; import { useShallow } from 'zustand/shallow'; import '../css/MainPanel.css'; import { PiMathOperationsBold } from "react-icons/pi"; diff --git a/src/components/ui/MainPanel/Colormaps.tsx b/src/components/ui/MainPanel/Colormaps.tsx index f9306e7b..e3660f99 100644 --- a/src/components/ui/MainPanel/Colormaps.tsx +++ b/src/components/ui/MainPanel/Colormaps.tsx @@ -2,7 +2,7 @@ import React, {useEffect, useState} from 'react' import { GetColorMapTexture } from '@/components/textures'; -import { useGlobalStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; import { colormaps } from '@/components/textures'; import { useShallow } from 'zustand/shallow'; import { MdOutlineSwapVert } from "react-icons/md"; diff --git a/src/components/ui/MainPanel/Dataset.tsx b/src/components/ui/MainPanel/Dataset.tsx index 9cd1aa8d..af685562 100644 --- a/src/components/ui/MainPanel/Dataset.tsx +++ b/src/components/ui/MainPanel/Dataset.tsx @@ -1,7 +1,8 @@ "use client"; import React, { SetStateAction, useEffect, useState, ReactNode } from 'react'; -import { useGlobalStore, useZarrStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; import { useShallow } from 'zustand/shallow'; import { Input } from '../input'; import { Button } from '../button'; diff --git a/src/components/ui/MainPanel/LocalNetCDF.tsx b/src/components/ui/MainPanel/LocalNetCDF.tsx index 733c3f22..beeb8bcf 100644 --- a/src/components/ui/MainPanel/LocalNetCDF.tsx +++ b/src/components/ui/MainPanel/LocalNetCDF.tsx @@ -1,7 +1,8 @@ "use client"; import React, {ChangeEvent, useState} from 'react' import { Input } from '../input' -import { useGlobalStore, useZarrStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; import { NetCDF4 } from '@earthyscience/netcdf4-wasm'; import { Alert, @@ -45,7 +46,7 @@ const LocalNetCDF = ({ setOpenVariables}:LocalNCType) => { data.getFullMetadata() ]) useGlobalStore.setState({variables: Object.keys(variables), zMeta: metadata, initStore:`local_${file.name}`}) - useZarrStore.setState({ fetchNC:true, useNC: true, ncModule: data}) + useZarrStore.setState({ useNC: true, ncModule: data}) const titleDescription = { title: attrs.title?? file.name, description: attrs.history?? '' diff --git a/src/components/ui/MainPanel/LocalZarr.tsx b/src/components/ui/MainPanel/LocalZarr.tsx index 264112b2..3edf6d28 100644 --- a/src/components/ui/MainPanel/LocalZarr.tsx +++ b/src/components/ui/MainPanel/LocalZarr.tsx @@ -1,7 +1,8 @@ "use client"; import React, {useState, useEffect, ChangeEvent} from 'react' import * as zarr from 'zarrita' -import { useZarrStore, useGlobalStore } from '@/GlobalStates'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; import { Input } from '../input'; import ZarrParser from '@/components/zarr/ZarrParser'; diff --git a/src/components/ui/MainPanel/MetaDataInfo.tsx b/src/components/ui/MainPanel/MetaDataInfo.tsx index 2ba2aa54..4e258956 100644 --- a/src/components/ui/MainPanel/MetaDataInfo.tsx +++ b/src/components/ui/MainPanel/MetaDataInfo.tsx @@ -1,5 +1,8 @@ import React, { useState, useMemo, useEffect } from "react" -import { useCacheStore, useGlobalStore, usePlotStore, useZarrStore } from '@/GlobalStates' +import { useCacheStore } from "@/GlobalStates/CacheStore"; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; import { useShallow } from 'zustand/shallow' import { SliderThumbs } from "@/components/ui/Widgets/SliderThumbs" import Metadata, { defaultAttributes, renderAttributes } from "@/components/ui/MetaData" diff --git a/src/components/ui/MainPanel/PlayButton.tsx b/src/components/ui/MainPanel/PlayButton.tsx index 31da8042..35115255 100644 --- a/src/components/ui/MainPanel/PlayButton.tsx +++ b/src/components/ui/MainPanel/PlayButton.tsx @@ -1,5 +1,8 @@ "use client"; -import { useCacheStore, useGlobalStore, usePlotStore, useZarrStore } from '@/GlobalStates' +import { useCacheStore } from '@/GlobalStates/CacheStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; import {useEffect, useMemo, useState, useRef} from 'react' import { useShallow } from 'zustand/shallow' import '../css/MainPanel.css' diff --git a/src/components/ui/MainPanel/PlotType.tsx b/src/components/ui/MainPanel/PlotType.tsx index 5a88fc98..e9fe5a7e 100644 --- a/src/components/ui/MainPanel/PlotType.tsx +++ b/src/components/ui/MainPanel/PlotType.tsx @@ -2,7 +2,8 @@ import React, { useEffect, useMemo, useState } from 'react' import '../css/MainPanel.css' -import { useGlobalStore, usePlotStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow'; import { PiSphereThin } from "react-icons/pi"; import { CgMenuGridO } from "react-icons/cg"; diff --git a/src/components/ui/MainPanel/Variables.tsx b/src/components/ui/MainPanel/Variables.tsx index 7e6aee08..bf29d17b 100644 --- a/src/components/ui/MainPanel/Variables.tsx +++ b/src/components/ui/MainPanel/Variables.tsx @@ -2,7 +2,7 @@ import React, { useState, useEffect, useMemo } from "react"; import { TbVariable } from "react-icons/tb"; -import { useGlobalStore, useZarrStore } from "@/GlobalStates"; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; import { useShallow } from "zustand/shallow"; import { Separator } from "@/components/ui/separator"; import MetaDataInfo from "./MetaDataInfo"; diff --git a/src/components/ui/NavBar/ExportImageSettings.tsx b/src/components/ui/NavBar/ExportImageSettings.tsx index ceab7cd4..08e13b3f 100644 --- a/src/components/ui/NavBar/ExportImageSettings.tsx +++ b/src/components/ui/NavBar/ExportImageSettings.tsx @@ -8,7 +8,9 @@ import { TooltipContent, TooltipTrigger, } from "@/components/ui/tooltip" -import { useGlobalStore, useImageExportStore, usePlotStore } from '@/GlobalStates'; +import { useImageExportStore } from '@/GlobalStates/ImageExportStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { useShallow } from 'zustand/shallow'; import { ChevronDown } from 'lucide-react'; import { diff --git a/src/components/ui/NavBar/Navbar.tsx b/src/components/ui/NavBar/Navbar.tsx index d55fb7e6..2abd0e2f 100644 --- a/src/components/ui/NavBar/Navbar.tsx +++ b/src/components/ui/NavBar/Navbar.tsx @@ -17,7 +17,8 @@ import { TooltipTrigger, } from "@/components/ui/tooltip"; import { cn } from "@/lib/utils"; -import { useGlobalStore, usePlotStore } from "@/GlobalStates"; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; import { Orthographic, Perspective } from "../Elements/Icons"; import PerformanceMode from "./PerformanceMode"; diff --git a/src/components/ui/NavBar/PerformanceMode.tsx b/src/components/ui/NavBar/PerformanceMode.tsx index aa3c24b6..cbf625bc 100644 --- a/src/components/ui/NavBar/PerformanceMode.tsx +++ b/src/components/ui/NavBar/PerformanceMode.tsx @@ -4,7 +4,7 @@ import { MdOutlineRocketLaunch } from "react-icons/md"; import { Potato } from '../Elements/Icons'; import { FaCarSide } from "react-icons/fa6"; import { Popover, PopoverTrigger, PopoverContent } from "@/components/ui/popover" -import { useGlobalStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; import { Button } from "@/components/ui/button" const icons = { diff --git a/src/components/ui/NavBar/PlotLineButton.tsx b/src/components/ui/NavBar/PlotLineButton.tsx index ba121135..54e875a6 100644 --- a/src/components/ui/NavBar/PlotLineButton.tsx +++ b/src/components/ui/NavBar/PlotLineButton.tsx @@ -2,7 +2,8 @@ import React from 'react' import { VscGraphLine } from "react-icons/vsc"; //Use this if you hate the svg -import { useErrorStore, usePlotStore } from '@/GlobalStates' +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useErrorStore } from '@/GlobalStates/ErrorStore'; import { useShallow } from 'zustand/shallow'; import '../css/PlotLineButton.css' import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip" diff --git a/src/components/ui/ShaderEditor.tsx b/src/components/ui/ShaderEditor.tsx index abba82e9..7f6165f4 100644 --- a/src/components/ui/ShaderEditor.tsx +++ b/src/components/ui/ShaderEditor.tsx @@ -10,7 +10,8 @@ import { } from '@/components/ui/select'; import './css/ShaderEditor.css' import { Button } from './button'; -import { useAnalysisStore, useGlobalStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { useAnalysisStore } from '@/GlobalStates/AnalysisStore'; import { IoCloseCircleSharp } from "react-icons/io5"; import { useShallow } from 'zustand/shallow'; import {Hider, Input, Switcher} from '../ui'; diff --git a/src/components/zarr/GetMetadata.tsx b/src/components/zarr/GetMetadata.tsx index 87e49829..baa8cfd5 100644 --- a/src/components/zarr/GetMetadata.tsx +++ b/src/components/zarr/GetMetadata.tsx @@ -1,6 +1,6 @@ import * as zarr from "zarrita"; import { ZarrMetadata, ZarrItem, ZarrTitleDescription } from "./Interfaces"; -import { useGlobalStore } from "@/GlobalStates"; +import { useGlobalStore } from "@/GlobalStates/GlobalStore"; export function formatBytes(bytes: number): string { const units = ["bytes", "KB", "MB", "GB", "TB", "PB"]; diff --git a/src/components/zarr/MetadataText.tsx b/src/components/zarr/MetadataText.tsx index 0a7c2f52..f69e327b 100644 --- a/src/components/zarr/MetadataText.tsx +++ b/src/components/zarr/MetadataText.tsx @@ -2,7 +2,7 @@ import { useState, useRef } from 'react' import { useCursor, RoundedBox, Text, Edges } from '@react-three/drei' import { Group } from 'three' import { ZarrMetadata } from '@/components/zarr/Interfaces' -import { useGlobalStore } from '@/GlobalStates' // Import global store +import { useGlobalStore } from '@/GlobalStates/GlobalStore' // Import global store interface MetadataTextProps { position?: [number, number, number]; diff --git a/src/components/zarr/NCGetters.ts b/src/components/zarr/NCGetters.ts index 25a5869c..502900a6 100644 --- a/src/components/zarr/NCGetters.ts +++ b/src/components/zarr/NCGetters.ts @@ -1,4 +1,7 @@ -import { useZarrStore, useCacheStore, useGlobalStore, useErrorStore } from "@/GlobalStates" +import { useZarrStore } from "@/GlobalStates/ZarrStore"; +import { useCacheStore } from "@/GlobalStates/CacheStore"; +import { useGlobalStore } from "@/GlobalStates/GlobalStore"; +import { useErrorStore } from "@/GlobalStates/ErrorStore"; import { ToFloat16, CompressArray, DecompressArray, copyChunkToArray, RescaleArray } from "./ZarrLoaderLRU"; import { Convolve } from "../computation/webGPU"; import {coarsen3DArray, calculateStrides, TypedArray} from '@/utils/HelperFuncs' diff --git a/src/components/zarr/ZarrGetters.ts b/src/components/zarr/ZarrGetters.ts index b05578ba..4d920d35 100644 --- a/src/components/zarr/ZarrGetters.ts +++ b/src/components/zarr/ZarrGetters.ts @@ -1,4 +1,7 @@ -import { useZarrStore, useCacheStore, useGlobalStore, useErrorStore } from "@/GlobalStates"; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { useCacheStore } from '@/GlobalStates/CacheStore'; +import { useErrorStore } from '@/GlobalStates/ErrorStore'; import * as zarr from 'zarrita'; import { CompressArray, DecompressArray, ZarrError, RescaleArray, ToFloat16, copyChunkToArray } from "./ZarrLoaderLRU"; import { GetSize } from "./GetMetadata"; diff --git a/src/components/zarr/ZarrLoaderLRU.ts b/src/components/zarr/ZarrLoaderLRU.ts index 71a8d544..b6e73dc7 100644 --- a/src/components/zarr/ZarrLoaderLRU.ts +++ b/src/components/zarr/ZarrLoaderLRU.ts @@ -1,6 +1,9 @@ import * as zarr from "zarrita"; import { ArrayMinMax } from "@/utils/HelperFuncs"; -import { useGlobalStore, useZarrStore, useErrorStore, useCacheStore } from "@/GlobalStates"; +import { useGlobalStore } from "@/GlobalStates/GlobalStore"; +import { useZarrStore } from "@/GlobalStates/ZarrStore"; +import { useErrorStore } from "@/GlobalStates/ErrorStore"; +import { useCacheStore } from "@/GlobalStates/CacheStore"; import { gzipSync, decompressSync } from 'fflate'; import { GetNCArray, GetNCMetadata } from "./NCGetters"; import { GetZarrAttributes, GetZarrArray } from "./ZarrGetters"; diff --git a/src/hooks/useCoordBounds.tsx b/src/hooks/useCoordBounds.tsx index c6b6e2a4..89df3f2e 100644 --- a/src/hooks/useCoordBounds.tsx +++ b/src/hooks/useCoordBounds.tsx @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import { usePlotStore } from "@/GlobalStates"; +import { usePlotStore } from "@/GlobalStates/PlotStore"; import { useShallow } from "zustand/shallow"; diff --git a/src/hooks/useDataFetcher.tsx b/src/hooks/useDataFetcher.tsx index 0e0e5d29..bc46d611 100644 --- a/src/hooks/useDataFetcher.tsx +++ b/src/hooks/useDataFetcher.tsx @@ -1,6 +1,8 @@ import { useState, useEffect } from 'react'; import * as THREE from 'three'; -import { useGlobalStore, usePlotStore, useZarrStore } from '@/GlobalStates'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; import { useShallow } from 'zustand/shallow'; import { ParseExtent, GetDimInfo } from '@/utils/HelperFuncs'; import { GetArray, GetAttributes } from '@/components/zarr/ZarrLoaderLRU'; diff --git a/src/utils/ExportCanvas.tsx b/src/utils/ExportCanvas.tsx index 9677cd49..c9bb1603 100644 --- a/src/utils/ExportCanvas.tsx +++ b/src/utils/ExportCanvas.tsx @@ -1,7 +1,9 @@ "use client"; import React, { useEffect, useRef } from 'react' -import { useGlobalStore, useImageExportStore, usePlotStore } from '@/GlobalStates' +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useImageExportStore } from '@/GlobalStates/ImageExportStore'; import { useThree } from '@react-three/fiber' import { useCSSVariable } from '@/components/ui'; import * as THREE from 'three' diff --git a/src/utils/HelperFuncs.ts b/src/utils/HelperFuncs.ts index 7e960547..b60c7724 100644 --- a/src/utils/HelperFuncs.ts +++ b/src/utils/HelperFuncs.ts @@ -1,6 +1,9 @@ 'use client'; import * as THREE from 'three' -import { useGlobalStore, usePlotStore, useZarrStore, useCacheStore } from '@/GlobalStates'; +import { useCacheStore } from '@/GlobalStates/CacheStore'; +import { useGlobalStore } from '@/GlobalStates/GlobalStore'; +import { usePlotStore } from '@/GlobalStates/PlotStore'; +import { useZarrStore } from '@/GlobalStates/ZarrStore'; import { decompressSync } from 'fflate'; import { copyChunkToArray } from '@/components/zarr/ZarrLoaderLRU'; import { GetNCDims } from '@/components/zarr/NCGetters'; From db0487b905960ad0036eb61e353e4146b3bcadb0 Mon Sep 17 00:00:00 2001 From: Jeran Date: Mon, 2 Mar 2026 18:08:25 +0100 Subject: [PATCH 2/2] lint --- src/components/ui/VariablesTable.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/ui/VariablesTable.tsx b/src/components/ui/VariablesTable.tsx index 6b2b2084..d99a2450 100644 --- a/src/components/ui/VariablesTable.tsx +++ b/src/components/ui/VariablesTable.tsx @@ -4,9 +4,8 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@ import { ScrollArea } from "@/components/ui/scroll-area"; import { Input } from "@/components/ui/input"; import { Button } from "@/components/ui/button"; -import { useGlobalStore } from "@/GlobalStates"; +import { useGlobalStore } from "@/GlobalStates/GlobalStore"; import { useShallow } from "zustand/shallow"; -import MetaDataInfo from "./MainPanel/MetaDataInfo"; import { Dialog, DialogContent,