Merge pull request #222 from parkpow/dd-extension2

Docker desktop extension bug fixes and improvements
parkpow · Nov 5, 2024 · 3f881a7 · 3f881a7
2 parents 7645a7f + 2d83b36
commit 3f881a7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/docker/dd-extension/ui/src/components/Loader.tsx b/docker/dd-extension/ui/src/components/Loader.tsx
@@ -8,7 +8,7 @@ interface LoaderProps {
 export default function Loader({ isLoading }: LoaderProps) {
   if (!isLoading) return null;
   return (
-    <Spinner animation="border" role="status" size='sm'>
+    <Spinner animation="border" role="status" size='sm' className="me-1">
       <span className="visually-hidden">Loading...</span>
     </Spinner>
   );

diff --git a/docker/dd-extension/ui/src/components/ShowCommand.tsx b/docker/dd-extension/ui/src/components/ShowCommand.tsx
@@ -53,7 +53,7 @@ export default function ShowCommand({
     }).catch(e => {
       setRunningCommand(false);
       console.error(e);
-      ddClient.desktopUI.toast.error('Failed Run Command.');
+      ddClient.desktopUI.toast.error(`Run Command Failed: ${e.stderr.trim()}`);
     })
   }
 

diff --git a/docker/dd-extension/ui/src/components/Snapshot.tsx b/docker/dd-extension/ui/src/components/Snapshot.tsx
@@ -125,7 +125,7 @@ export default function Snapshot() {
   useEffect(() => {
     const imagem = generateDockerImage()
     generateDockerRunCommand(imagem)
-  }, [country, architecture, token, licenseKey, restartPolicy]);
+  }, [country, architecture, token, curlPort, licenseKey, restartPolicy]);
 
 
   const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
@@ -166,8 +166,6 @@ export default function Snapshot() {
   };
   return (
     <Form onSubmit={handleSubmit}>
-      <Loader isLoading={isLoading} />
-
       <Form.Group as={Row} className="mb-3" controlId="snapshotToken">
         <Form.Label column sm={4}>
           Please enter your Plate Recognizer{" "}
@@ -260,7 +258,7 @@ export default function Snapshot() {
             placeholder="Port"
             name="port"
             required
-            defaultValue={8080}
+            value={curlPort}
             onChange={handleInputChange}
           />
         </Col>
@@ -310,6 +308,7 @@ export default function Snapshot() {
       <Form.Group as={Row} className="mb-3">
         <div className="col-2">
           <Button className="btn btn-primary" type="submit">
+            <Loader isLoading={isLoading} />
             Show Docker Command
           </Button>
         </div>

diff --git a/docker/dd-extension/ui/src/components/Stream.tsx b/docker/dd-extension/ui/src/components/Stream.tsx
@@ -83,7 +83,6 @@ export default function Stream() {
 
   return (
     <Form onSubmit={handleSubmit}>
-      <Loader isLoading={isLoading} />
       <Form.Group as={Row} className="mb-3" controlId="streamToken">
         <Form.Label column sm={4}>
           Please enter your Plate Recognizer{" "}
@@ -208,6 +207,7 @@ export default function Stream() {
       <Form.Group as={Row} className="mb-3">
         <div className="col-2">
           <Button className="btn btn-primary" type="submit">
+            <Loader isLoading={isLoading} />
             Show Docker Command
           </Button>
         </div>