From 7ec54bebdea9dca8faeb2e6de942ac9fee609e19 Mon Sep 17 00:00:00 2001 From: Manjiri Tapaswi Date: Mon, 18 Mar 2024 10:07:37 -0700 Subject: [PATCH 1/2] feat(jsonYamlForms): remove json yaml milestone 2 ff for all entity forms post GA [KHCP-9971] --- .../sandbox/pages/CACertificateFormPage.vue | 1 - .../sandbox/pages/CertificateFormPage.vue | 1 - .../sandbox/pages/ConsumerGroupFormPage.vue | 1 - .../sandbox/pages/ConsumerFormPage.vue | 1 - .../sandbox/pages/GatewayServiceFormPage.vue | 1 - .../src/components/GatewayServiceForm.cy.ts | 1 - .../sandbox/pages/KeySetFormPage.vue | 1 - .../entities-keys/sandbox/pages/KeyFormPage.vue | 1 - .../sandbox/pages/PluginFormPage.vue | 1 - .../src/components/PluginForm.vue | 16 +++++++--------- .../sandbox/pages/RouteFormPage.vue | 1 - .../docs/entity-base-config-card.md | 6 ------ .../entities-shared/docs/entity-base-form.md | 6 ------ .../sandbox/pages/ConfigCardDisplayPage.vue | 1 - .../sandbox/pages/EntityBaseFormPage.vue | 1 - .../src/components/common/JsonCodeBlock.cy.ts | 4 ---- .../src/components/common/JsonCodeBlock.vue | 2 +- .../ConfigCardDisplay.cy.ts | 4 ---- .../entity-base-form/EntityBaseForm.cy.ts | 6 +----- .../entity-base-form/EntityBaseForm.vue | 16 +++++++--------- .../src/types/entity-base-config-card.ts | 5 ----- .../src/types/entity-base-form.ts | 5 ----- .../entities-snis/sandbox/pages/SniFormPage.vue | 1 - .../sandbox/pages/UpstreamFormPage.vue | 1 - .../sandbox/pages/VaultFormPage.vue | 1 - 25 files changed, 16 insertions(+), 69 deletions(-) diff --git a/packages/entities/entities-certificates/sandbox/pages/CACertificateFormPage.vue b/packages/entities/entities-certificates/sandbox/pages/CACertificateFormPage.vue index 8406de64bc..a4076469af 100644 --- a/packages/entities/entities-certificates/sandbox/pages/CACertificateFormPage.vue +++ b/packages/entities/entities-certificates/sandbox/pages/CACertificateFormPage.vue @@ -41,7 +41,6 @@ const konnectConfig = ref({ // Set the root `.env.development.local` variable to a control plane your PAT can access controlPlaneId, cancelRoute: { name: 'ca-certificate-list' }, - jsonYamlFormsEnabled: true, }) const kongManagerConfig = ref({ diff --git a/packages/entities/entities-certificates/sandbox/pages/CertificateFormPage.vue b/packages/entities/entities-certificates/sandbox/pages/CertificateFormPage.vue index 2008ed0435..12049ea1bc 100644 --- a/packages/entities/entities-certificates/sandbox/pages/CertificateFormPage.vue +++ b/packages/entities/entities-certificates/sandbox/pages/CertificateFormPage.vue @@ -41,7 +41,6 @@ const konnectConfig = ref({ // Set the root `.env.development.local` variable to a control plane your PAT can access controlPlaneId, cancelRoute: { name: 'certificate-list' }, - jsonYamlFormsEnabled: true, }) const kongManagerConfig = ref({ diff --git a/packages/entities/entities-consumer-groups/sandbox/pages/ConsumerGroupFormPage.vue b/packages/entities/entities-consumer-groups/sandbox/pages/ConsumerGroupFormPage.vue index dd974aba16..6ff2f211aa 100644 --- a/packages/entities/entities-consumer-groups/sandbox/pages/ConsumerGroupFormPage.vue +++ b/packages/entities/entities-consumer-groups/sandbox/pages/ConsumerGroupFormPage.vue @@ -45,7 +45,6 @@ const konnectConfig = ref({ apiBaseUrl: '/us/kong-api/konnect-api', controlPlaneId, cancelRoute: { name: 'consumer-group-list' }, - jsonYamlFormsEnabled: true, }) const KMConfig = ref({ diff --git a/packages/entities/entities-consumers/sandbox/pages/ConsumerFormPage.vue b/packages/entities/entities-consumers/sandbox/pages/ConsumerFormPage.vue index c7310a5adf..e18ae5dc80 100644 --- a/packages/entities/entities-consumers/sandbox/pages/ConsumerFormPage.vue +++ b/packages/entities/entities-consumers/sandbox/pages/ConsumerFormPage.vue @@ -45,7 +45,6 @@ const konnectConfig = ref({ apiBaseUrl: '/us/kong-api/konnect-api', controlPlaneId, cancelRoute: { name: 'consumer-list' }, - jsonYamlFormsEnabled: true, }) const KMConfig = ref({ diff --git a/packages/entities/entities-gateway-services/sandbox/pages/GatewayServiceFormPage.vue b/packages/entities/entities-gateway-services/sandbox/pages/GatewayServiceFormPage.vue index 091a0b60e9..70f12c83ab 100644 --- a/packages/entities/entities-gateway-services/sandbox/pages/GatewayServiceFormPage.vue +++ b/packages/entities/entities-gateway-services/sandbox/pages/GatewayServiceFormPage.vue @@ -39,7 +39,6 @@ const konnectConfig = ref({ // Set the root `.env.development.local` variable to a control plane your PAT can access controlPlaneId, cancelRoute: { name: 'gateway-services-list' }, - jsonYamlFormsEnabled: true, }) const kongManagerConfig = ref({ diff --git a/packages/entities/entities-gateway-services/src/components/GatewayServiceForm.cy.ts b/packages/entities/entities-gateway-services/src/components/GatewayServiceForm.cy.ts index 0dad96ef19..e6320cc49c 100644 --- a/packages/entities/entities-gateway-services/src/components/GatewayServiceForm.cy.ts +++ b/packages/entities/entities-gateway-services/src/components/GatewayServiceForm.cy.ts @@ -11,7 +11,6 @@ const baseConfigKonnect:KonnectGatewayServiceFormConfig = { controlPlaneId: '1234-abcd-ilove-dogs', apiBaseUrl: '/us/kong-api/konnect-api', cancelRoute, - jsonYamlFormsEnabled: true, } const baseConfigKM:KongManagerGatewayServiceFormConfig = { diff --git a/packages/entities/entities-key-sets/sandbox/pages/KeySetFormPage.vue b/packages/entities/entities-key-sets/sandbox/pages/KeySetFormPage.vue index ef7b217478..cf3772960b 100644 --- a/packages/entities/entities-key-sets/sandbox/pages/KeySetFormPage.vue +++ b/packages/entities/entities-key-sets/sandbox/pages/KeySetFormPage.vue @@ -38,7 +38,6 @@ const konnectConfig = ref({ // Set the root `.env.development.local` variable to a control plane your PAT can access controlPlaneId, cancelRoute: { name: 'key-set-list' }, - jsonYamlFormsEnabled: true, }) const kongManagerConfig = ref({ app: 'kongManager', diff --git a/packages/entities/entities-keys/sandbox/pages/KeyFormPage.vue b/packages/entities/entities-keys/sandbox/pages/KeyFormPage.vue index 1d77ac53ba..b7e9ff1c55 100644 --- a/packages/entities/entities-keys/sandbox/pages/KeyFormPage.vue +++ b/packages/entities/entities-keys/sandbox/pages/KeyFormPage.vue @@ -51,7 +51,6 @@ const konnectConfig = ref({ // Set the root `.env.development.local` variable to a control plane your PAT can access controlPlaneId, cancelRoute: { name: 'key-list' }, - jsonYamlFormsEnabled: true, }) const kongManagerConfig = ref({ diff --git a/packages/entities/entities-plugins/sandbox/pages/PluginFormPage.vue b/packages/entities/entities-plugins/sandbox/pages/PluginFormPage.vue index 8b4845608f..d12a8b1ade 100644 --- a/packages/entities/entities-plugins/sandbox/pages/PluginFormPage.vue +++ b/packages/entities/entities-plugins/sandbox/pages/PluginFormPage.vue @@ -50,7 +50,6 @@ const konnectConfig = ref({ // entityId: '6f1ef200-d3d4-4979-9376-726f2216d90c', backRoute: { name: 'select-plugin' }, cancelRoute: { name: 'home' }, - jsonYamlFormsEnabled: true, groupFields: true, }) diff --git a/packages/entities/entities-plugins/src/components/PluginForm.vue b/packages/entities/entities-plugins/src/components/PluginForm.vue index 48dec81eae..b28ff7332d 100644 --- a/packages/entities/entities-plugins/src/components/PluginForm.vue +++ b/packages/entities/entities-plugins/src/components/PluginForm.vue @@ -59,15 +59,13 @@ v-else class="plugin-form-actions" > -
- - {{ t('actions.view_configuration') }} - -
+ + {{ t('actions.view_configuration') }} + ({ // Set the root `.env.development.local` variable to a control plane your PAT can access controlPlaneId, cancelRoute: { name: 'route-list' }, - jsonYamlFormsEnabled: true, }) const kongManagerConfig = ref({ diff --git a/packages/entities/entities-shared/docs/entity-base-config-card.md b/packages/entities/entities-shared/docs/entity-base-config-card.md index f3a50c8d5a..2cbc8b088a 100644 --- a/packages/entities/entities-shared/docs/entity-base-config-card.md +++ b/packages/entities/entities-shared/docs/entity-base-config-card.md @@ -74,12 +74,6 @@ A base display component for an entity's record data. - default: `undefined` - The ID of the entity to display record data for. - - `jsonYamlFormsEnabled`: - - type: `boolean` - - required: `false` - - default: `false` - - Feature flag value for JSON/YAML Forms. Will be removed after feature goes GA. - The base konnect or kongManger config. #### `fetchUrl` diff --git a/packages/entities/entities-shared/docs/entity-base-form.md b/packages/entities/entities-shared/docs/entity-base-form.md index 03500ba725..e90c449115 100644 --- a/packages/entities/entities-shared/docs/entity-base-form.md +++ b/packages/entities/entities-shared/docs/entity-base-form.md @@ -55,12 +55,6 @@ A base form component for entity create/edit views. - default: `undefined` - Route to return to when canceling creation of an entity. - - `jsonYamlFormsEnabled`: - - type: `boolean` - - required: `false` - - default: `false` - - Feature flag value for JSON/YAML Forms. Will be removed after feature goes GA. - - `workspace`: - type: `string` - required: `true` diff --git a/packages/entities/entities-shared/sandbox/pages/ConfigCardDisplayPage.vue b/packages/entities/entities-shared/sandbox/pages/ConfigCardDisplayPage.vue index 8cda199df9..fa1ecdce4a 100644 --- a/packages/entities/entities-shared/sandbox/pages/ConfigCardDisplayPage.vue +++ b/packages/entities/entities-shared/sandbox/pages/ConfigCardDisplayPage.vue @@ -39,7 +39,6 @@ const konnectConfig = ref({ // Set the root `.env.development.local` variable to a control plane your PAT can access controlPlaneId, entityId, - jsonYamlFormsEnabled: true, }) const item = { diff --git a/packages/entities/entities-shared/sandbox/pages/EntityBaseFormPage.vue b/packages/entities/entities-shared/sandbox/pages/EntityBaseFormPage.vue index 2b86fafc89..6d55a1222b 100644 --- a/packages/entities/entities-shared/sandbox/pages/EntityBaseFormPage.vue +++ b/packages/entities/entities-shared/sandbox/pages/EntityBaseFormPage.vue @@ -56,7 +56,6 @@ const konnectConfig = ref({ // Set the root `.env.development.local` variable to a control plane your PAT can access controlPlaneId, cancelRoute: { name: '/' }, - jsonYamlFormsEnabled: true, }) const canSubmit = computed((): boolean => !!form.fields.name) diff --git a/packages/entities/entities-shared/src/components/common/JsonCodeBlock.cy.ts b/packages/entities/entities-shared/src/components/common/JsonCodeBlock.cy.ts index 80841a3b40..1cff9cd5cb 100644 --- a/packages/entities/entities-shared/src/components/common/JsonCodeBlock.cy.ts +++ b/packages/entities/entities-shared/src/components/common/JsonCodeBlock.cy.ts @@ -34,10 +34,6 @@ describe('', () => { const fetcherUrl = 'https://cloud.konghq.com/us/gateway-manager/91e192e0-5981-4662-a37d-7b24272c9da3/routes/0af86198-9822-46e0-9028-47b173caf4aa' cy.mount(JsonCodeBlock, { props: { - // TODO: Remove config once Feature Flag `Khcp-9892-json-yaml-milestone-2` is enabled - config: { - jsonYamlFormsEnabled: true, - }, fetcherUrl, jsonRecord: record, requestMethod: 'get', diff --git a/packages/entities/entities-shared/src/components/common/JsonCodeBlock.vue b/packages/entities/entities-shared/src/components/common/JsonCodeBlock.vue index 7db8e7ece9..98c64ed0d1 100644 --- a/packages/entities/entities-shared/src/components/common/JsonCodeBlock.vue +++ b/packages/entities/entities-shared/src/components/common/JsonCodeBlock.vue @@ -1,7 +1,7 @@