Feat/redesign

.github/actions/build-import-app-new/action.yml

@@ -0,0 +1,68 @@
+# v2.0.0
+name: Build Import App New
+
+inputs:
+  githubToken:
+    description: "GitHub Token"
+    required: true
+  npmToken:
+    description: "NPM Token"
+    required: true
+
+runs:
+  using: composite
+
+  steps:
+    - name: Install dependencies for Import App
+      shell: bash
+      working-directory: src/VirtoCommerce.ImportModule.Web/import-app-new
+      run: yarn
+
+    - name: Build Import Module
+      shell: bash
+      working-directory: src/VirtoCommerce.ImportModule.Web/import-app-new
+      run: yarn bootstrap
+
+    - name: Add auth token
+      shell: bash
+      working-directory: src/VirtoCommerce.ImportModule.Web/import-app-new
+      run: |
+        yarn config set --json npmRegistries '{ "//registry.npmjs.org": { "npmAuthToken": "'"${NPM_TOKEN}"'" } }'
+      env:
+        NPM_TOKEN: ${{ inputs.npmToken }}
+
+    - name: Check for NPM tag
+      shell: bash
+      working-directory: "src/VirtoCommerce.ImportModule.Web/import-app-new"
+      run: |
+        # Set default tag
+        NPM_TAG="latest"
+
+        # Check if package.json has npmTag
+        if [ -f "package.json" ]; then
+          NPM_TAG_FROM_PKG=$(node -p "try { const pkg = require('./package.json'); pkg.npmTag || ''; } catch(e) { '' }")
+          if [ ! -z "$NPM_TAG_FROM_PKG" ] && [ "$NPM_TAG_FROM_PKG" != "undefined" ] && [ "$NPM_TAG_FROM_PKG" != "null" ]; then
+            echo "Found npmTag in package.json: $NPM_TAG_FROM_PKG"
+            NPM_TAG="$NPM_TAG_FROM_PKG"
+          fi
+        fi
+
+        # Save to environment for later steps
+        echo "NPM_TAG=$NPM_TAG" >> $GITHUB_ENV
+        echo "Will publish with npm tag: $NPM_TAG"
+
+    - name: Publish Import module
+      shell: bash
+      working-directory: src/VirtoCommerce.ImportModule.Web/import-app-new
+      run: |
+        if [ "$NPM_TAG" = "latest" ]; then
+          yarn run publish || true
+        else
+          yarn workspace @virtocommerce/import-app npm publish --tag=$NPM_TAG || true
+        fi
+
+    - name: Build Import App
+      shell: bash
+      working-directory: src/VirtoCommerce.ImportModule.Web/import-app-new
+      run: yarn build
+

.github/actions/build-import-app/action.yml

@@ -32,10 +32,35 @@ runs:
       env:
         NPM_TOKEN: ${{ inputs.npmToken }}
 
+    - name: Check for NPM tag
+      shell: bash
+      working-directory: "src/VirtoCommerce.ImportModule.Web/import-app"
+      run: |
+        # Set default tag
+        NPM_TAG="latest"
+
+        # Check if package.json has npmTag
+        if [ -f "package.json" ]; then
+          NPM_TAG_FROM_PKG=$(node -p "try { const pkg = require('./package.json'); pkg.npmTag || ''; } catch(e) { '' }")
+          if [ ! -z "$NPM_TAG_FROM_PKG" ] && [ "$NPM_TAG_FROM_PKG" != "undefined" ] && [ "$NPM_TAG_FROM_PKG" != "null" ]; then
+            echo "Found npmTag in package.json: $NPM_TAG_FROM_PKG"
+            NPM_TAG="$NPM_TAG_FROM_PKG"
+          fi
+        fi
+
+        # Save to environment for later steps
+        echo "NPM_TAG=$NPM_TAG" >> $GITHUB_ENV
+        echo "Will publish with npm tag: $NPM_TAG"
+
     - name: Publish Import module
       shell: bash
       working-directory: src/VirtoCommerce.ImportModule.Web/import-app
-      run: yarn run publish || true
+      run: |
+        if [ "$NPM_TAG" = "latest" ]; then
+          yarn run publish || true
+        else
+          yarn workspace @virtocommerce/import-app npm publish --tag=$NPM_TAG || true
+        fi
 
     - name: Build Import App
       shell: bash

.github/workflows/module-ci.yml

@@ -32,7 +32,7 @@ jobs:
     if: ${{ github.actor != 'dependabot[bot]' &&
         (github.event.pull_request.head.repo.full_name == github.repository ||
         github.event.pull_request.head.repo.full_name == '') }}  # Check that PR not from forked repo and not from Dependabot
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       CLOUD_INSTANCE_BASE_URL: ${{secrets.CLOUD_INSTANCE_BASE_URL}}
       CLIENT_ID: ${{secrets.CLIENT_ID}}
@@ -59,6 +59,11 @@ jobs:
         with:
             node-version: '18'
 
+      - name: Enable Corepack & use Yarn 4
+        run: |
+          corepack enable
+          corepack prepare yarn@4.0.2 --activate
+
       - name: Set RELEASE_STATUS
         if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' }}
         run: |
@@ -98,6 +103,12 @@ jobs:
           githubToken: ${{ secrets.REPO_TOKEN }}
           npmToken: ${{ secrets.NPM_TOKEN }}
 
+      - name: Build New Import App
+        uses: ./.github/actions/build-import-app-new
+        with:
+          githubToken: ${{ secrets.REPO_TOKEN }}
+          npmToken: ${{ secrets.NPM_TOKEN }}
+
       - name: Build
         run: vc-build Compile
 
@@ -108,11 +119,11 @@ jobs:
         run: vc-build Compress -skip Clean+Restore+Compile+Test
 
       - name: Publish Nuget
-        if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master') && github.event_name != 'workflow_dispatch' }}
+        if: ${{ (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/feat/redesign') && github.event_name != 'workflow_dispatch' }}
         uses: VirtoCommerce/vc-github-actions/publish-nuget@master
 
       - name: Publish to Blob
-        if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/master') }}
+        if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/feat/redesign' || github.event_name == 'pull_request' || (github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/master') }}
         id: blobRelease
         uses: VirtoCommerce/vc-github-actions/publish-blob-release@master
         with:
@@ -143,7 +154,7 @@ jobs:
           fi;
 
       - name: Create deployment matrix
-        if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'}}
+        if: ${{ github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/feat/redesign'}}
         uses: VirtoCommerce/vc-github-actions/cloud-create-deploy-matrix@master
         id: deployment-matrix
         with:
@@ -185,7 +196,7 @@ jobs:
           echo "Jira Upload Build Info response: ${{ steps.push_build_info_to_jira.outputs.response }}"
 
   deploy-cloud:
-    if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/dev') }}
+    if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/dev') || github.ref == 'refs/heads/feat/redesign' }}
     needs: ci
     uses: VirtoCommerce/.github/.github/workflows/deploy-cloud.yml@VCI-805
     with:

src/VirtoCommerce.ImportModule.Web/VirtoCommerce.ImportModule.Web.csproj

@@ -32,12 +32,6 @@
     <Copy SourceFiles="@(NotificationTemplates)" DestinationFiles="$(PublishDir)\..\%(Identity)" />
     <Copy SourceFiles="@(ImportApp)" DestinationFiles="$(PublishDir)\..\%(Identity)" />
   </Target>
-  <ItemGroup>
-    <Compile Remove="import-app\**" />
-    <Content Remove="import-app\**" />
-    <EmbeddedResource Remove="import-app\**" />
-    <None Remove="import-app\**" />
-  </ItemGroup>
 
 
   <ItemGroup>
@@ -50,4 +44,8 @@
     <Folder Include="Scripts\widgets\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="import-app\.yarn\releases\yarn-4.0.2.cjs" />
+  </ItemGroup>
+
 </Project>

src/VirtoCommerce.ImportModule.Web/import-app-new/.browserslistrc

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not dead

src/VirtoCommerce.ImportModule.Web/import-app-new/.commitlintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["@commitlint/config-conventional"]
+}

src/VirtoCommerce.ImportModule.Web/import-app-new/.editorconfig

@@ -0,0 +1,22 @@
+# top-most EditorConfig file
+root = true
+
+# Global rules, override on case-by-case basis
+[*]
+charset = utf-8
+indent_style = space
+max_line_length = 120
+tab_width = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{vue,js,ts,scss}]
+quote_type = double
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
+
+[*.svg]
+insert_final_newline = false

src/VirtoCommerce.ImportModule.Web/import-app-new/.env

@@ -0,0 +1,3 @@
+APP_BASE_PATH=/apps/import-app-new/
+APP_I18N_LOCALE=en
+APP_I18N_FALLBACK_LOCALE=en

src/VirtoCommerce.ImportModule.Web/import-app-new/.env.local

@@ -0,0 +1 @@
+APP_PLATFORM_URL=https://vcmp-dev.govirto.com/

src/VirtoCommerce.ImportModule.Web/import-app-new/.eslintignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+api-client.ts

src/VirtoCommerce.ImportModule.Web/import-app-new/.eslintrc.js

@@ -0,0 +1,41 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+  },
+  plugins: ["@typescript-eslint", "vue", "import"],
+  extends: [
+    "plugin:vue/vue3-recommended",
+    "eslint:recommended",
+    "plugin:import/recommended",
+    "plugin:import/typescript",
+    "@vue/typescript/recommended",
+    "@vue/prettier",
+    "@vue/eslint-config-typescript/recommended",
+  ],
+  parser: "vue-eslint-parser",
+  parserOptions: {
+    sourceType: "module",
+    ecmaVersion: 2022,
+  },
+  settings: {
+    "import/parsers": {
+      "@typescript-eslint/parser": [".ts"],
+    },
+    "import/resolver": {
+      typescript: {
+        project: ["./tsconfig.json", "./src/api_client/tsconfig.json", "./src/modules/tsconfig.json"],
+      },
+    },
+  },
+  rules: {
+    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
+    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+    "@typescript-eslint/ban-ts-comment": "warn",
+    "@typescript-eslint/no-unused-vars": "warn",
+    "vue/multi-word-component-names": "off",
+    "vue/require-default-prop": "off",
+    "vue/no-v-html": "off",
+    "vue/no-template-shadow": "off",
+  },
+};

src/VirtoCommerce.ImportModule.Web/import-app-new/.gitignore

@@ -0,0 +1,7 @@
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

src/VirtoCommerce.ImportModule.Web/import-app-new/.prettierignore

@@ -0,0 +1,4 @@
+node_modules
+dist
+*.js
+api-client.ts

src/VirtoCommerce.ImportModule.Web/import-app-new/.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleAttributePerLine": true,
+  "endOfLine": "auto"
+}