Merge branch 'dev' into blokh/feat/workflow-validation

ballerine-io · Nov 27, 2023 · b53b5d6 · b53b5d6
2 parents d5cca1e + e5eba6e
commit b53b5d6
Show file tree

Hide file tree

Showing 57 changed files with 1,492 additions and 884 deletions.
diff --git a/.github/workflows/publish-workflows-service.yml b/.github/workflows/publish-workflows-service.yml
@@ -17,6 +17,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository_owner }}/workflows-service
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
   build-and-push-image:
@@ -32,7 +33,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Install jq
+      - name: Install JQ
         run: sudo apt-get install jq
 
       - name: Set up Docker Buildx
@@ -66,9 +67,9 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=${{ github.head_ref || github.ref_name }}
-            type=raw,value=commit-${{ github.sha }}-${{ github.head_ref || github.ref_name }}
-            type=raw,value=${{ steps.get_version.outputs.version }}-${{ github.head_ref || github.ref_name }}
+            type=raw,value=${{ env.BRANCH_NAME }}
+            type=raw,value=commit-${{ github.sha }}-${{ env.BRANCH_NAME }}
+            type=raw,value=${{ steps.get_version.outputs.version }}-${{ env.BRANCH_NAME }}
 
       - name: Extract metadata (tags, labels) for prod Docker images
         if: github.ref == 'refs/heads/prod'
@@ -90,7 +91,7 @@ jobs:
           context: services/workflows-service
           platforms: ${{ matrix.platform }}
           push: true
-          cache-from: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.head_ref || github.ref_name }}'
+          cache-from: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BRANCH_NAME }}'
           tags: ${{ steps.prodmeta.outputs.tags }}
 
       - name: Build and push Docker image for non Prod
@@ -100,13 +101,14 @@ jobs:
           context: services/workflows-service
           platforms: ${{ matrix.platform }}
           push: true
-          cache-from: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.head_ref || github.ref_name }}'
+          cache-from: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BRANCH_NAME }}'
           tags: ${{ steps.branchmeta.outputs.tags }}
 
       - name: Scan Docker Image
+        if: "!contains(env.BRANCH_NAME, '/')"
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.head_ref || github.ref_name }}'
+          image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BRANCH_NAME }}'
           format: 'table'
           ignore-unfixed: true
           exit-code: 1

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "services/workflows-service/prisma/data-migrations"]
+	path = services/workflows-service/prisma/data-migrations
+	url = git@github.com:ballerine-io/wf-data-migration.git
+
diff --git a/apps/backoffice-v2/src/common/components/atoms/BallerineImage/BallerineImage.tsx b/apps/backoffice-v2/src/common/components/atoms/BallerineImage/BallerineImage.tsx
@@ -68,7 +68,7 @@ export const BallerineImage = forwardRef<HTMLImageElement, IBallerineImageProps>
         src={src}
         className={ctw(
           // Ensures the alt text doesn't overflow
-          `break-words rounded-md object-cover object-center`,
+          `break-words rounded-md object-fill object-center`,
           className,
         )}
         ref={ref}

diff --git a/apps/backoffice-v2/src/common/components/organisms/ImageViewer/ImageViewer.Item.tsx b/apps/backoffice-v2/src/common/components/organisms/ImageViewer/ImageViewer.Item.tsx
@@ -55,6 +55,7 @@ export const Item: FunctionComponent<IItemProps> = ({
             src={src}
             className={ctw(
               `
+            object-cover
             group-hover:outline
             group-focus:outline
             group-hover:outline-2

diff --git a/apps/backoffice-v2/src/domains/auth/validation-schemas.ts b/apps/backoffice-v2/src/domains/auth/validation-schemas.ts
@@ -14,5 +14,5 @@ export const AuthenticatedUserSchema = z
     lastName,
     fullName: `${firstName} ${lastName}`,
   }))
-  // @ts-expect-error - null is desired here.
+  .or(z.null())
   .default(null);