From 322e4456b0f76a67c65ae8f8404c2c85da6bcfa0 Mon Sep 17 00:00:00 2001
From: JUNGEUNJUNG <dmsej108@strato.co.kr>
Date: Wed, 25 Sep 2024 15:35:12 +0900
Subject: [PATCH] Issue fixed

---
 .../generate/components/configmapForm.vue     |   2 +-
 .../generate/components/deploymentForm.vue    |   2 +-
 .../src/views/generate/components/hpaForm.vue |   2 +-
 .../src/views/generate/components/podForm.vue | 187 +++++++++---------
 .../views/generate/components/serviceForm.vue |   2 +-
 .../src/views/repository/RepositoryDetail.vue |   2 +-
 .../repository/components/repositoryForm.vue  |   8 +-
 7 files changed, 103 insertions(+), 102 deletions(-)

diff --git a/applicationFE/src/views/generate/components/configmapForm.vue b/applicationFE/src/views/generate/components/configmapForm.vue
index 0c79dd8..25cdee2 100644
--- a/applicationFE/src/views/generate/components/configmapForm.vue
+++ b/applicationFE/src/views/generate/components/configmapForm.vue
@@ -10,7 +10,7 @@
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.name" placeholder="configMap-01" />
         </div>
         <div class="mb-3">
-          <label class="form-label">- Namespace</label>
+          <label class="form-label required">- Namespace</label>
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.namespace" placeholder="namespace" />
         </div>
         <div class="mb-3">
diff --git a/applicationFE/src/views/generate/components/deploymentForm.vue b/applicationFE/src/views/generate/components/deploymentForm.vue
index 0ef3312..bae9da8 100644
--- a/applicationFE/src/views/generate/components/deploymentForm.vue
+++ b/applicationFE/src/views/generate/components/deploymentForm.vue
@@ -10,7 +10,7 @@
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.name" placeholder="deployment-01" />
         </div>
         <div class="mb-3">
-          <label class="form-label">- Namespace</label>
+          <label class="form-label required">- Namespace</label>
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.namespace" placeholder="namespace" />
         </div>
         <div class="mb-3">
diff --git a/applicationFE/src/views/generate/components/hpaForm.vue b/applicationFE/src/views/generate/components/hpaForm.vue
index 7f55b74..ea3a6f9 100644
--- a/applicationFE/src/views/generate/components/hpaForm.vue
+++ b/applicationFE/src/views/generate/components/hpaForm.vue
@@ -10,7 +10,7 @@
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.name" placeholder="name" />
         </div>
         <div class="mb-3">
-          <label class="form-label">- Namespace</label>
+          <label class="form-label required">- Namespace</label>
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.namespace" placeholder="namespace" />
         </div>
         <div class="mb-3">
diff --git a/applicationFE/src/views/generate/components/podForm.vue b/applicationFE/src/views/generate/components/podForm.vue
index 73acb3a..9e45695 100644
--- a/applicationFE/src/views/generate/components/podForm.vue
+++ b/applicationFE/src/views/generate/components/podForm.vue
@@ -10,7 +10,7 @@
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.name" placeholder="pod-01" />
         </div>
         <div class="mb-3">
-          <label class="form-label">- Namespace</label>
+          <label class="form-label required">- Namespace</label>
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.namespace" placeholder="namespace" />
         </div>
         <div class="mb-3">
@@ -43,131 +43,132 @@
         <h3 class="card-title">Spec 영역</h3>
       </div>
       <div class="card-body">
-        <div v-for="(container, idx) in containers" :key="idx">
-        <div class="mb-3">
-          <div class="btn-list">
-            <label class="form-label">Containers</label>
-            <button class="btn btn-primary" @click="addContainer" style="text-align: center !important;">
-              <svg  xmlns="http://www.w3.org/2000/svg"  width="24"  height="24"  viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-plus" style="margin: 0 !important;">
-                <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-                <path d="M12 5l0 14" />
-                <path d="M5 12l14 0" />
-              </svg>
-            </button>
-            <button class="btn btn-primary" @click="removeContainer(idx)">
-              <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-minus" style="margin: 0 !important;">
-                <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                <path d="M5 12l14 0" />
-              </svg>
-            </button>
-          </div>
-          <div class="row" style="width:68% !important">
-            <div class="col mt-4">
-              <label class="form-label required">- Name</label>
-              <input type="text" class="form-control" v-model="container.name" />
-            </div>
-            <div class="col mt-4">
-              <label class="form-label required">- Image</label>
-              <input type="text" class="form-control" v-model="container.image" />
-            </div>
-          </div>
-        </div>
-        <div class="mb-3">
-          <label class="form-label">- Env</label>
-          <div class="generate-form" v-for="(env, envIndex) in container.env" :key="envIndex">
-            <input type="text" class="form-control w-33" v-model="env.name" placeholder="key" />
-            <input type="text" class="form-control w-33" v-model="env.value" placeholder="value" />
+        <div class="mt-4" v-for="(container, idx) in containers" :key="idx">
+          <div class="mb-3">
             <div class="btn-list">
-              <button class="btn btn-primary" @click="addEnv(idx)" style="text-align: center !important;">
+              <label class="form-label">Containers</label>
+              <button class="btn btn-primary" @click="addContainer" style="text-align: center !important;">
                 <svg  xmlns="http://www.w3.org/2000/svg"  width="24"  height="24"  viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-plus" style="margin: 0 !important;">
                   <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
                   <path d="M12 5l0 14" />
                   <path d="M5 12l14 0" />
                 </svg>
               </button>
-              <button class="btn btn-primary" @click="removeEnv(idx, envIndex)">
+              <button class="btn btn-primary" @click="removeContainer(idx)">
                 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-minus" style="margin: 0 !important;">
                   <path stroke="none" d="M0 0h24v24H0z" fill="none" />
                   <path d="M5 12l14 0" />
                 </svg>
               </button>
             </div>
+            <div class="row" style="width:68% !important">
+              <div class="col mt-4">
+                <label class="form-label required">- Name</label>
+                <input type="text" class="form-control" v-model="container.name" />
+              </div>
+              <div class="col mt-4">
+                <label class="form-label required">- Image</label>
+                <input type="text" class="form-control" v-model="container.image" />
+              </div>
+            </div>
           </div>
-        </div>
-        <div class="mb-3"> 
-          <div class="mt-4" v-for="(port, portIndex) in container.ports" :key="portIndex">
+          <div class="mb-3">
+            <label class="form-label">- Env</label>
+            <div class="generate-form" v-for="(env, envIndex) in container.env" :key="envIndex">
+              <input type="text" class="form-control w-33" v-model="env.name" placeholder="key" />
+              <input type="text" class="form-control w-33" v-model="env.value" placeholder="value" />
+              <div class="btn-list">
+                <button class="btn btn-primary" @click="addEnv(idx)" style="text-align: center !important;">
+                  <svg  xmlns="http://www.w3.org/2000/svg"  width="24"  height="24"  viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-plus" style="margin: 0 !important;">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+                    <path d="M12 5l0 14" />
+                    <path d="M5 12l14 0" />
+                  </svg>
+                </button>
+                <button class="btn btn-primary" @click="removeEnv(idx, envIndex)">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-minus" style="margin: 0 !important;">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                    <path d="M5 12l14 0" />
+                  </svg>
+                </button>
+              </div>
+            </div>
+          </div>
+          <div class="mb-3"> 
+            <div class="mt-4" v-for="(port, portIndex) in container.ports" :key="portIndex">
+              <div class="btn-list">
+                <label class="form-label">Ports</label>
+                <button class="btn btn-primary" @click="addPort(idx)" style="text-align: center !important;">
+                  <svg  xmlns="http://www.w3.org/2000/svg"  width="24"  height="24"  viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-plus" style="margin: 0 !important;">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
+                    <path d="M12 5l0 14" />
+                    <path d="M5 12l14 0" />
+                  </svg>
+                </button>
+                <button class="btn btn-primary" @click="removePort(idx, portIndex)">
+                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-minus" style="margin: 0 !important;">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                    <path d="M5 12l14 0" />
+                  </svg>
+                </button>
+              </div>
+              <div class="row" style="width:68% !important">
+                <div class="col mt-4">
+                  <label class="form-label">- Name</label>
+                  <input type="text" class="form-control" v-model="port.name" />
+                </div>
+                <div class="col mt-4">
+                  <label class="form-label">- Port</label>
+                  <input type="text" class="form-control" v-model="port.containerPort" />
+                </div>
+              </div>
+              <div class="row" style="width:68% !important">
+                <div class="col mt-4">
+                  <label class="form-label">- Protocol</label>
+                  <input type="text" class="form-control" v-model="port.protocol" />
+                </div>
+                <div class="col mt-4">
+                  <label class="form-label">- Host Port</label>
+                  <input type="text" class="form-control" v-model="port.hostPort" />
+                </div>
+              </div>
+              <div class="border-bottom" style="width: 100%; margin-top: 10px" v-if="container.ports.length > 1"></div>
+            </div>
+          </div>
+          <div class="mb-3">
             <div class="btn-list">
-              <label class="form-label">Ports</label>
-              <button class="btn btn-primary" @click="addPort(idx)" style="text-align: center !important;">
-                <svg  xmlns="http://www.w3.org/2000/svg"  width="24"  height="24"  viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-plus" style="margin: 0 !important;">
-                  <path stroke="none" d="M0 0h24v24H0z" fill="none"/>
-                  <path d="M12 5l0 14" />
-                  <path d="M5 12l14 0" />
-                </svg>
-              </button>
-              <button class="btn btn-primary" @click="removePort(idx, portIndex)">
-                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-minus" style="margin: 0 !important;">
-                  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                  <path d="M5 12l14 0" />
-                </svg>
-              </button>
+              <label class="form-label">Resources</label>
             </div>
             <div class="row" style="width:68% !important">
               <div class="col mt-4">
-                <label class="form-label">- Name</label>
-                <input type="text" class="form-control" v-model="port.name" />
+                <label class="form-label">- Limits CPU</label>
+                <input type="text" class="form-control" v-model="container.resources.limits.cpu" />
               </div>
               <div class="col mt-4">
-                <label class="form-label">- Port</label>
-                <input type="text" class="form-control" v-model="port.containerPort" />
+                <label class="form-label">- Limits Memory</label>
+                <input type="text" class="form-control" v-model="container.resources.limits.memory" />
               </div>
             </div>
             <div class="row" style="width:68% !important">
               <div class="col mt-4">
-                <label class="form-label">- Protocol</label>
-                <input type="text" class="form-control" v-model="port.protocol" />
+                <label class="form-label">- Requests CPU</label>
+                <input type="text" class="form-control" v-model="container.resources.requests.cpu" />
               </div>
               <div class="col mt-4">
-                <label class="form-label">- Host Port</label>
-                <input type="text" class="form-control" v-model="port.hostPort" />
+                <label class="form-label">- Requests Memory</label>
+                <input type="text" class="form-control" v-model="container.resources.requests.memory" />
               </div>
             </div>
-            <div class="border-bottom" style="width: 100%; margin-top: 10px" v-if="container.ports.length > 1"></div>
           </div>
+          <div class="border-bottom" style="width: 100%; margin-top: 10px" v-if="containers.length > 1"></div>
         </div>
         <div class="mb-3">
-          
-          <div class="btn-list">
-            <label class="form-label">Resources</label>
+          <div class="mt-4">
+            <label class="form-label">- Restart Policy</label>
+            <input type="text" class="form-control w-33" v-model="spec.restartPolicy" />
           </div>
-          <div class="row" style="width:68% !important">
-            <div class="col mt-4">
-              <label class="form-label">- Limits CPU</label>
-              <input type="text" class="form-control" v-model="container.resources.limits.cpu" />
-            </div>
-            <div class="col mt-4">
-              <label class="form-label">- Limits Memory</label>
-              <input type="text" class="form-control" v-model="container.resources.limits.memory" />
-            </div>
-          </div>
-          <div class="row" style="width:68% !important">
-            <div class="col mt-4">
-              <label class="form-label">- Requests CPU</label>
-              <input type="text" class="form-control" v-model="container.resources.requests.cpu" />
-            </div>
-            <div class="col mt-4">
-              <label class="form-label">- Requests Memory</label>
-              <input type="text" class="form-control" v-model="container.resources.requests.memory" />
-            </div>
-          </div>
-          <div class="row" style="width:68% !important">
-            <div class="col mt-4">
-              <label class="form-label">- Restart Policy</label>
-              <input type="text" class="form-control" v-model="spec.restartPolicy" />
-            </div>
-          </div>
-        </div>
         </div>
+
       </div>
     </div>
 
diff --git a/applicationFE/src/views/generate/components/serviceForm.vue b/applicationFE/src/views/generate/components/serviceForm.vue
index 9740e6c..2252e4f 100644
--- a/applicationFE/src/views/generate/components/serviceForm.vue
+++ b/applicationFE/src/views/generate/components/serviceForm.vue
@@ -10,7 +10,7 @@
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.name" placeholder="name-01" />
         </div>
         <div class="mb-3">
-          <label class="form-label">- Namespace</label>
+          <label class="form-label required">- Namespace</label>
           <input type="text" class="form-control w-33" name="example-text-input" v-model="metadata.namespace" placeholder="namespace" />
         </div>
         <div class="mb-3">
diff --git a/applicationFE/src/views/repository/RepositoryDetail.vue b/applicationFE/src/views/repository/RepositoryDetail.vue
index bc426f5..ad38030 100644
--- a/applicationFE/src/views/repository/RepositoryDetail.vue
+++ b/applicationFE/src/views/repository/RepositoryDetail.vue
@@ -38,7 +38,7 @@
 
         <div class="mb-3">
           <div class="btn-list">
-            <button class='btn btn-primary d-none d-sm-inline-block' style="margin-left: auto; margin-bottom:10px;" data-bs-toggle='modal' data-bs-target='#uploadComponent'>
+            <button class='btn btn-primary d-none d-sm-inline-block' style="margin-left: auto; margin-bottom:10px;" data-bs-toggle='modal' data-bs-target='#uploadComponent' :disabled="repositoryDetail.format == 'docker'">
               File Upload
             </button>      
           </div>
diff --git a/applicationFE/src/views/repository/components/repositoryForm.vue b/applicationFE/src/views/repository/components/repositoryForm.vue
index f99af53..4f81a50 100644
--- a/applicationFE/src/views/repository/components/repositoryForm.vue
+++ b/applicationFE/src/views/repository/components/repositoryForm.vue
@@ -15,7 +15,7 @@
             <div class="row mb-3">
               <label class="form-label required">Name</label>
               <div class="grid gap-0 column-gap-3">
-                <input type="text" class="form-control p-2 g-col-11" v-model="repositoryFormData.name" />
+                <input type="text" class="form-control p-2 g-col-11" v-model="repositoryFormData.name" :disabled="props.mode != 'new'" />
               </div>
             </div>
             
@@ -24,15 +24,15 @@
               <label class="form-label required">Format</label>
               <div>
                 <label class="form-check form-check-inline">
-                  <input class="form-check-input" type="radio" name="format" value="raw" v-model="repositoryFormData.format">
+                  <input class="form-check-input" type="radio" name="format" value="raw" v-model="repositoryFormData.format" :disabled="props.mode != 'new'" />
                   <span class="form-check-label">raw</span>
                 </label>
                 <label class="form-check form-check-inline">
-                  <input class="form-check-input" type="radio" name="format" value="helm" v-model="repositoryFormData.format">
+                  <input class="form-check-input" type="radio" name="format" value="helm" v-model="repositoryFormData.format" :disabled="props.mode != 'new'" />
                   <span class="form-check-label">helm</span>
                 </label>
                 <label class="form-check form-check-inline">
-                  <input class="form-check-input" type="radio" name="format" value="docker" v-model="repositoryFormData.format">
+                  <input class="form-check-input" type="radio" name="format" value="docker" v-model="repositoryFormData.format" :disabled="props.mode != 'new'" />
                   <span class="form-check-label">docker</span>
                 </label>
               </div>