Merge pull request #2028 from aziontech/update-dev-from-main

chore: update dev from main
aziontech · Dec 17, 2024 · 23c6e18 · 23c6e18
2 parents 058ff3a + 814280e
commit 23c6e18
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 30 deletions.
diff --git a/.github/workflows/pre-merge.yml b/.github/workflows/pre-merge.yml
@@ -6,6 +6,7 @@ on:
     branches:
       - dev
       - freezing
+      - main
   push:
     branches:
       - dev
@@ -65,7 +66,7 @@ jobs:
         env:
           PROD_CYPRESS_EMAIL: ${{ secrets.PROD_CYPRESS_EMAIL }}
           PROD_CYPRESS_PASSWORD: ${{ secrets.PROD_CYPRESS_PASSWORD }}
-          VITE_ENVIRONMENT: "production"
+          VITE_ENVIRONMENT: 'production'
         with:
           build: yarn build
           start: yarn dev --logLevel=warn
@@ -164,25 +165,25 @@ jobs:
     needs: [run-tests, download_and_merge]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        
-    - uses: actions/download-artifact@v4
-      with:
-        name: coverage_unit_report
-        
-    - uses: actions/download-artifact@v4
-      with:
-        name: coverage_e2e_report
-        
-    - name: Extract E2E Coverage Report
-      run: |
-        unzip coverage.zip -d coverage_e2e
-        pwd
-        find ./
-        
-    - name: SonarCloud Scan
-      uses: sonarsource/sonarcloud-github-action@v2.3.0
-      env:
-        SONAR_TOKEN: ${{ secrets.SONAR_CLOUD_TOKEN }}
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: coverage_unit_report
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: coverage_e2e_report
+
+      - name: Extract E2E Coverage Report
+        run: |
+          unzip coverage.zip -d coverage_e2e
+          pwd
+          find ./
+
+      - name: SonarCloud Scan
+        uses: sonarsource/sonarcloud-github-action@v2.3.0
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_CLOUD_TOKEN }}
diff --git a/src/views/Domains/EditView.vue b/src/views/Domains/EditView.vue
@@ -24,7 +24,6 @@
             :loadDigitalCertificatesService="loadDigitalCertificatesService"
             hasDomainName
             @copyDomainName="copyDomainName"
-            @edgeFirewallCreated="handleEdgeFirewallCreated"
           />
         </template>
         <template #action-bar="{ onSubmit, onCancel, loading }">

diff --git a/src/views/Domains/FormFields/FormFieldsCreateDomains.vue b/src/views/Domains/FormFields/FormFieldsCreateDomains.vue
@@ -25,10 +25,6 @@
       type: Function,
       required: true
     },
-    edgeFirewallsData: {
-      type: Array,
-      required: true
-    },
     isLoadingEdgeFirewalls: {
       type: Boolean,
       required: true
@@ -355,7 +351,6 @@
         v-if="mtlsIsEnabled"
         class="flex flex-col w-full sm:max-w-xs gap-2"
       >
-        <!-- domains-form__mtls-trusted-certificate-field__dropdown -->
         <FieldDropdownLazyLoader
           label="Trusted CA Certificate"
           data-testid="domains-form__mtls-trusted-certificate-field"

diff --git a/src/views/Domains/FormFields/FormFieldsEditDomains.vue b/src/views/Domains/FormFields/FormFieldsEditDomains.vue
@@ -2,10 +2,10 @@
   import FormHorizontal from '@/templates/create-form-block/form-horizontal'
   import PrimeButton from 'primevue/button'
   import FieldText from '@/templates/form-fields-inputs/fieldText'
+  import FieldDropdownLazyLoader from '@/templates/form-fields-inputs/fieldDropdownLazyLoader'
   import InputText from 'primevue/inputtext'
   import PrimeTag from 'primevue/tag'
   import FieldTextArea from '@/templates/form-fields-inputs/fieldTextArea'
-  import FieldDropdownLazyLoader from '@/templates/form-fields-inputs/fieldDropdownLazyLoader'
   import FieldGroupRadio from '@/templates/form-fields-inputs/fieldGroupRadio'
   import FieldSwitchBlock from '@/templates/form-fields-inputs/fieldSwitchBlock'
   import Drawer from '@/views/EdgeApplications/Drawer'