Merge branch 'main' into include-instance-url-env-var

Author: hardillb

frontend/src/pages/admin/Templates/index.vue

@@ -94,10 +94,11 @@ export default {
             this.nextCursor = result.meta.next_cursor
             result.templates.forEach(v => {
                 // map owner to top tier to show in table
-                v.owner_avatar = v.owner.avatar
-                v.owner_id = v.owner.id
-                v.owner_username = v.owner.username
-
+                if (v.owner) {
+                    v.owner_avatar = v.owner.avatar
+                    v.owner_id = v.owner.id
+                    v.owner_username = v.owner.username
+                }
                 this.templates.push(v)
             })
             this.loading = false

package-lock.json

@@ -2800,9 +2800,10 @@ describe('Project API', function () {
             response.statusCode.should.eqls(200)
 
             const json = response.json()
-            json.settings.env[5].should.have.property('name', 'hidden_var')
-            json.settings.env[5].should.have.property('value', '')
-            json.settings.env[5].should.have.property('hidden', true)
+            const hiddenVar = json.settings.env.find(envVar => envVar.name === 'hidden_var')
+            should.exist(hiddenVar)
+            hiddenVar.should.have.property('value', '')
+            hiddenVar.should.have.property('hidden', true)
         })
         it('should store hidden env vars', async () => {
             const projectSettings = await TestObjects.project1.getSetting('settings')
@@ -2823,9 +2824,10 @@ describe('Project API', function () {
             })
             const json = response.json()
 
-            json.settings.env[5].should.have.property('name', 'hidden_var')
-            json.settings.env[5].should.have.property('value', '')
-            json.settings.env[5].should.have.property('hidden', true)
+            const hiddenVar = json.settings.env.find(envVar => envVar.name === 'hidden_var')
+            should.exist(hiddenVar)
+            hiddenVar.should.have.property('value', '')
+            hiddenVar.should.have.property('hidden', true)
 
             const updatedProjectSettings = await TestObjects.project1.getSetting('settings')
             updatedProjectSettings.env[0].should.have.property('name', 'hidden_var')