From 7e2af32fa3c6278750a07dca27f1005ee31ecdd5 Mon Sep 17 00:00:00 2001
From: rick <1450685+LinuxSuRen@users.noreply.github.com>
Date: Sun, 30 Jul 2023 19:55:55 +0800
Subject: [PATCH] feat: add introduction process on UI

---
 .../cypress/e2e/component-exist.cy.ts         |  4 ++
 console/atest-ui/package-lock.json            | 11 ++++
 console/atest-ui/package.json                 |  1 +
 console/atest-ui/src/App.vue                  |  9 ++-
 console/atest-ui/src/main.ts                  |  8 +++
 .../atest-ui/src/views/TemplateFunctions.vue  |  4 +-
 docs/README.md                                | 10 ++++
 sample/kubernetes/default/kustomization.yaml  |  8 +++
 sample/kubernetes/{ => default}/manifest.yaml | 58 +++++++++++++++++--
 .../kubernetes/docker.io/kustomization.yaml   |  9 +++
 sample/kubernetes/kustomization.yaml          |  4 --
 11 files changed, 112 insertions(+), 14 deletions(-)
 create mode 100644 sample/kubernetes/default/kustomization.yaml
 rename sample/kubernetes/{ => default}/manifest.yaml (55%)
 create mode 100644 sample/kubernetes/docker.io/kustomization.yaml
 delete mode 100644 sample/kubernetes/kustomization.yaml

diff --git a/console/atest-ui/cypress/e2e/component-exist.cy.ts b/console/atest-ui/cypress/e2e/component-exist.cy.ts
index 63596ad5b..3d305788c 100644
--- a/console/atest-ui/cypress/e2e/component-exist.cy.ts
+++ b/console/atest-ui/cypress/e2e/component-exist.cy.ts
@@ -10,6 +10,7 @@ describe('Suite Manage', () => {
   
   it('Create Suite', () => {
     cy.visit('/')
+    cy.get('.introjs-skipbutton').click()
     cy.contains('span', 'Tool Box')
 
     cy.get('[test-id="open-new-suite-dialog"]').click()
@@ -29,6 +30,7 @@ describe('Suite Manage', () => {
   const caseAPI = "/api/v2"
   it('New Case', () => {
     cy.visit('/')
+    cy.get('.introjs-skipbutton').click()
     cy.get('span').contains(suiteName).should('be.visible').click()
 
     cy.get('[test-id="open-new-case-dialog"]').click()
@@ -43,6 +45,7 @@ describe('Suite Manage', () => {
 
   it('Find Case', () => {
     cy.visit('/')
+    cy.get('.introjs-skipbutton').click()
     const searchInput = cy.get('[test-id="search"]')
     searchInput.type(caseName)
     searchInput.trigger('keydown', {key: 'Enter'})
@@ -56,6 +59,7 @@ describe('Suite Manage', () => {
 
   it('Delete Suite', () => {
     cy.visit('/')
+    cy.get('.introjs-skipbutton').click()
     cy.get('span').contains(suiteName).should('be.visible').click()
     cy.get('[test-id="suite-editor-api"]').should('have.value', sampleAPIAddress)
     cy.get('[test-id="suite-del-but"]').click()
diff --git a/console/atest-ui/package-lock.json b/console/atest-ui/package-lock.json
index d7be43b7f..cc11c2dc7 100644
--- a/console/atest-ui/package-lock.json
+++ b/console/atest-ui/package-lock.json
@@ -9,6 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "element-plus": "^2.3.7",
+        "intro.js": "^7.0.1",
         "vue": "^3.3.4",
         "vue-json-viewer": "^3.0.4",
         "vue-router": "^4.2.2"
@@ -6421,6 +6422,11 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/intro.js": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-7.0.1.tgz",
+      "integrity": "sha512-1oqz6aOz9cGQ3CrtVYhCSo6AkjnXUn302kcIWLaZ3TI4kKssRXDwDSz4VRoGcfC1jN+WfaSJXRBrITz+QVEBzg=="
+    },
     "node_modules/is-array-buffer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
@@ -17072,6 +17078,11 @@
         "side-channel": "^1.0.4"
       }
     },
+    "intro.js": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-7.0.1.tgz",
+      "integrity": "sha512-1oqz6aOz9cGQ3CrtVYhCSo6AkjnXUn302kcIWLaZ3TI4kKssRXDwDSz4VRoGcfC1jN+WfaSJXRBrITz+QVEBzg=="
+    },
     "is-array-buffer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
diff --git a/console/atest-ui/package.json b/console/atest-ui/package.json
index 069ec4d1c..d9aa3bf5d 100644
--- a/console/atest-ui/package.json
+++ b/console/atest-ui/package.json
@@ -17,6 +17,7 @@
   },
   "dependencies": {
     "element-plus": "^2.3.7",
+    "intro.js": "^7.0.1",
     "vue": "^3.3.4",
     "vue-json-viewer": "^3.0.4",
     "vue-router": "^4.2.2"
diff --git a/console/atest-ui/src/App.vue b/console/atest-ui/src/App.vue
index 100e59083..db6d18240 100644
--- a/console/atest-ui/src/App.vue
+++ b/console/atest-ui/src/App.vue
@@ -193,10 +193,12 @@ const viewName = ref('testcase')
 </script>
 
 <template>
-  <div class="common-layout">
+  <div class="common-layout" data-title="Welcome!" data-intro="Welcome to use api-testing! 👋">
     <el-container style="height: 100vh">
       <el-aside width="200px">
-        <el-button type="primary" @click="openTestSuiteCreateDialog" test-id="open-new-suite-dialog" :icon="Edit">New</el-button>
+        <el-button type="primary" @click="openTestSuiteCreateDialog"
+          data-intro="Click here to create a new test suite"
+          test-id="open-new-suite-dialog" :icon="Edit">New</el-button>
         <el-input v-model="filterText" placeholder="Filter keyword" test-id="search" />
 
         <el-tree
@@ -209,6 +211,7 @@ const viewName = ref('testcase')
           node-key="id"
           :filter-node-method="filterTestCases"
           @node-click="handleNodeClick"
+          data-intro="This is the test suite tree. You can click the test suite to edit it."
         />
       </el-aside>
 
@@ -219,12 +222,14 @@ const viewName = ref('testcase')
           :suite="testSuite"
           :name="testCaseName"
           @updated="loadStores"
+          data-intro="This is the test case editor. You can edit the test case here."
         />
         <TestSuite
           v-else-if="viewName === 'testsuite'"
           :name="testSuite"
           :store="store"
           @updated="loadStores"
+          data-intro="This is the test suite editor. You can edit the test suite here."
         />
       </el-main>
     </el-container>
diff --git a/console/atest-ui/src/main.ts b/console/atest-ui/src/main.ts
index 68c12a115..cc5afb305 100644
--- a/console/atest-ui/src/main.ts
+++ b/console/atest-ui/src/main.ts
@@ -6,6 +6,8 @@ import App from './App.vue'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
+import introJs from 'intro.js'
+import 'intro.js/introjs.css'
 
 const app = createApp(App)
 
@@ -15,3 +17,9 @@ app.use(ElementPlus, {
 // app.use(router)
 
 app.mount('#app')
+
+let dontShowAgain = window.location.search.indexOf('newbie') === -1;
+introJs().setOptions({
+  "dontShowAgain": dontShowAgain,
+  "showProgress": true,
+}).start();
diff --git a/console/atest-ui/src/views/TemplateFunctions.vue b/console/atest-ui/src/views/TemplateFunctions.vue
index 54146ab0c..7bece5375 100644
--- a/console/atest-ui/src/views/TemplateFunctions.vue
+++ b/console/atest-ui/src/views/TemplateFunctions.vue
@@ -23,10 +23,10 @@ function queryFuncs() {
 
 <template>
     <el-affix position="bottom" :offset="20">
-        <el-button type="primary" @click="dialogVisible = !dialogVisible">Tool Box</el-button>
+        <el-button type="primary" @click="dialogVisible = !dialogVisible"
+            data-intro="You can search your desired template functions.">Tool Box</el-button>
     </el-affix>
 
-
     <el-dialog v-model="dialogVisible" title="Template Functions Query" width="40%" draggable destroy-on-close>
         <template #footer>
             <el-input v-model="query" placeholder="Query after enter" v-on:keyup.enter="queryFuncs" />
diff --git a/docs/README.md b/docs/README.md
index a1b45d3ff..29a07531f 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -35,6 +35,16 @@ Please see the following example usage:
 atest service start -m podman --version master
 ```
 
+## Run in k3s
+
+```shell
+sudo k3s server --write-kubeconfig-mode 666
+
+k3s kubectl apply -k sample/kubernetes/default
+
+kustomize build sample/kubernetes/docker.io/ | k3s kubectl apply -f -
+```
+
 ## Storage
 There are multiple storage backends supported. See the status from the list:
 
diff --git a/sample/kubernetes/default/kustomization.yaml b/sample/kubernetes/default/kustomization.yaml
new file mode 100644
index 000000000..57d09e11a
--- /dev/null
+++ b/sample/kubernetes/default/kustomization.yaml
@@ -0,0 +1,8 @@
+resources:
+- manifest.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: ghcr.io/linuxsuren/api-testing:master
+  newName: ghcr.io/linuxsuren/api-testing
+  newTag: master
diff --git a/sample/kubernetes/manifest.yaml b/sample/kubernetes/default/manifest.yaml
similarity index 55%
rename from sample/kubernetes/manifest.yaml
rename to sample/kubernetes/default/manifest.yaml
index 9199674f0..3cb998cf1 100644
--- a/sample/kubernetes/manifest.yaml
+++ b/sample/kubernetes/default/manifest.yaml
@@ -31,7 +31,7 @@ spec:
               topologyKey: kubernetes.io/hostname
             weight: 5
       containers:
-      - image: ghcr.io/linuxsuren/api-testing
+      - image: ghcr.io/linuxsuren/api-testing:master
         name: server
         imagePullPolicy: Always
         livenessProbe:
@@ -52,7 +52,25 @@ spec:
             memory: 512Mi
           requests:
             cpu: 100m
-            memory: 100m
+            memory: 100Mi
+        volumeMounts:
+        - name: config
+          mountPath: /root/.config/atest/
+      - image: ghcr.io/linuxsuren/api-testing:master
+        name: extension-orm
+        command: [atest-store-orm]
+        imagePullPolicy: Always
+        resources:
+          limits:
+            cpu: 500m
+            memory: 512Mi
+          requests:
+            cpu: 100m
+            memory: 100Mi
+      volumes:
+      - name: config
+        configMap:
+          name: api-testing
 ---
 apiVersion: v1
 kind: Service
@@ -60,10 +78,6 @@ metadata:
   name: api-testing
 spec:
   ports:
-  - name: grpc
-    port: 7070
-    protocol: TCP
-    targetPort: 7070
   - name: web
     port: 8080
     protocol: TCP
@@ -72,3 +86,35 @@ spec:
     app: api-testing
   sessionAffinity: None
   type: NodePort
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: api-testing
+spec:
+  rules:
+  - http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: api-testing
+            port:
+              number: 8080
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  creationTimestamp: null
+  name: api-testing
+data:
+  stores.yaml: |
+    - name: db
+      kind:
+        name: database
+        url: localhost:7071
+      url: localhost:4000
+      username: root
+      properties:
+        database: test
diff --git a/sample/kubernetes/docker.io/kustomization.yaml b/sample/kubernetes/docker.io/kustomization.yaml
new file mode 100644
index 000000000..84ab123a5
--- /dev/null
+++ b/sample/kubernetes/docker.io/kustomization.yaml
@@ -0,0 +1,9 @@
+bases:
+- ../default
+
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: ghcr.io/linuxsuren/api-testing:master
+  newName: linuxsuren/api-testing
+  newTag: master
diff --git a/sample/kubernetes/kustomization.yaml b/sample/kubernetes/kustomization.yaml
deleted file mode 100644
index c055c4827..000000000
--- a/sample/kubernetes/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-resources:
-- manifest.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization