From c23acc89adca7994cd449ffe2128e58a79572cb4 Mon Sep 17 00:00:00 2001
From: chenshihai <chenshh@pcl.ac.cn>
Date: Wed, 31 Aug 2022 12:03:43 +0800
Subject: [PATCH] update task detail spec show

---
 templates/repo/cloudbrain/benchmark/show.tmpl   | 10 +++-------
 templates/repo/cloudbrain/inference/show.tmpl   | 10 +++-------
 templates/repo/cloudbrain/show.tmpl             |  6 ++----
 templates/repo/cloudbrain/trainjob/show.tmpl    | 10 +++-------
 templates/repo/grampus/trainjob/show.tmpl       |  4 +---
 templates/repo/modelarts/inferencejob/show.tmpl |  5 +----
 templates/repo/modelarts/notebook/show.tmpl     |  5 +----
 templates/repo/modelarts/trainjob/show.tmpl     |  5 +----
 web_src/js/standalone/specsuse.js               |  1 +
 9 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/templates/repo/cloudbrain/benchmark/show.tmpl b/templates/repo/cloudbrain/benchmark/show.tmpl
index d4655b9ba..1818d08ef 100755
--- a/templates/repo/cloudbrain/benchmark/show.tmpl
+++ b/templates/repo/cloudbrain/benchmark/show.tmpl
@@ -454,9 +454,7 @@
                                                     </td>
 
                                                     <td class="ti-text-form-content resorce_type">
-                                                        <div class="text-span text-span-w">
-                                                            {{$.resource_type}}
-                                                        </div>
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
@@ -465,9 +463,7 @@
                                                     </td>
 
                                                     <td class="ti-text-form-content spec">
-                                                        <div class="text-span text-span-w">
-                                                            {{$.resource_spec}}                                                            
-                                                        </div>
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
@@ -584,7 +580,7 @@
         shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
     });
     $('td.ti-text-form-content.spec div').text(specStr);
-    $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+    SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
 })();
 </script>
 <script>
diff --git a/templates/repo/cloudbrain/inference/show.tmpl b/templates/repo/cloudbrain/inference/show.tmpl
index 157d29055..fb05ab938 100644
--- a/templates/repo/cloudbrain/inference/show.tmpl
+++ b/templates/repo/cloudbrain/inference/show.tmpl
@@ -341,9 +341,7 @@
                                                         {{$.i18n.Tr "repo.modelarts.train_job.resource_type"}}
                                                     </td>
                                                     <td class="ti-text-form-content resorce_type">
-                                                        <div class="text-span text-span-w">
-                                                            {{$.resource_type}}
-                                                        </div>
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
 
                                                 </tr>
@@ -483,9 +481,7 @@
                                                         </td>
 
                                                         <td class="ti-text-form-content spec">
-                                                            <div class="text-span text-span-w">
-                                                                {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
-                                                            </div>
+                                                            <div class="text-span text-span-w"></div>
                                                         </td>
                                                     </tr>
                                                 </tbody>
@@ -627,6 +623,6 @@
             shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
         });
         $('td.ti-text-form-content.spec div').text(specStr);
-        $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+        SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
     })();
 </script>
\ No newline at end of file
diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl
index b86a5b9bd..6cd977af2 100755
--- a/templates/repo/cloudbrain/show.tmpl
+++ b/templates/repo/cloudbrain/show.tmpl
@@ -346,9 +346,7 @@
                                                     </td>
 
                                                     <td class="ti-text-form-content resorce_type">
-                                                        <div class="text-span text-span-w">
-                                                            {{$.resource_type}}
-                                                        </div>
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
@@ -604,6 +602,6 @@
             shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
         });
         $('td.ti-text-form-content.spec div').text(specStr);
-        $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+        SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
     })();
 </script>
\ No newline at end of file
diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl
index bcebf11ac..5ffce27cc 100644
--- a/templates/repo/cloudbrain/trainjob/show.tmpl
+++ b/templates/repo/cloudbrain/trainjob/show.tmpl
@@ -360,9 +360,7 @@
                                                     </td>
 
                                                     <td class="ti-text-form-content resorce_type">
-                                                        <div class="text-span text-span-w">
-                                                            {{$.resource_type}}
-                                                        </div>
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
@@ -371,9 +369,7 @@
                                                     </td>
 
                                                     <td class="ti-text-form-content spec">
-                                                        <div class="text-span text-span-w">
-                                                            {{$.i18n.Tr "cloudbrain.gpu_num"}}：{{$.GpuNum}}，{{$.i18n.Tr "cloudbrain.cpu_num"}}：{{$.CpuNum}}，{{$.i18n.Tr "cloudbrain.memory"}}(MB)：{{$.MemMiB}}，{{$.i18n.Tr "cloudbrain.shared_memory"}}(MB)：{{$.ShareMemMiB}}
-                                                        </div>
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
                                                 </tr>
 
@@ -993,6 +989,6 @@
             shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
         });
         $('td.ti-text-form-content.spec div').text(specStr);
-        $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
+        SPEC && $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
     })();
 </script>
\ No newline at end of file
diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl
index 7e7fd86ea..c76dbc940 100755
--- a/templates/repo/grampus/trainjob/show.tmpl
+++ b/templates/repo/grampus/trainjob/show.tmpl
@@ -358,9 +358,7 @@
                                                     </td>
 
                                                     <td class="ti-text-form-content spec">
-                                                        <div class="text-span text-span-w">
-                                                            {{.FlavorName}}
-                                                        </div>
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
diff --git a/templates/repo/modelarts/inferencejob/show.tmpl b/templates/repo/modelarts/inferencejob/show.tmpl
index 3f8fda531..619a2acba 100644
--- a/templates/repo/modelarts/inferencejob/show.tmpl
+++ b/templates/repo/modelarts/inferencejob/show.tmpl
@@ -424,9 +424,7 @@ td, th {
                                                             </td>
 
                                                             <td class="ti-text-form-content spec">
-                                                                <div class="text-span text-span-w">
-                                                                    {{.FlavorName}}
-                                                                </div>
+                                                                <div class="text-span text-span-w"></div>
                                                             </td>
                                                         </tr>
                                                     </tbody>
@@ -543,6 +541,5 @@ $(document).ready(function(){
             shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
         });
         $('td.ti-text-form-content.spec div').text(specStr);
-        // $('td.ti-text-form-content.resorce_type').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
     })();
 </script>
diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl
index 5353f7a52..2a22392cb 100755
--- a/templates/repo/modelarts/notebook/show.tmpl
+++ b/templates/repo/modelarts/notebook/show.tmpl
@@ -368,9 +368,7 @@
                                                     </td>
 
                                                     <td class="ti-text-form-content spec">
-                                                        <div class="text-span text-span-w">
-                                                            {{$.resource_spec}}
-                                                        </div>
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
@@ -504,6 +502,5 @@
             shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
         });
         $('td.ti-text-form-content.spec div').text(specStr);
-        $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
     })();
 </script>
diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl
index e10afc38a..ddbbad3f0 100755
--- a/templates/repo/modelarts/trainjob/show.tmpl
+++ b/templates/repo/modelarts/trainjob/show.tmpl
@@ -398,9 +398,7 @@
                                                     </td>
 
                                                     <td class="ti-text-form-content spec{{$k}}">                                                        
-                                                        <div class="text-span text-span-w">
-                                                            {{.FlavorName}}
-                                                        </div>
+                                                        <div class="text-span text-span-w"></div>
                                                     </td>
                                                     <script>
                                                         ;(function() {
@@ -414,7 +412,6 @@
                                                                 shared_memory: {{$.i18n.Tr "cloudbrain.shared_memory"}},
                                                             });
                                                             $('td.ti-text-form-content.spec{{$k}} div').text(specStr);
-                                                            // $('td.ti-text-form-content.resorce_type div').text(getListValueWithKey(ACC_CARD_TYPE, SPEC.AccCardType));
                                                         })();
                                                     </script>
                                                 </tr>
diff --git a/web_src/js/standalone/specsuse.js b/web_src/js/standalone/specsuse.js
index 97a4647fe..99f5445a4 100644
--- a/web_src/js/standalone/specsuse.js
+++ b/web_src/js/standalone/specsuse.js
@@ -9,6 +9,7 @@ window.getListValueWithKey = (list, key, k = 'k', v = 'v', defaultV = '') => {
 };
 
 window.renderSpecStr = (spec, showPoint, langObj) => {
+  if (!spec) return '';
   var ngpu = `${spec.ComputeResource}: ${spec.AccCardsNum + '*' + getListValueWithKey(ACC_CARD_TYPE, spec.AccCardType)}`;
   var gpuMemStr = spec.GPUMemGiB != 0 ? `${langObj.gpu_memory}: ${spec.GPUMemGiB}GB, ` : '';
   var sharedMemStr = spec.ShareMemGiB != 0 ? `, ${langObj.shared_memory}: ${spec.ShareMemGiB}GB` : '';