NEXT-35606 - disable-multiple-vue-compat-groups-part-2

Author: jleifeld

.run/Administration Jest.run.xml

@@ -12,4 +12,4 @@
       <option name="RunConfigurationTask" enabled="true" run_configuration_name="Framework Schema Dump" run_configuration_type="ComposerRunConfigurationType" />
     </method>
   </configuration>
-</component>
+</component>

src/Administration/Resources/app/administration/src/app/component/tree/sw-tree-item/sw-tree-item.html.twig

@@ -254,7 +254,6 @@
     <!-- eslint-disable-next-line sw-deprecation-rules/no-twigjs-blocks -->
     {% block sw_tree_item_children_transition %}
     <transition name="fade">
-
         <!-- eslint-disable-next-line sw-deprecation-rules/no-twigjs-blocks -->
         {% block sw_tree_item_children_content %}
         <div

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-affiliate-and-campaign-code-modal/index.js

@@ -11,6 +11,8 @@ const { mapState } = Component.getComponentHelper();
 export default {
     template,
 
+    compatConfig: Shopware.compatConfig,
+
     emits: ['process-finish', 'modal-close'],
 
     mixins: [

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-affiliate-and-campaign-code-modal/sw-flow-affiliate-and-campaign-code-modal.spec.js

@@ -1,6 +1,11 @@
 import { mount } from '@vue/test-utils';
 import flowState from 'src/module/sw-flow/state/flow.state';
 
+/**
+ * @package services-settings
+ * @group disabledCompat
+ */
+
 Shopware.Service().register('flowBuilderService', () => {
     return {
         mapActionType: () => {},
@@ -113,6 +118,10 @@ async function createWrapper() {
                 'sw-checkbox-field': await wrapTestComponent('sw-checkbox-field'),
                 'sw-checkbox-field-deprecated': await wrapTestComponent('sw-checkbox-field-deprecated', { sync: true }),
                 'sw-container': await wrapTestComponent('sw-container'),
+                'sw-field-copyable': true,
+                'sw-inheritance-switch': true,
+                'sw-ai-copilot-badge': true,
+                'sw-help-text': true,
             },
         },
         props: {

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-app-action-modal/index.js

@@ -10,6 +10,8 @@ const { Mixin, Classes: { ShopwareError } } = Shopware;
 export default {
     template,
 
+    compatConfig: Shopware.compatConfig,
+
     inject: ['acl'],
 
     emits: ['process-finish', 'modal-close'],
@@ -97,14 +99,29 @@ export default {
             }
 
             if (field.required && !value && typeof value !== 'boolean') {
-                this.$delete(this.config, [field.name]);
-                this.$set(this.errors, field.name, new ShopwareError({
-                    code: 'c1051bb4-d103-4f74-8988-acbcafc7fdc3',
-                }));
+                if (this.isCompatEnabled('INSTANCE_DELETE')) {
+                    this.$delete(this.config, [field.name]);
+                } else {
+                    delete this.config[field.name];
+                }
+
+                if (this.isCompatEnabled('INSTANCE_SET')) {
+                    this.$set(this.errors, field.name, new ShopwareError({
+                        code: 'c1051bb4-d103-4f74-8988-acbcafc7fdc3',
+                    }));
+                } else {
+                    this.errors[field.name] = new ShopwareError({
+                        code: 'c1051bb4-d103-4f74-8988-acbcafc7fdc3',
+                    });
+                }
                 return;
             }
 
-            this.$delete(this.errors, [field.name]);
+            if (this.isCompatEnabled('INSTANCE_DELETE')) {
+                this.$delete(this.errors, [field.name]);
+            } else {
+                delete this.errors[field.name];
+            }
         },
 
         onSave() {
@@ -138,7 +155,11 @@ export default {
             this.sequence.propsAppFlowAction?.config.forEach((config) => {
                 this.config[config.name] = this.convertDefaultValue(config.type, config.defaultValue);
                 this.fields.push(config);
-                this.$delete(this.errors, config.name);
+                if (this.isCompatEnabled('INSTANCE_DELETE')) {
+                    this.$delete(this.errors, config.name);
+                } else {
+                    delete this.errors[config.name];
+                }
             });
         },
 

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-app-action-modal/sw-flow-app-action-modal.spec.js

@@ -1,5 +1,10 @@
 import { mount } from '@vue/test-utils';
 
+/**
+ * @package services-settings
+ * @group disabledCompat
+ */
+
 const sequence = {
     sequence: {
         propsAppFlowAction: {
@@ -79,6 +84,13 @@ async function createWrapper() {
                 'sw-entity-single-select': true,
                 'sw-label': true,
                 'sw-icon': true,
+                'sw-highlight-text': true,
+                'sw-select-result': true,
+                'sw-select-result-list': true,
+                'sw-loader': true,
+                'sw-inheritance-switch': true,
+                'sw-ai-copilot-badge': true,
+                'sw-help-text': true,
             },
             provide: {
                 validationService: {},
@@ -96,7 +108,7 @@ async function createWrapper() {
     });
 }
 
-describe('module/sw-flow/component/sw-flow-tag-modal', () => {
+describe('module/sw-flow/component/sw-flow-app-action-modal', () => {
     it('should show these fields on modal', async () => {
         const wrapper = await createWrapper();
         await flushPromises();

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-change-customer-group-modal/index.js

@@ -12,6 +12,8 @@ const { ShopwareError } = Shopware.Classes;
 export default {
     template,
 
+    compatConfig: Shopware.compatConfig,
+
     inject: ['repositoryFactory'],
 
     emits: ['modal-close', 'process-finish'],

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-change-customer-group-modal/sw-flow-change-customer-group-modal.spec.js

@@ -1,6 +1,11 @@
 import { mount } from '@vue/test-utils';
 import flowState from 'src/module/sw-flow/state/flow.state';
 
+/**
+ * @package services-settings
+ * @group disabledCompat
+ */
+
 const customerGroupMock = [
     {
         translated: { name: 'Test net group' },
@@ -54,6 +59,11 @@ async function createWrapper() {
                 'sw-popover': await wrapTestComponent('sw-popover'),
                 'sw-popover-deprecated': await wrapTestComponent('sw-popover-deprecated', { sync: true }),
                 'sw-loader': true,
+                'router-link': true,
+                'sw-inheritance-switch': true,
+                'sw-ai-copilot-badge': true,
+                'sw-help-text': true,
+                'sw-icon-deprecated': true,
             },
         },
     });

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-change-customer-status-modal/index.js

@@ -10,6 +10,8 @@ const { mapState } = Component.getComponentHelper();
 export default {
     template,
 
+    compatConfig: Shopware.compatConfig,
+
     inject: ['repositoryFactory'],
 
     emits: ['modal-close', 'process-finish'],

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-change-customer-status-modal/sw-flow-change-customer-status-modal.spec.js

@@ -1,5 +1,10 @@
 import { mount } from '@vue/test-utils';
 
+/**
+ * @package services-settings
+ * @group disabledCompat
+ */
+
 async function createWrapper() {
     return mount(await wrapTestComponent('sw-flow-change-customer-status-modal', { sync: true }), {
         global: {

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-create-mail-template-modal/index.js

@@ -13,6 +13,8 @@ const utils = Shopware.Utils;
 export default {
     template,
 
+    compatConfig: Shopware.compatConfig,
+
     inject: ['mailService', 'entityMappingService', 'repositoryFactory'],
 
     emits: ['modal-close', 'process-finish'],

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-create-mail-template-modal/sw-flow-create-mail-template-modal.spec.js

@@ -1,5 +1,10 @@
 import { mount } from '@vue/test-utils';
 
+/**
+ * @package services-settings
+ * @group disabledCompat
+ */
+
 const fieldsClasses = [
     '.sw-flow-create-mail-template-modal__type',
     '.sw-flow-create-mail-template-modal__subject', // n
@@ -88,6 +93,13 @@ async function createWrapper(privileges = []) {
                     template: '<div class="sw-popover"><slot></slot></div>',
                 },
                 'sw-loader': true,
+                'sw-product-variant-info': true,
+                'sw-field-copyable': true,
+                'sw-textarea-field-deprecated': true,
+                'sw-circle-icon': true,
+                'sw-inheritance-switch': true,
+                'sw-ai-copilot-badge': true,
+                'sw-help-text': true,
             },
             provide: {
                 repositoryFactory: {

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-event-change-confirm-modal/index.js

@@ -14,6 +14,8 @@ export default {
 
     emits: ['modal-confirm', 'modal-close'],
 
+    compatConfig: Shopware.compatConfig,
+
     computed: {
         ...mapGetters('swFlowState', ['sequences']),
     },

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-event-change-confirm-modal/sw-flow-event-change-confirm-modal.spec.js

@@ -4,6 +4,11 @@ import EntityCollection from 'src/core/data/entity-collection.data';
 
 import { mount } from '@vue/test-utils';
 
+/**
+ * @package services-settings
+ * @group disabledCompat
+ */
+
 const fieldClasses = [
     '.sw-flow-event-change-confirm-modal__title',
     '.sw-flow-event-change-confirm-modal__text-confirmation',

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-generate-document-modal/index.js

@@ -12,6 +12,8 @@ const { ShopwareError } = Shopware.Classes;
 export default {
     template,
 
+    compatConfig: Shopware.compatConfig,
+
     inject: [
         'repositoryFactory',
     ],

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-generate-document-modal/sw-flow-generate-document-modal.spec.js

@@ -2,6 +2,11 @@ import { mount } from '@vue/test-utils';
 
 import flowState from 'src/module/sw-flow/state/flow.state';
 
+/**
+ * @package services-settings
+ * @group disabledCompat
+ */
+
 const documentTypeMock = [
     {
         technicalName: 'invoice',
@@ -68,6 +73,10 @@ async function createWrapper() {
                 'sw-label': true,
                 'sw-icon': true,
                 'sw-field-error': true,
+                'sw-loader': true,
+                'sw-inheritance-switch': true,
+                'sw-ai-copilot-badge': true,
+                'sw-help-text': true,
             },
         },
         props: {

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-grant-download-access-modal/index.js

@@ -11,6 +11,8 @@ const { mapState } = Component.getComponentHelper();
 export default {
     template,
 
+    compatConfig: Shopware.compatConfig,
+
     emits: ['process-finish', 'modal-close'],
 
     mixins: [

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-grant-download-access-modal/sw-flow-grant-download-access-modal.spec.js

@@ -1,6 +1,11 @@
 import { mount } from '@vue/test-utils';
 import flowState from 'src/module/sw-flow/state/flow.state';
 
+/**
+ * @package services-settings
+ * @group disabledCompat
+ */
+
 const { ShopwareError } = Shopware.Classes;
 
 Shopware.State.registerModule('swFlowState', {
@@ -32,6 +37,12 @@ async function createWrapper(config = null) {
             stubs: {
                 'sw-modal': await wrapTestComponent('sw-modal'),
                 'sw-single-select': true,
+                'sw-button': {
+                    emits: ['click'],
+                    template: '<button @click="$emit(\'click\')"><slot></slot></button>',
+                },
+                'sw-icon': true,
+                'sw-loader': true,
             },
             provide: {
                 shortcutService: {
@@ -96,7 +107,9 @@ describe('module/sw-flow/component/sw-flow-grant-download-access-modal', () => {
         const valueField = wrapper.find('.sw-flow-grant-download-access-modal__value-field');
         expect(valueField.attributes('error')).toBeUndefined();
 
-        await wrapper.find('.sw-flow-grant-download-access-modal__save-button').trigger('click');
+        await wrapper.find('.sw-flow-grant-download-access-modal__save-button')
+            .trigger('click');
+        await flushPromises();
 
         expect(valueField.attributes('error')).toBeUndefined();
         expect(wrapper.emitted('process-finish')).toBeTruthy();

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-leave-page-modal/index.js

@@ -8,6 +8,9 @@ export default {
     template,
 
     emits: ['page-leave-confirm', 'page-leave-cancel'],
+
+    compatConfig: Shopware.compatConfig,
+
     methods: {
         onConfirm() {
             this.$emit('page-leave-confirm');

src/Administration/Resources/app/administration/src/module/sw-flow/component/modals/sw-flow-mail-send-modal/index.js

@@ -13,6 +13,8 @@ const { mapState } = Component.getComponentHelper();
 export default {
     template,
 
+    compatConfig: Shopware.compatConfig,
+
     inject: [
         'repositoryFactory',
     ],
@@ -406,8 +408,13 @@ export default {
 
             // Recheck error in current item
             if (!item.name && !item.email) {
-                this.$set(this.recipients, index, { ...item, errorName: null });
-                this.$set(this.recipients, index, { ...item, errorMail: null });
+                if (this.isCompatEnabled('INSTANCE_SET')) {
+                    this.$set(this.recipients, index, { ...item, errorName: null });
+                    this.$set(this.recipients, index, { ...item, errorMail: null });
+                } else {
+                    this.recipients[index] = { ...item, errorName: null };
+                    this.recipients[index] = { ...item, errorMail: null };
+                }
             } else {
                 this.validateRecipient(item, index);
             }
@@ -462,11 +469,19 @@ export default {
             const errorName = this.setNameError(item.name);
             const errorMail = this.setMailError(item.email);
 
-            this.$set(this.recipients, itemIndex, {
-                ...item,
-                errorName,
-                errorMail,
-            });
+            if (this.isCompatEnabled('INSTANCE_SET')) {
+                this.$set(this.recipients, itemIndex, {
+                    ...item,
+                    errorName,
+                    errorMail,
+                });
+            } else {
+                this.recipients[itemIndex] = {
+                    ...item,
+                    errorName,
+                    errorMail,
+                };
+            }
 
             return errorName || errorMail;
         },