Merge branch 'develop' of github.com:Budibase/budibase into new-design-ui

.github/workflows/budibase_ci.yml

@@ -11,6 +11,7 @@ on:
     branches:
       - master
       - develop 
+ workflow_dispatch:
 
 env:
   BRANCH: ${{ github.event.pull_request.head.ref }}

.github/workflows/release-develop.yml

@@ -14,6 +14,7 @@ on:
       - 'yarn.lock'
       - 'package.json'
       - 'yarn.lock'
+ workflow_dispatch:
 
 env:
   POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
@@ -26,6 +27,11 @@ jobs:
     runs-on: ubuntu-latest 
 
     steps:
+      - name: Fail if branch is not develop
+        if: github.ref != 'refs/heads/develop' 
+        run: | 
+          echo "Ref is not develop, you must run this job from develop."
+          exit 1
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:

.github/workflows/release.yml

@@ -14,6 +14,7 @@ on:
       - 'yarn.lock'
       - 'package.json'
       - 'yarn.lock'
+ workflow_dispatch:
 
 env:
   POSTHOG_TOKEN: ${{ secrets.POSTHOG_TOKEN }}
@@ -27,6 +28,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Fail if branch is not master
+        if: github.ref != 'refs/heads/master' 
+        run: | 
+          echo "Ref is not master, you must run this job from master."
+          exit 1
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/backend-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.130-alpha.0",
+    "@budibase/string-templates": "^1.0.130-alpha.3",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",

packages/builder/cypress/integration/templates/HR/hrTemplateDetails.spec.js

@@ -0,0 +1,62 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify HR Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter HR Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="HR"]').click()
+      })
+    })
+
+  it("should verify the details option for HR templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+
+            if (templateNameText == "Job Application Tracker") {
+              // Template name should include 'applicant-tracking-system'
+              cy.get('a')
+              .should('have.attr', 'href').and('contain', 'applicant-tracking-system')
+            }
+            else if (templateNameText == "Job Portal App") {
+              // Template name should include 'job-portal'
+              const templateNameSplit = templateNameParsed.split('-app')[0]
+              cy.get('a')
+              .should('have.attr', 'href').and('contain', templateNameSplit)
+            }
+            else {
+              cy.get('a')
+              .should('have.attr', 'href').and('contain', templateNameParsed)
+            }
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/IT/ITTemplateDetails.spec.js

@@ -0,0 +1,66 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify IT Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter IT Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="IT"]').click()
+      })
+    })
+
+  it("should verify the details option for IT templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            
+            if (templateNameText == "Hashicorp Scorecard Template") {
+                const templateNameSplit = templateNameParsed.split('-template')[0]
+                cy.get('a')
+                .should('have.attr', 'href').and('contain', templateNameSplit)
+            }
+            else if (templateNameText == "IT Ticketing System") {
+                const templateNameSplit = templateNameParsed.split('it-')[1]
+                cy.get('a')
+                .should('have.attr', 'href').and('contain', templateNameSplit)
+            }
+            else if (templateNameText == "IT Incident Report Form") {
+                const templateNameSplit = templateNameParsed.split('-form')[0]
+                cy.get('a')
+                .should('have.attr', 'href').and('contain', templateNameSplit)
+            }
+            else {
+                cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+            }
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/adminPanels/adminPanelsTemplateDetails.spec.js

@@ -0,0 +1,48 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Admin Panel Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Admin Panels Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Admin Panels"]').click()
+      })
+    })
+
+  it("should verify the details option for Admin Panels templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/approvalApps/approvalAppsTemplateDetails.spec.js

@@ -0,0 +1,57 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Aproval Apps Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Approval Apps Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Approval Apps"]').click()
+      })
+    })
+
+  it("should verify the details option for Approval Apps templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            
+            if (templateNameText == "Content Approval System") {
+                // Template name should include 'content-approval'
+                const templateNameSplit = templateNameParsed.split('-system')[0]
+                cy.get('a')
+                .should('have.attr', 'href').and('contain', templateNameSplit)
+            }
+            else {
+                cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+            }
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/businessApps/businessAppsTemplateDetails.spec.js

@@ -0,0 +1,57 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Business Apps Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Business Apps Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Business Apps"]').click()
+      })
+    })
+
+  it("should verify the details option for Business Apps templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            
+            if (templateNameText == "Employee Check-in/Check-Out Template") {
+                // Remove / from template name
+                const templateNameReplace = templateNameParsed.replace(/\//g, "-")
+                cy.get('a')
+                .should('have.attr', 'href').and('contain', templateNameReplace)
+            }
+            else {
+                cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+            }
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/directories/directoriesTemplateDetails.spec.js

@@ -0,0 +1,50 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Directories Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Directories Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Directories"]').click()
+      })
+    })
+
+  it("should verify the details option for Directories templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            const templateNameSplit = templateNameParsed.split('-template')[0]
+            cy.get('a')
+            .should('have.attr', 'href').and('contain', templateNameSplit)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/forms/formsTemplateDetails.spec.js

@@ -0,0 +1,48 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Forms Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Forms Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Forms"]').click()
+      })
+    })
+
+  it("should verify the details option for Forms templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/healthcare/healthcareTemplateDetails.spec.js

@@ -0,0 +1,49 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Healthcare Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Healthcare Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Healthcare"]').click()
+      })
+    })
+
+  it("should verify the details option for Healthcare templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            
+            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/legal/legalTemplateDetails.spec.js

@@ -0,0 +1,48 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Legal Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Legal Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Legal"]').click()
+      })
+    })
+
+  it("should verify the details option for Legal templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/logistics/logisticsTemplateDetails.spec.js

@@ -0,0 +1,48 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Logistics Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Logistics Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Logistics"]').click()
+      })
+    })
+
+  it("should verify the details option for Logistics templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/manufacturing/manufacturingTemplateDetails.spec.js

@@ -0,0 +1,48 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Manufacturing Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Manufacturing Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Manufacturing"]').click()
+      })
+    })
+
+  it("should verify the details option for Manufacturing templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/marketing/marketingTemplateDetails.spec.js

@@ -0,0 +1,57 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Marketing Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Marketing Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Marketing"]').click()
+      })
+    })
+
+  it("should verify the details option for Marketing templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            
+            if (templateNameText == "Lead Generation Form") {
+                // Multi-step lead form
+                // Template name includes 'multi-step-lead-form'
+                cy.get('a')
+                .should('have.attr', 'href').and('contain', 'multi-step-lead-form')
+            }
+            else {
+                cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+            }
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/operations/operationsTemplateDetails.spec.js

@@ -0,0 +1,48 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Operations Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Operations Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Operations"]').click()
+      })
+    })
+
+  it("should verify the details option for Operations templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/portals/portalsTemplateDetails.spec.js

@@ -0,0 +1,77 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Portals Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+    })
+
+  it("should verify the details option for Portal templates", () => {
+    // Filter Portal Templates
+    cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Portal"]').click()
+      })
+    
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            cy.get('a')
+            .should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+
+  it("should verify the details option for Portals templates", () => {
+    // Filter Portals Templates
+    cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Portals"]').click()
+      })
+    
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            cy.get('a')
+            .should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/integration/templates/professionalServices/professionalServicesTemplateDetails.spec.js

@@ -0,0 +1,48 @@
+import filterTests from "../../../support/filterTests"
+
+filterTests(["all"], () => {
+  context("Verify Professional Services Template Details", () => {
+
+    before(() => {
+      cy.login()
+
+      // Template navigation
+      cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`)
+      .its("body")
+      .then(val => {
+        if (val.length > 0) {
+          cy.get(".spectrum-Button").contains("Templates").click({force: true})
+        }
+      })
+
+      // Filter Professional Services Templates
+      cy.get(".template-category-filters").within(() => {
+        cy.get('[data-cy="Professional Services"]').click()
+      })
+    })
+
+  it("should verify the details option for Professional Services templates", () => {
+    cy.get(".template-grid").find(".template-card").its('length')
+    .then(len => {
+        // Verify template name is within details link
+      for (let i = 0; i < len; i++) {
+        cy.get(".template-card").eq(i).within(() => {
+          const templateName = cy.get(".template-thumbnail-text")
+          templateName.invoke('text')
+          .then(templateNameText => {
+            const templateNameParsed = templateNameText.toLowerCase().replace(/\s+/g, '-')
+            cy.get('a').should('have.attr', 'href').and('contain', templateNameParsed)
+          })
+          // Verify correct status from Details link - 200
+          cy.get('a')
+          .then(link => {
+            cy.request(link.prop('href'))
+            .its('status')
+            .should('eq', 200)
+          })
+        })
+      }
+    })
+  })
+})
+})

packages/builder/cypress/support/commands.js

@@ -77,28 +77,24 @@ Cypress.Commands.add("deleteApp", name => {
         if (val.length > 0) {
           if (Cypress.env("TEST_ENV")) {
             cy.searchForApplication(name)
-            cy.get(".appTable").within(() => {
+          }
-              cy.get(".spectrum-Icon").eq(1).click()
+          const appId = val.reduce((acc, app) => {
-            })
+            if (name === app.name) {
-          } else {
+              acc = app.appId
-            const appId = val.reduce((acc, app) => {
-              if (name === app.name) {
-                acc = app.appId
-              }
-              return acc
-            }, "")
-
-            if (appId == "") {
-              return
             }
+            return acc
+          }, "")
 
-            const appIdParsed = appId.split("_").pop()
+          if (appId == "") {
-            const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
+            return
-            cy.get(actionEleId).within(() => {
-              cy.get(".spectrum-Icon").eq(0).click()
-            })
           }
 
+          const appIdParsed = appId.split("_").pop()
+          const actionEleId = `[data-cy=row_actions_${appIdParsed}]`
+          cy.get(actionEleId).within(() => {
+            cy.get(".spectrum-Icon").eq(0).click()
+          })
+
           cy.get(".spectrum-Menu").then($menu => {
             if ($menu.text().includes("Unpublish")) {
               cy.get(".spectrum-Menu").contains("Unpublish").click()

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.130-alpha.0",
+    "@budibase/bbui": "^1.0.130-alpha.3",
-    "@budibase/client": "^1.0.130-alpha.0",
+    "@budibase/client": "^1.0.130-alpha.3",
-    "@budibase/frontend-core": "^1.0.130-alpha.0",
+    "@budibase/frontend-core": "^1.0.130-alpha.3",
-    "@budibase/string-templates": "^1.0.130-alpha.0",
+    "@budibase/string-templates": "^1.0.130-alpha.3",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.130-alpha.0",
+    "@budibase/bbui": "^1.0.130-alpha.3",
-    "@budibase/frontend-core": "^1.0.130-alpha.0",
+    "@budibase/frontend-core": "^1.0.130-alpha.3",
-    "@budibase/string-templates": "^1.0.130-alpha.0",
+    "@budibase/string-templates": "^1.0.130-alpha.3",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",

packages/frontend-core/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.130-alpha.0",
+    "@budibase/bbui": "^1.0.130-alpha.3",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -68,10 +68,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.130-alpha.0",
+    "@budibase/backend-core": "^1.0.130-alpha.3",
-    "@budibase/client": "^1.0.130-alpha.0",
+    "@budibase/client": "^1.0.130-alpha.3",
-    "@budibase/pro": "1.0.130-alpha.0",
+    "@budibase/pro": "1.0.130-alpha.3",
-    "@budibase/string-templates": "^1.0.130-alpha.0",
+    "@budibase/string-templates": "^1.0.130-alpha.3",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",

packages/server/yarn.lock

@@ -1014,10 +1014,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.130-alpha.0":
+"@budibase/backend-core@1.0.130-alpha.3":
-  version "1.0.130-alpha.0"
+  version "1.0.130-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.130-alpha.0.tgz#f6da46473f52d3e513a5eb7f352ae3bde6e61b78"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.130-alpha.3.tgz#1e51fb22fc9e6a6db1b588f6111bcf372047797c"
-  integrity sha512-DPuqEN8/OHFWPpUcfofjQ33lijsAKGDKc0DEF0QgLJOp2kMtBJa80tGjzTxccCZaFkCC2P5p+8kkMxKZQ6vYdA==
+  integrity sha512-R9RCmZPoJR+vFRiW5XYBWzImMdhsIRPGI7MJHmigb1/TMB1bKaPDFvjnU5rDQ5Qv6NZ1E81FGmMWvDYOzouV5w==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -1091,12 +1091,12 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.0.130-alpha.0":
+"@budibase/pro@1.0.130-alpha.3":
-  version "1.0.130-alpha.0"
+  version "1.0.130-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.130-alpha.0.tgz#ddae5dc39992d7f1c4f021d1e4f5effff687a183"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.130-alpha.3.tgz#3311901846b761aa8e57980f8bd1baf36c9d9eb9"
-  integrity sha512-R8DvPQ6hpLChOSp0BONwrCHOgYrYDO4r2tF8KzEg4uycZ+jbaKQJs2lZ8wdkCbXGjAHIcRNt+4RKUfa9r2epJw==
+  integrity sha512-3QydQ0PGOrC8ho6cvaBFf/xm50+ygFYyy2P0fNj860+khid66lrrr5AGSozqtFCPGCz4vWn0J1irjDBhYSUHlw==
   dependencies:
-    "@budibase/backend-core" "1.0.130-alpha.0"
+    "@budibase/backend-core" "1.0.130-alpha.3"
     node-fetch "^2.6.1"
 
 "@budibase/standard-components@^0.9.139":

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.130-alpha.0",
+  "version": "1.0.130-alpha.3",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.130-alpha.0",
+    "@budibase/backend-core": "^1.0.130-alpha.3",
-    "@budibase/pro": "1.0.130-alpha.0",
+    "@budibase/pro": "1.0.130-alpha.3",
-    "@budibase/string-templates": "^1.0.130-alpha.0",
+    "@budibase/string-templates": "^1.0.130-alpha.3",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",

packages/worker/yarn.lock

@@ -293,10 +293,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.0.130-alpha.0":
+"@budibase/backend-core@1.0.130-alpha.3":
-  version "1.0.130-alpha.0"
+  version "1.0.130-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.130-alpha.0.tgz#f6da46473f52d3e513a5eb7f352ae3bde6e61b78"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.130-alpha.3.tgz#1e51fb22fc9e6a6db1b588f6111bcf372047797c"
-  integrity sha512-DPuqEN8/OHFWPpUcfofjQ33lijsAKGDKc0DEF0QgLJOp2kMtBJa80tGjzTxccCZaFkCC2P5p+8kkMxKZQ6vYdA==
+  integrity sha512-R9RCmZPoJR+vFRiW5XYBWzImMdhsIRPGI7MJHmigb1/TMB1bKaPDFvjnU5rDQ5Qv6NZ1E81FGmMWvDYOzouV5w==
   dependencies:
     "@techpass/passport-openidconnect" "^0.3.0"
     aws-sdk "^2.901.0"
@@ -321,12 +321,12 @@
     uuid "^8.3.2"
     zlib "^1.0.5"
 
-"@budibase/pro@1.0.130-alpha.0":
+"@budibase/pro@1.0.130-alpha.3":
-  version "1.0.130-alpha.0"
+  version "1.0.130-alpha.3"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.130-alpha.0.tgz#ddae5dc39992d7f1c4f021d1e4f5effff687a183"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.130-alpha.3.tgz#3311901846b761aa8e57980f8bd1baf36c9d9eb9"
-  integrity sha512-R8DvPQ6hpLChOSp0BONwrCHOgYrYDO4r2tF8KzEg4uycZ+jbaKQJs2lZ8wdkCbXGjAHIcRNt+4RKUfa9r2epJw==
+  integrity sha512-3QydQ0PGOrC8ho6cvaBFf/xm50+ygFYyy2P0fNj860+khid66lrrr5AGSozqtFCPGCz4vWn0J1irjDBhYSUHlw==
   dependencies:
-    "@budibase/backend-core" "1.0.130-alpha.0"
+    "@budibase/backend-core" "1.0.130-alpha.3"
     node-fetch "^2.6.1"
 
 "@cspotcode/source-map-consumer@0.8.0":