Merge pull request #187 from Tauffer-Consulting/chore/install-reposit…

…ories-on-editor Chore/Install repositories on editor improvments
Tauffer-Consulting · Nov 27, 2023 · 9a4c44e · 9a4c44e
2 parents ba0cd24 + 374dd4b
commit 9a4c44e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/frontend/src/features/workflowEditor/components/DifferencesModal/index.tsx b/frontend/src/features/workflowEditor/components/DifferencesModal/index.tsx
@@ -14,6 +14,7 @@ import {
 import { Modal, type ModalRef } from "components/Modal";
 import { useWorkspaces, usesPieces } from "context/workspaces";
 import { type Differences } from "features/workflowEditor/utils/importWorkflow";
+import theme from "providers/theme.config";
 import React, { forwardRef, useCallback, useMemo, useState } from "react";
 import { Link } from "react-router-dom";
 import { toast } from "react-toastify";
@@ -162,6 +163,14 @@ export const DifferencesModal = forwardRef<ModalRef, Props>(
                     variant="outlined"
                     onClick={handleInstallMissingRepositories}
                     disabled={installState !== 0}
+                    style={
+                      installState === 2
+                        ? {
+                            borderColor: theme.palette.success.main,
+                            color: theme.palette.success.main,
+                          }
+                        : {}
+                    }
                   >
                     {installState === 1 && (
                       <>

diff --git a/frontend/src/features/workspaces/components/workspaceSettings/RepositoriesCard.tsx b/frontend/src/features/workspaces/components/workspaceSettings/RepositoriesCard.tsx
@@ -121,7 +121,26 @@ export const RepositoriesCard: FC = () => {
         })
           .then((data) => {
             if (data) {
-              setAvailableVersions(data?.splice(0, 10));
+              const devVersion = data.find(
+                (item) =>
+                  item.version === "dev" || item.version === "development",
+              );
+              const versionsOnly = data
+                .filter(
+                  (item) =>
+                    item.version !== "dev" && item.version !== "development",
+                )
+                .splice(0, 10);
+
+              const sortedVersions = versionsOnly.sort(
+                (a, b) => parseFloat(b.version) - parseFloat(a.version),
+              );
+
+              const sortedData = devVersion
+                ? [...sortedVersions, devVersion]
+                : sortedVersions;
+
+              setAvailableVersions(sortedData);
             }
             setStep("SELECT_VERSION");
           })