feat(fe): return to view from template

Author: fiftin

api/tasks/runner_test.go

@@ -118,7 +118,7 @@ func TestTaskGetPlaybookArgs(t *testing.T) {
 	}
 
 	res := strings.Join(args, " ")
-	if res != "-i /tmp/inventory_0 --private-key=/tmp/access_key_12345 --extra-vars {} test.yml" {
+	if res != "-i /tmp/inventory_0 --private-key=/tmp/access_key_0 --extra-vars {} test.yml" {
 		t.Fatal("incorrect result")
 	}
 }
@@ -155,7 +155,7 @@ func TestTaskGetPlaybookArgs2(t *testing.T) {
 	}
 
 	res := strings.Join(args, " ")
-	if res != "-i /tmp/inventory_0 --extra-vars=@/tmp/access_key_12345 --extra-vars {} test.yml" {
+	if res != "-i /tmp/inventory_0 --extra-vars=@/tmp/access_key_0 --extra-vars {} test.yml" {
 		t.Fatal("incorrect result")
 	}
 }
@@ -192,7 +192,7 @@ func TestTaskGetPlaybookArgs3(t *testing.T) {
 	}
 
 	res := strings.Join(args, " ")
-	if res != "-i /tmp/inventory_0 --extra-vars=@/tmp/access_key_12345 --extra-vars {} test.yml" {
+	if res != "-i /tmp/inventory_0 --extra-vars=@/tmp/access_key_0 --extra-vars {} test.yml" {
 		t.Fatal("incorrect result")
 	}
 }

web2/src/router/index.js

@@ -49,6 +49,10 @@ const routes = [
     path: '/project/:projectId/templates/:templateId',
     component: TemplateView,
   },
+  {
+    path: '/project/:projectId/views/:viewId/templates/:templateId',
+    component: TemplateView,
+  },
   {
     path: '/project/:projectId/environment',
     component: Environment,

web2/src/views/project/TemplateView.vue

@@ -57,9 +57,10 @@
       <v-toolbar-title class="breadcrumbs">
         <router-link
             class="breadcrumbs__item breadcrumbs__item--link"
-            :to="`/project/${projectId}/templates/`"
-        >Task Templates
-        </router-link>
+            :to="viewId
+              ? `/project/${projectId}/views/${viewId}/templates/`
+              : `/project/${projectId}/templates/`"
+        >Task Templates</router-link>
         <v-icon>mdi-chevron-right</v-icon>
         <span class="breadcrumbs__item">{{ item.alias }}</span>
       </v-toolbar-title>
@@ -220,6 +221,13 @@ export default {
   },
 
   computed: {
+    viewId() {
+      if (/^-?\d+$/.test(this.$route.params.viewId)) {
+        return parseInt(this.$route.params.viewId, 10);
+      }
+      return this.$route.params.viewId;
+    },
+
     itemId() {
       if (/^-?\d+$/.test(this.$route.params.templateId)) {
         return parseInt(this.$route.params.templateId, 10);

web2/src/views/project/Templates.vue

@@ -122,8 +122,10 @@
           {{ TEMPLATE_TYPE_ICONS[item.type] }}
         </v-icon>
         <router-link
-            :to="`/project/${projectId}/templates/${item.id}`">{{ item.alias }}
-        </router-link>
+            :to="viewId
+              ? `/project/${projectId}/views/${viewId}/templates/${item.id}`
+              : `/project/${projectId}/templates/${item.id}`"
+        >{{ item.alias }}</router-link>
       </template>
 
       <template v-slot:item.version="{ item }">