Merge remote-tracking branch 'origin/main' into new-engine

systeminit · Mar 4, 2024 · db4f957 · db4f957
2 parents 422de9c + 5a4a4a2
commit db4f957
Show file tree

Hide file tree

Showing 45 changed files with 1,347 additions and 382 deletions.
diff --git a/.github/workflows/e2e-validation.yml b/.github/workflows/e2e-validation.yml
@@ -2,8 +2,8 @@ name: Cypress E2E Tests
 
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '*/15 * * * *'  # Runs every 5 minutes
+#  schedule:
+#    - cron: '*/5 * * * *'  # Runs every 5 minutes
 
 jobs:
   cypress-tests:
@@ -43,12 +43,17 @@ jobs:
         with:
             version: 8.10.5
 
-      - name: Run Cypress tests
+      - name: Install Cypress
         working-directory: app/web
         run: |
           pnpm i
           pnpm install cypress
-          npx cypress run --spec "cypress/e2e/**"
+          
+      - uses: nick-fields/retry@v2
+        with:
+          max_attempts: 3
+          timeout_minutes: 20
+          command: cd app/web && npx cypress run --spec "cypress/e2e/**"
 
       - name: 'Upload Cypress Recordings to Github'
         uses: actions/upload-artifact@v4
@@ -58,10 +63,7 @@ jobs:
           path: app/web/cypress/videos/**/*.mp4
           retention-days: 5
 
-      # TODO(johnrwatson): Enable this when we're happy with the synthetic above
-      #- name: Send PagerDuty alert on failure
-      #  if: ${{ failure() }}
-      #  uses: Entle/[email protected]
-      #  with:
-      #    pagerduty-integration-key: '${{ secrets.PAGERDUTY_INTEGRATION_KEY }}'
-      #    pagerduty-dedup-key: github_workflow_failed
+      - name: Send Slack Failure Webhook
+        if: failure()
+        run: |
+          curl -X POST -H 'Content-type: application/json' --data "{\"text\": \":si: Failed Cypress E2E Test for Production: <https://github.com/systeminit/si/actions/runs/$GITHUB_RUN_ID|:test_tube: Link>\"}" ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/app/web/.env b/app/web/.env
@@ -16,8 +16,8 @@ VITE_AUTH0_DOMAIN=systeminit.auth0.com
 # Remote Executing / E2E Specifities for Testing Production, local simply change the values to something like http://locahost:8080 & the relevant component IDs
 # VITE_SI_WORKSPACE_URL = https://app.systeminit.com/            # Production URL
 # VITE_SI_WORKSPACE_ID = 01HPMKZZ0DF54B12FNBF6Z7704              # Production Workspace URL Used for Synthetics
-# VITE_SI_PROPAGATION_COMPONENT_A = c_01HPMM4A95M2E3V6STMZZCZJRZ # Production: Used for E2E Value Propagation Test [output socket i.e. from]
-# VITE_SI_PROPAGATION_COMPONENT_B = c_01HPMM4BC682PFCYD7GE3X3AQW # Production: Used for E2E Value Propagation Test [input socket i.e. to]
+# VITE_SI_PROPAGATION_COMPONENT_A = c_01HQQP1XXK144KDJ7SPTCGRZGV # Production: Used for E2E Value Propagation Test [output socket i.e. from]
+# VITE_SI_PROPAGATION_COMPONENT_B = c_01HQQP2MJ767AR9FPKP051Y9HS # Production: Used for E2E Value Propagation Test [input socket i.e. to]
 # VITE_SI_CYPRESS_MULTIPLIER=1                                   # How many times to run each test in cypress, only changes modelling tests
 
 

diff --git a/app/web/cypress/e2e/modelling-functionality/create-component.cy.ts b/app/web/cypress/e2e/modelling-functionality/create-component.cy.ts
@@ -23,7 +23,7 @@ Cypress._.times(import.meta.env.VITE_SI_CYPRESS_MULTIPLIER ? import.meta.env.VIT
       cy.url().should('not.include', 'head', { timeout: 10000 });
 
       // Find the AWS Credential
-      cy.get('[data-cy="asset_card', { timeout: 30000 }).contains('AWS Credential').should('be.visible').as('awsCred')
+      cy.get('div[class="tree-node"]', { timeout: 30000 }).contains('AWS Credential').should('be.visible').as('awsCred')
 
       // Find the canvas to get a location to drag to
       cy.get('canvas').first().as('konvaStage');

diff --git a/app/web/cypress/e2e/modelling-functionality/delete-component.cy.ts b/app/web/cypress/e2e/modelling-functionality/delete-component.cy.ts
@@ -22,7 +22,7 @@ Cypress._.times(import.meta.env.VITE_SI_CYPRESS_MULTIPLIER ? import.meta.env.VIT
       cy.url().should('not.include', 'head', { timeout: 10000 });
 
       // Find the AWS Credential
-      cy.get('[data-cy="asset_card', { timeout: 30000 }).contains('AWS Credential', { timeout: 30000 }).should('be.visible').as('awsCred')
+      cy.get('div[class="tree-node"]', { timeout: 30000 }).contains('AWS Credential').should('be.visible').as('awsCred')
 
       // Find the canvas to get a location to drag to
       cy.get('canvas').first().as('konvaStage');
@@ -37,7 +37,7 @@ Cypress._.times(import.meta.env.VITE_SI_CYPRESS_MULTIPLIER ? import.meta.env.VIT
         .rightclick();
 
       // Click the second dropdown menu item
-      cy.get('#dropdown-menu-item-2').click();
+      cy.get('[class="truncate"]').contains("Delete Frame").parent().parent().click();
 
       // Click the destroy button
       cy.get('button.vbutton.--variant-solid.--size-md.--tone-destructive')

diff --git a/app/web/src/api/sdf/dal/property_editor.ts b/app/web/src/api/sdf/dal/property_editor.ts
@@ -116,6 +116,7 @@ export interface PropertyEditorValue {
   overridden: boolean;
   controllingFuncId: string;
   controllingAttributeValueId: string;
+  ancestorManual: boolean;
   // TODO(Wendy) - we also need the default funcId and funcName for this prop to tell the user the default func that was overriden
 }
 

diff --git a/app/web/src/components/AttributesPanel/AttributesPanel.vue b/app/web/src/components/AttributesPanel/AttributesPanel.vue
@@ -350,4 +350,10 @@ provide(AttributesPanelContextInjectionKey, {
     z-index: 3;
   }
 }
+
+.picker_editor input {
+  body.dark & {
+    color: white;
+  }
+}
 </style>