Merge pull request #96 from talifan/feature/fix_presentations_ta

Испарвление презентаций
SEAFTeam · Jun 6, 2024 · 2dd04db · 2dd04db
2 parents 8c553f7 + 4da11ad
commit 2dd04db
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/entities/ta/presentation/components.yaml b/entities/ta/presentation/components.yaml
@@ -411,8 +411,8 @@ entities:
             align: left
             width: 20%
 
-          - value: kubernetes_id
-            text:  Kubernetes cluster ID
+          - value: container_id
+            text:  Какие контейнеры включает
             sortable: true
             align: left
             width: 20%
@@ -427,11 +427,11 @@ entities:
              $.*.{
                 "title": title,
                 "description": description,
-                "kubernetes_id": kubernetes_id,
+                "container_id": container_id,
                 "link": '/entities/seaf.ta.components.k8s_pod/list?ta-component-id=' & $COMPONENT_ID,
-                "k_link" :  $eval($get_link,{"hr":$refs."kubernetes_id","val":kubernetes_id })
+                "k_link" :  $eval($get_link,{"hr":$refs."container_id","val":container_id })
               }
-            )]^(name)]
+            )]^(title)]
           )
           
 
@@ -479,7 +479,7 @@ entities:
                 "description": description,
                 "link": '/entities/seaf.ta.components.k8s_container/list?ta-component-id=' & $COMPONENT_ID
               }
-            )]^(name)]
+            )]^(title)]
           )
 
       list:
@@ -524,7 +524,7 @@ entities:
                 "description": description,
                 "link": '/entities/seaf.ta.components.k8s_image/list?ta-component-id=' & $COMPONENT_ID
               }
-            )]^(name)]
+            )]^(title)]
           )
           
 
@@ -542,4 +542,3 @@ entities:
         template: templates/list.md
         source: >
           ( {'title': $self.title, 'id':$params."ta-component-id", "base-name":$split($self."$base", "/")[2]};)
-
diff --git a/entities/ta/presentation/services.yaml b/entities/ta/presentation/services.yaml
@@ -27,7 +27,7 @@ entities:
               "description": description,          
               "link": '/entities/seaf.ta.services.dc_region/list?ta-component-id=' & $COMPONENT_ID 
                 }
-            )]^(region_name)]
+            )]^(title)]
           )
 
       list:
@@ -87,7 +87,7 @@ entities:
               "link": '/entities/seaf.ta.services.dc_az/list?ta-component-id=' & $COMPONENT_ID,
               "r_link" : "/entities/"& $refs."region_id" &"/list?ta-component-id=" & region_id
                 }
-            )]^(az_name)]
+            )]^(title)]
           )
 
       list:
@@ -148,7 +148,7 @@ entities:
                 "link": '/entities/seaf.ta.services.dc/list?ta-component-id=' & $COMPONENT_ID,
                 "avail_link" : "/entities/"& $refs."availabilityzone_id" &"/list?ta-component-id=" & availabilityzone_id
               }
-            )]^(dc_name)]
+            )]^(title)]
           )
 
       list:
@@ -205,7 +205,7 @@ entities:
                 "address": address,
                 "link": '/entities/seaf.ta.services.office/list?ta-component-id=' & $COMPONENT_ID
               }
-            )]^(name)]
+            )]^(title)]
           )
 
       list:
@@ -228,6 +228,13 @@ entities:
       table:
         type: table
         headers:
+          - value: title
+            text: Наименование
+            sortable: true
+            align: left
+            width: 20%
+            link: link
+
           - value: cluster_fqdn
             text: FQDN имя кластера
             sortable: true
@@ -255,14 +262,15 @@ entities:
             [[$."seaf.ta.services.cluster".$spread().(
               $COMPONENT_ID := $keys()[0];
              $.*.{
+                "title": title,                
                 "description": description,
                 "availabilityzone_id": availabilityzone_id,
                 "cluster_fqdn": cluster_fqdn,
                 "link": '/entities/seaf.ta.services.cluster/list?ta-component-id=' & $COMPONENT_ID,
                 "avail_link" :  $eval($get_link,{"hr":$refs."availabilityzone_id","val":availabilityzone_id})
               }
           
-              )]^(cluster_fqdn)];  
+              )]^(title)];  
           )
 
       list:
@@ -325,7 +333,7 @@ entities:
                 "link": '/entities/seaf.ta.services.storage/list?ta-component-id=' & $COMPONENT_ID,
                 "avail_link" :  $eval($get_link,{"hr":$refs."availabilityzone_id","val":availabilityzone_id})
               }
-            )]^(storage_id)]
+            )]^(title)]
           )
 
       list:
@@ -381,7 +389,7 @@ entities:
                 "link": '/entities/seaf.ta.services.cluster_virtualization/list?ta-component-id=' & $COMPONENT_ID
           
               }
-            )]^(virtualization_id)]
+            )]^(title)]
           )      
 
       list:
@@ -438,7 +446,7 @@ entities:
                 "avail_link" :  $eval($get_link,{"hr":$refs."availabilityzone_id","val":availabilityzone_id}),
                 "link": '/entities/seaf.ta.services.k8s/list?ta-component-id=' & $COMPONENT_ID
               }
-            )]^(cluster_fqdn)]
+            )]^(title)]
           )
       list:
         title: Кластер k8s
@@ -517,7 +525,7 @@ entities:
                 "o_link" :  $eval($get_link,{"hr":$refs."office_id","val":office_id}),
                 "avail_link" :  $eval($get_link,{"hr":$refs."availabilityzone_id","val":availabilityzone_id})
               }
-            )]^(type)]
+            )]^(title)]
           )
 
       list:
@@ -623,7 +631,7 @@ entities:
                 "avail_link" :  $eval($get_link,{"hr":$refs."availabilityzone_id","val":availabilityzone_id}),
                 "link": '/entities/seaf.ta.services.backup/list?ta-component-id=' & $COMPONENT_ID
               }
-            )]^(name)]
+            )]^(title)]
           )
 
       list: