Fix Build and Linting

torbenraab · Apr 8, 2024 · a8ab153 · a8ab153
1 parent bd3bf0e
commit a8ab153
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/build-branch.yml b/.github/workflows/build-branch.yml
@@ -195,7 +195,7 @@ jobs:
           if [ "${{ github.event_name }}" == "release" ]; then
             TAG=${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-arm64:stable,${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-arm64:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:latest
+            TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-arm64:latest
           else
             TAG=${{ env.FRONTEND_TAG }}
           fi
@@ -236,7 +236,7 @@ jobs:
     needs: [branch_build_setup, branch_build_frontend_amd64, branch_build_frontend_arm64]
     if: ${{ contains(needs.branch_build_setup.outputs.gh_buildx_platforms, 'linux/arm64') }}
     env:
-      FRONTEND_TAG: ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-arm64:${{ needs.branch_build_setup.outputs.gh_branch_name }}
+      FRONTEND_TAG: ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
       FRONTEND_TAG_AMD64: ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-amd64:${{ needs.branch_build_setup.outputs.gh_branch_name }}
       FRONTEND_TAG_ARM64: ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-arm64:${{ needs.branch_build_setup.outputs.gh_branch_name }}
       TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
@@ -261,7 +261,7 @@ jobs:
           if [ "${{ github.event_name }}" == "release" ]; then
             TAG=${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-amd64:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-amd64:stable
+            TAG=${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-amd64:latest
           else
             TAG=${{ env.FRONTEND_TAG_AMD64 }}
           fi
@@ -272,7 +272,7 @@ jobs:
           if [ "${{ github.event_name }}" == "release" ]; then
             TAG=${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-arm64:${{ github.event.release.tag_name }}
           elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
-            TAG=${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-arm64:stable
+            TAG=${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_REPO }}/plane-frontend-arm64:latest
           else
             TAG=${{ env.FRONTEND_TAG_ARM64 }}
           fi
@@ -296,6 +296,16 @@ jobs:
             ${{ env.FRONTEND_TAG_AMD64 }}
             ${{ env.FRONTEND_TAG_ARM64 }}
 
+      - name: Push Frontend to Docker Container Registry
+        uses: int128/docker-manifest-create-action@v2
+        if: ${{ github.event_name == 'release' }}
+        with:
+          tags: |
+            ${{ env.FRONTEND_TAG }}
+          sources: |
+            ${{ env.FRONTEND_TAG_AMD64 }}
+            ${{ env.FRONTEND_TAG_ARM64 }}
+
   branch_build_push_space:
     if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'release' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }}
     runs-on: ubuntu-20.04

diff --git a/apiserver/plane/app/views/oidc.py b/apiserver/plane/app/views/oidc.py
@@ -208,7 +208,7 @@ def post(self, request):
             data = get_user_data(access_token)
 
             email = data.get("email", None)
-            if email == None:
+            if email is None:
                 return Response(
                     {
                         "error": "Something went wrong. Please try again later or contact the support team. Email not found."

diff --git a/web/components/instance/oidc-config-form.tsx b/web/components/instance/oidc-config-form.tsx
@@ -1,13 +1,12 @@
 import { FC, useState } from "react";
+// hooks
+import { useApplication } from "hooks/store";
 import { Controller, useForm } from "react-hook-form";
 import { Copy, Eye, EyeOff } from "lucide-react";
 // types
 import { IFormattedInstanceConfiguration } from "@plane/types";
 // ui
 import { Button, Input, ToggleSwitch, TOAST_TYPE, setToast } from "@plane/ui";
-// hooks
-import { useApplication } from "hooks/store";
-
 export interface IInstanceOidcConfigForm {
   config: IFormattedInstanceConfiguration;
   updateConfig: (
@@ -199,7 +198,7 @@ export const InstanceOidcConfigForm: FC<IInstanceOidcConfigForm> = (props) => {
             variant="neutral-primary"
             className="flex items-center justify-between py-2"
             onClick={() => {
-              navigator.clipboard.writeText(originURL + "/*");
+              navigator.clipboard.writeText(originURL + "/");
               setToast({
                 message: "The Redirect URL has been successfully copied to your clipboard",
                 type: TOAST_TYPE.SUCCESS,