fix: plugin_config missing on service exist (apache#2657)

bzp2010 · Nov 6, 2022 · 78ade92 · 78ade92
1 parent f64372f
commit 78ade92
Show file tree

Hide file tree

Showing 4 changed files with 322 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,7 @@ RUN set -x \
     && cd /usr/local/apisix-dashboard && git clean -Xdf \
     && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash
 
-FROM golang:1.15 as api-builder
+FROM golang:1.19 as api-builder
 
 ARG ENABLE_PROXY=false
 
@@ -36,7 +36,7 @@ RUN if [ "$ENABLE_PROXY" = "true" ] ; then go env -w GOPROXY=https://goproxy.io,
     && go env -w GO111MODULE=on \
     && CGO_ENABLED=0 ./api/build.sh
 
-FROM node:14-alpine as fe-builder
+FROM node:16-alpine as fe-builder
 
 ARG ENABLE_PROXY=false
 

diff --git a/web/cypress/e2e/rest/pluginTemplate-create-plugin-template-with-route.cy.js b/web/cypress/e2e/rest/pluginTemplate-create-plugin-template-with-route.cy.js
@@ -121,15 +121,6 @@ context('Create PluginTemplate Binding To Route', () => {
   });
 
   it('should delete the pluginTemplate successfully', function () {
-    cy.visit('plugin-template/list');
-
-    cy.get(selector.refresh).click();
-    cy.get(selector.descriptionSelector).type(data.pluginTemplateName);
-    cy.contains('button', 'Search').click();
-    cy.contains(data.pluginTemplateName).siblings().contains('Delete').click();
-    cy.contains('button', 'Confirm').click();
-    cy.get(selector.notification).should('contain', data.deletePluginTemplateSuccess);
-
     cy.visit('/routes/list');
     cy.get(selector.nameSelector).type(data.routeName);
     cy.contains('Search').click();
@@ -141,5 +132,13 @@ context('Create PluginTemplate Binding To Route', () => {
         cy.contains('OK').click();
       });
     cy.get(selector.notification).should('contain', data.deleteRouteSuccess);
+
+    cy.visit('plugin-template/list');
+    cy.get(selector.refresh).click();
+    cy.get(selector.descriptionSelector).type(data.pluginTemplateName);
+    cy.contains('button', 'Search').click();
+    cy.contains(data.pluginTemplateName).siblings().contains('Delete').click();
+    cy.contains('button', 'Confirm').click();
+    cy.get(selector.notification).should('contain', data.deletePluginTemplateSuccess);
   });
 });
diff --git a/web/src/pages/Route/transform.ts b/web/src/pages/Route/transform.ts
@@ -271,6 +271,7 @@ export const transformStepData = ({
     data.remote_addrs?.filter(Boolean).length !== 0 ? 'remote_addrs' : '',
     data.host ? 'host' : '',
     data.remote_addr ? 'remote_addr' : '',
+    data.plugin_config_id ? 'plugin_config_id' : '',
   ]);
 };