From 7c2ac65dab5cdcf1d3475e45de5b4c889a263adb Mon Sep 17 00:00:00 2001
From: Dante Catalfamo <43040593+dantecatalfamo@users.noreply.github.com>
Date: Fri, 14 Feb 2025 09:31:21 -0500
Subject: [PATCH] Always edit script, remove details modal from script page
 (#26325)

#26323
---
 .../ManageControlsPage/Scripts/Scripts.tsx    | 32 ++-----------------
 .../EditScriptModal/EditScriptModal.tsx       |  7 ++--
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/frontend/pages/ManageControlsPage/Scripts/Scripts.tsx b/frontend/pages/ManageControlsPage/Scripts/Scripts.tsx
index 38582004f0..566f726e70 100644
--- a/frontend/pages/ManageControlsPage/Scripts/Scripts.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/Scripts.tsx
@@ -37,9 +37,7 @@ interface IScriptsProps {
 const Scripts = ({ router, currentPage, teamIdForApi }: IScriptsProps) => {
   const { isPremiumTier } = useContext(AppContext);
   const [showDeleteScriptModal, setShowDeleteScriptModal] = useState(false);
-  const [showScriptDetailsModal, setShowScriptDetailsModal] = useState(false);
   const [showEditScripsModal, setShowEditScriptModal] = useState(false);
-  const [goBackToScriptDetails, setGoBackToScriptDetails] = useState(false); // Used for onCancel in delete modal
 
   const selectedScript = useRef<IScript | null>(null);
 
@@ -86,13 +84,7 @@ const Scripts = ({ router, currentPage, teamIdForApi }: IScriptsProps) => {
 
   const onClickScript = (script: IScript) => {
     selectedScript.current = script;
-    setShowScriptDetailsModal(true);
-  };
-
-  const onCancelScriptDetails = () => {
-    selectedScript.current = null;
-    setShowScriptDetailsModal(false);
-    setGoBackToScriptDetails(false);
+    setShowEditScriptModal(true);
   };
 
   const onEditScript = (script: IScript) => {
@@ -112,12 +104,7 @@ const Scripts = ({ router, currentPage, teamIdForApi }: IScriptsProps) => {
 
   const onCancelDelete = () => {
     setShowDeleteScriptModal(false);
-
-    if (goBackToScriptDetails) {
-      setShowScriptDetailsModal(true);
-    } else {
-      selectedScript.current = null;
-    }
+    selectedScript.current = null;
   };
 
   const onDeleteScript = () => {
@@ -200,21 +187,6 @@ const Scripts = ({ router, currentPage, teamIdForApi }: IScriptsProps) => {
           onDone={onDeleteScript}
         />
       )}
-      {showScriptDetailsModal && selectedScript.current && (
-        <ScriptDetailsModal
-          selectedScriptDetails={{
-            script_id: selectedScript.current?.id,
-            name: selectedScript.current?.name,
-          }}
-          onCancel={onCancelScriptDetails}
-          onDelete={() => {
-            setShowScriptDetailsModal(false);
-            setShowDeleteScriptModal(true);
-            setGoBackToScriptDetails(true);
-          }}
-          runScriptHelpText
-        />
-      )}
       {showEditScripsModal && selectedScript.current && (
         <EditScriptModal
           scriptId={selectedScript.current.id}
diff --git a/frontend/pages/ManageControlsPage/Scripts/components/EditScriptModal/EditScriptModal.tsx b/frontend/pages/ManageControlsPage/Scripts/components/EditScriptModal/EditScriptModal.tsx
index 745eaec821..8ee18058ad 100644
--- a/frontend/pages/ManageControlsPage/Scripts/components/EditScriptModal/EditScriptModal.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/components/EditScriptModal/EditScriptModal.tsx
@@ -106,11 +106,12 @@ const EditScriptModal = ({
       <>
         <form onSubmit={onSubmit}>
           <Editor
-            value={scriptFormData}
-            onChange={onChange}
-            isFormField
             error={formError}
+            isFormField
+            label="Script"
             onBlur={onBlur}
+            onChange={onChange}
+            value={scriptFormData}
           />
           <div className="form-field__help-text">
             To run this script on a host, go to the{" "}