Reduce duplication

i-VRESSE · Mar 7, 2024 · 05b4c5e · 05b4c5e
1 parent 91c6bcd
commit 05b4c5e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/app/routes/jobs.$id.tools.reclustfcc.$module.tsx b/app/routes/jobs.$id.tools.reclustfcc.$module.tsx
@@ -60,29 +60,26 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
     request.url,
     hasInteractiveVersion
   );
-  const defaultValues = await getParams({
+  const info = {
     jobid,
-    moduleIndex,
     isInteractive: showInteractiveVersion,
     bartenderToken,
     moduleIndexPadding,
+  }
+  const defaultValues = await getParams({
+    moduleIndex,
+    ...info,
   });
   const clusters = await getClusters({
-    jobid,
     moduleIndex,
-    isInteractive: showInteractiveVersion,
-    bartenderToken,
-    moduleIndexPadding,
+    ...info,
   });
   let caprievalData;
   if (showInteractiveVersion) {
     const { scatterSelection, boxSelection } = getPlotSelection(request.url);
     caprievalData = await getCaprievalData({
-      jobid,
       module: moduleIndex,
-      isInteractive: showInteractiveVersion,
-      bartenderToken,
-      moduleIndexPadding,
+      ...info,
       scatterSelection,
       boxSelection,
       moduleName: "clustfcc",

diff --git a/app/routes/jobs.$id.tools.reclustrmsd.$module.tsx b/app/routes/jobs.$id.tools.reclustrmsd.$module.tsx
@@ -57,29 +57,26 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
     request.url,
     hasInteractiveVersion
   );
-  const defaultValues = await getParams({
+  const info = {
     jobid: jobId,
-    moduleIndex,
     isInteractive: showInteractiveVersion,
     bartenderToken,
     moduleIndexPadding,
+  }
+  const defaultValues = await getParams({
+    moduleIndex,
+    ...info,
   });
   const clusters = await getClusters({
-    jobid: jobId,
     moduleIndex,
-    isInteractive: showInteractiveVersion,
-    bartenderToken,
-    moduleIndexPadding,
+    ...info,
   });
   let caprievalData;
   if (showInteractiveVersion) {
     const { scatterSelection, boxSelection } = getPlotSelection(request.url);
     caprievalData = await getCaprievalData({
-      jobid: jobId,
       module: moduleIndex,
-      isInteractive: showInteractiveVersion,
-      bartenderToken,
-      moduleIndexPadding,
+      ...info,
       scatterSelection,
       boxSelection,
       moduleName: "clustrmsd",