From 76a79af0b7788d91dc2a740e8b39fb37f83fc7ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carsten=20G=C3=B6tzinger?= <carsten.goetzinger@concedro.com>
Date: Mon, 27 Mar 2023 15:16:58 +0200
Subject: [PATCH] Fix code according to suggestions

---
 .../composerize.d.ts                          |  2 +-
 ...docker-run-to-docker-compose-converter.vue | 39 +++++++++++
 .../index.ts                                  | 11 ++++
 .../docker-to-docker-compose.vue              | 64 -------------------
 src/tools/docker-to-docker-compose/index.ts   | 11 ----
 src/tools/index.ts                            |  4 +-
 6 files changed, 53 insertions(+), 78 deletions(-)
 rename src/tools/{docker-to-docker-compose => docker-run-to-docker-compose-converter}/composerize.d.ts (57%)
 create mode 100644 src/tools/docker-run-to-docker-compose-converter/docker-run-to-docker-compose-converter.vue
 create mode 100644 src/tools/docker-run-to-docker-compose-converter/index.ts
 delete mode 100644 src/tools/docker-to-docker-compose/docker-to-docker-compose.vue
 delete mode 100644 src/tools/docker-to-docker-compose/index.ts

diff --git a/src/tools/docker-to-docker-compose/composerize.d.ts b/src/tools/docker-run-to-docker-compose-converter/composerize.d.ts
similarity index 57%
rename from src/tools/docker-to-docker-compose/composerize.d.ts
rename to src/tools/docker-run-to-docker-compose-converter/composerize.d.ts
index bce423b3..aab47a24 100644
--- a/src/tools/docker-to-docker-compose/composerize.d.ts
+++ b/src/tools/docker-run-to-docker-compose-converter/composerize.d.ts
@@ -1,4 +1,4 @@
 declare module 'composerize' {
-  const composerize: function;
+  const composerize: (arg: string) => string;
   export default composerize;
 }
diff --git a/src/tools/docker-run-to-docker-compose-converter/docker-run-to-docker-compose-converter.vue b/src/tools/docker-run-to-docker-compose-converter/docker-run-to-docker-compose-converter.vue
new file mode 100644
index 00000000..b44a81bb
--- /dev/null
+++ b/src/tools/docker-run-to-docker-compose-converter/docker-run-to-docker-compose-converter.vue
@@ -0,0 +1,39 @@
+<template>
+  <n-card>
+    <n-form-item label="Your docker run command:">
+      <n-input
+        v-model:value="dockerRun"
+        style="font-family: monospace"
+        type="textarea"
+        placeholder="Your docker run command to convert..."
+        rows="3"
+      />
+    </n-form-item>
+
+    <n-divider />
+
+    <textarea-copyable :value="dockerCompose" language="yaml" />
+    <br />
+    <br />
+    <n-space justify="center">
+      <n-button :disabled="dockerCompose === ''" secondary @click="download"> Download docker-compose.yml </n-button>
+    </n-space>
+  </n-card>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import { withDefaultOnError } from '@/utils/defaults';
+import { useDownloadFileFromBase64 } from '@/composable/downloadBase64';
+import { textToBase64 } from '@/utils/base64';
+import TextareaCopyable from '@/components/TextareaCopyable.vue';
+
+import composerize from 'composerize';
+
+const dockerRun = ref(
+  'docker run -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock:ro --restart always --log-opt max-size=1g nginx',
+);
+const dockerCompose = computed(() => withDefaultOnError(() => composerize(dockerRun.value), ''));
+const dockerComposeBase64 = computed(() => 'data:application/yaml;base64,' + textToBase64(dockerCompose.value));
+const { download } = useDownloadFileFromBase64({ source: dockerComposeBase64, filename: 'docker-compose.yml' });
+</script>
diff --git a/src/tools/docker-run-to-docker-compose-converter/index.ts b/src/tools/docker-run-to-docker-compose-converter/index.ts
new file mode 100644
index 00000000..d9c1437f
--- /dev/null
+++ b/src/tools/docker-run-to-docker-compose-converter/index.ts
@@ -0,0 +1,11 @@
+import { BrandDocker } from '@vicons/tabler';
+import { defineTool } from '../tool';
+
+export const tool = defineTool({
+  name: 'Docker run to Docker compose converter',
+  path: '/docker-run-to-docker-compose-converter',
+  description: 'Turns docker run commands into docker-compose files!',
+  keywords: ['docker', 'run', 'compose', 'yaml', 'yml', 'convert', 'deamon'],
+  component: () => import('./docker-run-to-docker-compose-converter.vue'),
+  icon: BrandDocker,
+});
diff --git a/src/tools/docker-to-docker-compose/docker-to-docker-compose.vue b/src/tools/docker-to-docker-compose/docker-to-docker-compose.vue
deleted file mode 100644
index 7b8ac3a5..00000000
--- a/src/tools/docker-to-docker-compose/docker-to-docker-compose.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-  <n-card>
-    <n-input
-      v-model:value="dockerRun"
-      style="font-family: monospace"
-      type="textarea"
-      placeholder="Your docker run command to convert..."
-      rows="3"
-    />
-
-    <n-divider />
-
-    <n-input
-      style="font-family: monospace"
-      :value="dockerCompose"
-      type="textarea"
-      placeholder="Converted to docker-compose file"
-      :autosize="{ minRows: 1 }"
-      readonly
-      autocomplete="off"
-      autocorrect="off"
-      autocapitalize="off"
-      spellcheck="false"
-    />
-    <br />
-    <br />
-    <n-space justify="center">
-      <n-button secondary autofocus @click="copy"> Copy </n-button>
-      <n-button :disabled="dockerCompose === ''" secondary @click="downloadFile()"> Download file </n-button>
-    </n-space>
-  </n-card>
-</template>
-
-<script setup lang="ts">
-import { useCopy } from '@/composable/copy';
-import { useDownloadFileFromBase64 } from '@/composable/downloadBase64';
-import { textToBase64 } from '@/utils/base64';
-import { computed, ref, watch } from 'vue';
-import composerize from 'composerize';
-
-const dockerRun = ref(
-  'docker run -p 80:80 -v /var/run/docker.sock:/tmp/docker.sock:ro --restart always --log-opt max-size=1g nginx',
-);
-const dockerCompose = ref('');
-const dockerComposeBase64 = computed(() => 'data:application/yaml;base64,' + textToBase64(dockerCompose.value));
-const { copy } = useCopy({ source: dockerCompose, text: 'docker-compose copied to the clipboard' });
-const { download } = useDownloadFileFromBase64({ source: dockerComposeBase64, filename: 'docker-compose.yml' });
-
-function downloadFile() {
-  if (dockerCompose.value === '') return;
-  try {
-    //dockerComposeBase64 = 'data:application/yaml;base64,' + dockerComposeBase64.value;
-    download();
-  } catch (_) {
-    //
-  }
-}
-
-watch([dockerRun], convertToCompose, { immediate: true });
-
-function convertToCompose() {
-  dockerCompose.value = composerize(dockerRun.value);
-}
-</script>
diff --git a/src/tools/docker-to-docker-compose/index.ts b/src/tools/docker-to-docker-compose/index.ts
deleted file mode 100644
index 5a89b317..00000000
--- a/src/tools/docker-to-docker-compose/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BrandDocker } from '@vicons/tabler';
-import { defineTool } from '../tool';
-
-export const tool = defineTool({
-  name: 'Composerize',
-  path: '/docker-to-docker-compose',
-  description: 'Turns docker run commands into docker-compose files!',
-  keywords: ['docker', 'to', 'docker', 'compose'],
-  component: () => import('./docker-to-docker-compose.vue'),
-  icon: BrandDocker,
-});
diff --git a/src/tools/index.ts b/src/tools/index.ts
index eca5f9bf..1d0b3adf 100644
--- a/src/tools/index.ts
+++ b/src/tools/index.ts
@@ -1,7 +1,7 @@
 import { tool as base64FileConverter } from './base64-file-converter';
 import { tool as base64StringConverter } from './base64-string-converter';
 import { tool as basicAuthGenerator } from './basic-auth-generator';
-import { tool as dockerToDockerCompose } from './docker-to-docker-compose';
+import { tool as dockerRunToDockerComposeConverter } from './docker-run-to-docker-compose-converter';
 import { tool as htmlWysiwygEditor } from './html-wysiwyg-editor';
 import { tool as rsaKeyPairGenerator } from './rsa-key-pair-generator';
 import { tool as textToNatoAlphabet } from './text-to-nato-alphabet';
@@ -93,7 +93,7 @@ export const toolsByCategory: ToolCategory[] = [
       jsonMinify,
       sqlPrettify,
       chmodCalculator,
-      dockerToDockerCompose,
+      dockerRunToDockerComposeConverter,
     ],
   },
   {