chore: resolve conflicts

Author: larskemper

src/Resources/app/administration/package-lock.json

@@ -12,10 +12,13 @@
     "format": "prettier --check \"src/**/*.{js,ts}\" --config ../../../../.prettierrc.json --cache",
     "format:fix": "prettier --write \"src/**/*.{js,ts}\" --config ../../../../.prettierrc.json --cache"
   },
+  "dependencies": {
+    "@shopware-ag/meteor-tokens": "1.3.0"
+  },
   "devDependencies": {
     "@eslint/js": "^9.18.0",
     "@shopware-ag/eslint-config-base": "^2.0.0",
-    "@shopware-ag/stylelint-plugin-meteor": "^1.1.0",
+    "@shopware-ag/stylelint-plugin-meteor": "^4.0.0",
     "@types/node": "^22.10.10",
     "@typescript-eslint/eslint-plugin": "^7.9.0",
     "@typescript-eslint/parser": "^7.9.0",
@@ -28,6 +31,7 @@
     "eslint-plugin-file-progress": "^1.4.0",
     "eslint-plugin-filename-rules": "^1.3.1",
     "eslint-plugin-html": "^8.1.1",
+    "eslint-plugin-import": "2.31.0",
     "eslint-plugin-inclusive-language": "^2.2.1",
     "eslint-plugin-jest": "^28.5.0",
     "vue-eslint-parser": "9.4.3",

src/Resources/app/administration/package.json

@@ -28,7 +28,7 @@ export const MIGRATION_API_SERVICE = 'migrationApiService';
 export const MIGRATION_STEP = {
     IDLE: 'idle',
     FETCHING: 'fetching',
-    ERROR_RESOLUTION: 'error-resolution',
+    ERROR_RESOLUTION: 'apply-fixes',
     WRITING: 'writing',
     MEDIA_PROCESSING: 'media-processing',
     CLEANUP: 'cleanup',
@@ -248,7 +248,7 @@ export default class MigrationApiService extends ApiService {
             });
     }
 
-    async resumeMigrationAfterFixes(): Promise<ApiResponse<unknown>> {
+    async continueAfterErrorResolution(): Promise<ApiResponse<unknown>> {
         // @ts-ignore
         const headers = this.getBasicHeaders();
 

src/Resources/app/administration/src/core/service/api/swag-migration.api.service.ts

@@ -4,4 +4,3 @@
  */
 Shopware.Component.register('swag-migration-loading-screen', () => import('./swag-migration-loading-screen'));
 Shopware.Component.register('swag-migration-result-screen', () => import('./swag-migration-result-screen'));
-Shopware.Component.register('swag-migration-apply-fixes', () => import('./swag-migration-apply-fixes'));

src/Resources/app/administration/src/module/swag-migration/component/loading-screen/index.ts

@@ -72,7 +72,7 @@
         &-header {
             // fixed padding needed for alignment with left side (top border)
             /* stylelint-disable-next-line meteor/prefer-sizing-token */
-            padding: 1.1rem var(--scale-size-24);
+            padding: 1.1rem var(--scale-size-24);fixedpaddingneededforalignmentwithleftsidepadding
             border-bottom: 1px solid var(--color-border-primary-default);
 
 

src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-apply-fixes/index.ts

@@ -29,6 +29,7 @@ export interface SwagMigrationErrorResolutionStepData {
     tableTotal: number;
     openContinueModal: boolean;
     openErrorResolutionModal: boolean;
+    continueLoading: boolean;
     migrationStore: MigrationStore;
     migrationApiService: MigrationApiService;
 }
@@ -56,6 +57,7 @@ export default Shopware.Component.wrapComponentConfig({
             tableTotal: 145,
             openContinueModal: false,
             openErrorResolutionModal: false,
+            continueLoading: false,
             migrationStore: Shopware.Store.get(MIGRATION_STORE_ID),
             migrationApiService: Shopware.Service(MIGRATION_API_SERVICE),
         };
@@ -163,6 +165,22 @@ export default Shopware.Component.wrapComponentConfig({
     },
 
     methods: {
+        async onContinueMigration() {
+            this.continueLoading = true;
+
+            return this.migrationApiService
+                .continueAfterErrorResolution()
+                .catch(() => {
+                    this.createNotificationError({
+                        message: this.$tc('swag-migration.index.error-resolution.errors.continueMigrationFailed'),
+                    });
+                })
+                .finally(() => {
+                    this.continueLoading = false;
+                    this.openContinueModal = false;
+                });
+        },
+
         async onDownloadLogs() {
             // TODO: fetch latest !?
             const runId = this.migrationStore.latestRun?.id;

src/Resources/app/administration/src/module/swag-migration/component/loading-screen/swag-migration-apply-fixes/swag-migration-apply-fixes.html.twig

@@ -30,6 +30,8 @@
                     class="swag-migration-error-resolution-step__continue-modal-confirm"
                     variant="critical"
                     size="small"
+                    :is-loading="continueLoading"
+                    @click="onContinueMigration"
                 >
                     {{ $tc('swag-migration.index.error-resolution.step.header.continue') }}
                 </mt-button>

src/Resources/app/administration/src/module/swag-migration/component/swag-migration-error-resolution/swag-migration-error-resolution-modal/swag-migration-error-resolution-modal.scss

@@ -377,7 +377,6 @@
         "flowChart": {
           "premapping": "Prüfen",
           "fetchData": "Lesen",
-          "applyFixes": "Fehler beheben",
           "writeData": "Schreiben",
           "processMedia": "Download",
           "cleanup": "Aufräumen",
@@ -423,10 +422,6 @@
           "caption": "Die Medien werden weiter im Hintergrund heruntergeladen. Große Dateien können etwas Zeit in Anspruch nehmen.",
           "logSummary": "Logbuch",
           "historyHint": "Du kannst diese Informationen jederzeit in der Migrations-Historie einsehen. Es kann sein, dass zu einem späteren Zeitpunkt noch mehr Log-Nachrichten hinzukommen, weil der Mediendownload noch im Hintergrund läuft."
-        },
-        "applyFixes": {
-          "title": "Fehler beheben",
-          "resumeButton": "Migration fortsetzen"
         }
       },
       "confirmAbortDialog": {