Merge pull request #1079 from PintoGideon/Archive-Feed-Fix

Hotfix to the compute node in a pipeline tree.
FNNDSC · Feb 27, 2024 · caae85d · caae85d
2 parents 93a07b1 + 11734bc
commit caae85d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 36 deletions.
diff --git a/src/api/common.ts b/src/api/common.ts
@@ -273,11 +273,14 @@ export async function fetchComputeInfo(
       plugin_id: `${plugin_id}`,
     });
 
+    const length = computeEnvs.data.length;
+    const currentlySelected = computeEnvs.data[length - 1].name as string;
+
     if (computeEnvs.getItems()) {
       const computeEnvData = {
         [dictionary_id]: {
           computeEnvs: computeEnvs.getItems() as ComputeResource[],
-          currentlySelected: computeEnvs.data[0].name as string,
+          currentlySelected,
         },
       };
       return computeEnvData;
@@ -367,7 +370,7 @@ export const uploadFile = async (
   formData.append("fname", file, name);
 
   const config = {
-    headers: { Authorization: "Token " + token },
+    headers: { Authorization: `Token ${token}` },
     onUploadProgress,
   };
 

diff --git a/src/components/AddTsNode/ConfigureJoin.tsx b/src/components/AddTsNode/ConfigureJoin.tsx
@@ -68,40 +68,36 @@ const ConfigureJoin = ({
           marginTop: "1em",
         }}
       >
-        {tsParams &&
-          tsParams.map((param) => {
-            if (param.data.name !== "plugininstances") {
-              if (param.data.name === "groupByInstance") {
-                return (
-                  <Checkbox
-                    key={param.data.id}
-                    checked={joinInput[param.data.name] as boolean}
-                    onChange={(event: any) => {
-                      handleCheckboxChange(
-                        event.target.checked,
-                        param.data.name,
-                      );
-                    }}
-                  >
-                    {param.data.name}
-                  </Checkbox>
-                );
-              } else
-                return (
-                  <Form.Item key={param.data.id} label={param.data.name}>
-                    <Input
-                      className="input"
-                      value={joinInput[param.data.name] as string}
-                      onChange={(
-                        event: React.ChangeEvent<HTMLInputElement>,
-                      ) => {
-                        handleValueChange(event.target.value, param.data.name);
-                      }}
-                    />
-                  </Form.Item>
-                );
-            } else return null;
-          })}
+        {tsParams?.map((param) => {
+          if (param.data.name !== "plugininstances") {
+            if (param.data.name === "groupByInstance") {
+              return (
+                <Checkbox
+                  key={param.data.id}
+                  checked={joinInput[param.data.name] as boolean}
+                  onChange={(event: any) => {
+                    handleCheckboxChange(event.target.checked, param.data.name);
+                  }}
+                >
+                  {param.data.name}
+                </Checkbox>
+              );
+            }
+            return (
+              <Form.Item key={param.data.id} label={param.data.name}>
+                <Input
+                  className="input"
+                  value={joinInput[param.data.name] as string}
+                  onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
+                    handleValueChange(event.target.value, param.data.name);
+                  }}
+                />
+              </Form.Item>
+            );
+          }
+
+          return null;
+        })}
       </Form>
     </div>
   );

diff --git a/src/components/PipelinesCopy/index.tsx b/src/components/PipelinesCopy/index.tsx
@@ -197,6 +197,7 @@ const PipelinesCopy = () => {
         <SpinContainer title="Fetching the Pipelines" />
       ) : data?.registeredPipelines && data.registeredPipelines.length > 0 ? (
         <Collapse
+          style={{ marginTop: "1em" }}
           onChange={handleChange}
           items={data.registeredPipelines.map((pipeline) => {
             const { name, id } = pipeline.data;

diff --git a/tests/pipelines.spec.ts b/tests/pipelines.spec.ts
@@ -0,0 +1,3 @@
+import { test } from "./fixtures/notLoggedIn.ts";
+
+test.describe("Pipelines Page", () => {});
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { test } from "./fixtures/notLoggedIn.ts";

		test.describe("Pipelines Page", () => {});