Merge remote-tracking branch 'origin/v3-ui' into feature/automation-branching-ux

.github/workflows/deploy-featurebranch.yml

@@ -23,7 +23,6 @@ jobs:
           PAYLOAD_BRANCH: ${{ github.head_ref }}
           PAYLOAD_PR_NUMBER: ${{ github.event.pull_request.number }}
           PAYLOAD_LICENSE_TYPE: "free"
-          PAYLOAD_DEPLOY: true
         with:
           repository: budibase/budibase-deploys
           event: featurebranch-qa-deploy

packages/server/src/api/controllers/view/viewsV2.ts

@@ -133,6 +133,7 @@ export async function create(ctx: Ctx<CreateViewRequest, ViewResponse>) {
     sort: view.sort,
     schema,
     primaryDisplay: view.primaryDisplay,
+    uiMetadata: view.uiMetadata,
   }
   const result = await sdk.views.create(tableId, parsedView)
   ctx.status = 201
@@ -169,6 +170,7 @@ export async function update(ctx: Ctx<UpdateViewRequest, ViewResponse>) {
     sort: view.sort,
     schema,
     primaryDisplay: view.primaryDisplay,
+    uiMetadata: view.uiMetadata,
   }
 
   const result = await sdk.views.update(tableId, parsedView)

packages/server/src/api/routes/tests/viewV2.spec.ts

@@ -177,6 +177,9 @@ describe.each([
               visible: true,
             },
           },
+          uiMetadata: {
+            foo: "bar",
+          },
         }
         const res = await config.api.viewV2.create(newView)
 
@@ -640,6 +643,9 @@ describe.each([
               readonly: true,
             },
           },
+          uiMetadata: {
+            foo: "bar",
+          },
         }
         await config.api.viewV2.update(updatedData)
 

packages/types/src/documents/app/view.ts

@@ -94,6 +94,7 @@ export interface ViewV2 {
     type?: SortType
   }
   schema?: ViewV2Schema
+  uiMetadata?: Record<string, any>
 }
 
 export type ViewV2Schema = Record<string, ViewFieldMetadata>