feat(version): release 0.32.7 version

robolaunch · Jan 24, 2024 · 337a5ca · 337a5ca
1 parent 56f8916
commit 337a5ca
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.32.6",
+  "version": "0.32.7",
   "private": true,
   "scripts": {
     "dev": "GENERATE_SOURCEMAP=false react-scripts start",

diff --git a/public/css/style.css b/public/css/style.css
@@ -3546,6 +3546,16 @@ td {
   border-color: rgb(124 124 124 / var(--tw-border-opacity)) !important;
 }
 
+.disabled\:\!border-primary-200:disabled {
+  --tw-border-opacity: 1 !important;
+  border-color: rgb(220 167 255 / var(--tw-border-opacity)) !important;
+}
+
+.disabled\:\!border-primary-100:disabled {
+  --tw-border-opacity: 1 !important;
+  border-color: rgb(236 207 255 / var(--tw-border-opacity)) !important;
+}
+
 .disabled\:\!bg-red-400:disabled {
   --tw-bg-opacity: 1 !important;
   background-color: rgb(248 113 113 / var(--tw-bg-opacity)) !important;
@@ -3556,11 +3566,31 @@ td {
   background-color: rgb(188 86 254 / var(--tw-bg-opacity));
 }
 
+.disabled\:bg-primary-200:disabled {
+  --tw-bg-opacity: 1;
+  background-color: rgb(220 167 255 / var(--tw-bg-opacity));
+}
+
+.disabled\:\!bg-primary-200:disabled {
+  --tw-bg-opacity: 1 !important;
+  background-color: rgb(220 167 255 / var(--tw-bg-opacity)) !important;
+}
+
 .disabled\:\!text-light-300:disabled {
   --tw-text-opacity: 1 !important;
   color: rgb(189 189 189 / var(--tw-text-opacity)) !important;
 }
 
+.disabled\:\!text-primary-100:disabled {
+  --tw-text-opacity: 1 !important;
+  color: rgb(236 207 255 / var(--tw-text-opacity)) !important;
+}
+
+.disabled\:\!text-primary-200:disabled {
+  --tw-text-opacity: 1 !important;
+  color: rgb(220 167 255 / var(--tw-text-opacity)) !important;
+}
+
 @media (min-width: 768px) {
   .md\:col-span-5 {
     grid-column: span 5 / span 5;

diff --git a/src/components/Button/Button.tsx b/src/components/Button/Button.tsx
@@ -25,7 +25,7 @@ export default function Button({
       type={type || "button"}
       disabled={disabled}
       onClick={() => (onClick ? onClick() : null)}
-      className={`transition-300 bg-primary-500 hover:bg-primary-700 focus:ring-primary-300 disabled:bg-primary-400 flex h-12 w-full items-center justify-center rounded-md text-xs font-medium text-white hover:scale-[0.99] focus:ring-4 active:bg-purple-900 ${className}`}
+      className={`transition-300 flex h-12 w-full items-center justify-center rounded-md bg-primary-500 text-xs font-medium text-white hover:scale-[0.99] hover:bg-primary-700 focus:ring-4 focus:ring-primary-300 active:bg-purple-900   ${className}`}
     >
       {loading ? (
         <img

diff --git a/src/components/TableInformationCells/StartStopCell.tsx b/src/components/TableInformationCells/StartStopCell.tsx
@@ -33,10 +33,10 @@ export default function StartStopCell({
         <Button
           className={`!h-9 ${
             isRunning &&
-            "border border-primary-500 !bg-transparent !text-primary-500"
+            "border border-primary-500 !bg-transparent !text-primary-500 disabled:cursor-not-allowed disabled:!border-primary-200 disabled:!text-primary-200"
           }`}
           disabled={disabled}
-          loading={disabled}
+          loading={loading}
           text={isRunning ? "Stop" : "Start"}
           onClick={() => setIsOpenModal(true)}
         />

diff --git a/src/controllers/DataScienceTableData.tsx b/src/controllers/DataScienceTableData.tsx
@@ -52,7 +52,7 @@ export function DataScienceTableData() {
           externalIP: app?.externalServiceEndpoint,
           log: app?.applicationLog,
           status: app?.status,
-          toggleState: app,
+          actions: app,
         };
       }) || [],
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -88,7 +88,7 @@ export function DataScienceTableData() {
                 <p className="text-xs text-light-700">Not Deployed</p>
               ) : (
                 <URLCell
-                  text={rowData?.externalIP}
+                  text={rowData?.externalIP?.split("#")?.[0]}
                   url={rowData?.externalIP}
                   target="_blank"
                 />
@@ -122,10 +122,10 @@ export function DataScienceTableData() {
         },
       },
       {
-        key: "toggleState",
+        key: "actions",
         header: "Actions",
         body: (rowData: any) => {
-          console.log(rowData);
+          console.log("alo", rowData);
           return (
             <StartStopCell
               isRunning={(() => {
@@ -138,29 +138,33 @@ export function DataScienceTableData() {
               })()}
               handleStart={() => {
                 createDataScienceApp({
-                  applicationName: rowData?.toggleState?.name,
+                  applicationName: rowData?.actions?.name,
                 });
                 setTimeout(() => {
                   handleReload();
                 }, 1000);
               }}
               handleStop={() => {
                 deleteDataScienceApp({
-                  applicationName: rowData?.toggleState?.name,
+                  applicationName: rowData?.actions?.name,
                 });
                 setTimeout(() => {
                   handleReload();
                 }, 1000);
               }}
               disabled={(() => {
-                switch (rowData?.status) {
-                  case "Not Deployed":
-                    return false;
-                  case "Ready":
-                    return false;
-                  default:
-                    return true;
+                if (!rowData?.actions?.application?.isDeletable) {
+                  return true;
+                }
+              })()}
+              loading={(() => {
+                if (
+                  rowData?.status === "Ready" ||
+                  rowData?.status === "Not Deployed"
+                ) {
+                  return false;
                 }
+                return true;
               })()}
               modalText={(() => {
                 switch (rowData?.status) {