diff --git a/.github/workflows/build-branch-cloud.yml b/.github/workflows/build-branch-cloud.yml index a68c7cdddd..830baaf07a 100644 --- a/.github/workflows/build-branch-cloud.yml +++ b/.github/workflows/build-branch-cloud.yml @@ -71,6 +71,7 @@ jobs: build_prerelease: ${{ steps.set_env_variables.outputs.BUILD_PRERELEASE }} release_version: ${{ steps.set_env_variables.outputs.RELEASE_VERSION }} vault_secrets: ${{ steps.get_vault_secrets.outputs.VAULT_SECRETS }} + build_args: ${{ steps.prepare_build_args.outputs.BUILD_ARGS }} steps: - id: set_env_variables name: Set Environment Variables @@ -152,6 +153,35 @@ jobs: VAULT_SECRETS=$(cat vault_secrets.json | base64 -w 0) echo "VAULT_SECRETS=${VAULT_SECRETS}" >> $GITHUB_OUTPUT + - name: Prepare Docker Build Args + id: prepare_build_args + if: ${{github.event.inputs.useVaultSecrets == 'true'}} + run: | + BUILD_ARGS="" + add_build_arg() { + if [ -n "$2" ]; then + BUILD_ARGS="$BUILD_ARGS $1=$2" + fi + } + add_build_arg "NEXT_PUBLIC_API_BASE_URL" "${{ env.NEXT_PUBLIC_API_BASE_URL }}" + add_build_arg "NEXT_PUBLIC_API_BASE_PATH" "${{ env.NEXT_PUBLIC_API_BASE_PATH }}" + + add_build_arg "NEXT_PUBLIC_ADMIN_BASE_URL" "${{ env.NEXT_PUBLIC_ADMIN_BASE_URL }}" + add_build_arg "NEXT_PUBLIC_ADMIN_BASE_PATH" "${{ env.NEXT_PUBLIC_ADMIN_BASE_PATH }}" + + add_build_arg "NEXT_PUBLIC_SPACE_BASE_URL" "${{ env.NEXT_PUBLIC_SPACE_BASE_URL }}" + add_build_arg "NEXT_PUBLIC_SPACE_BASE_PATH" "${{ env.NEXT_PUBLIC_SPACE_BASE_PATH }}" + + add_build_arg "NEXT_PUBLIC_LIVE_BASE_URL" "${{ env.NEXT_PUBLIC_LIVE_BASE_URL }}" + add_build_arg "NEXT_PUBLIC_LIVE_BASE_PATH" "${{ env.NEXT_PUBLIC_LIVE_BASE_PATH }}" + + add_build_arg "NEXT_PUBLIC_SILO_BASE_URL" "${{ env.NEXT_PUBLIC_SILO_BASE_URL }}" + add_build_arg "NEXT_PUBLIC_SILO_BASE_PATH" "${{ env.NEXT_PUBLIC_SILO_BASE_PATH }}" + + add_build_arg "NEXT_PUBLIC_WEB_BASE_URL" "${{ env.NEXT_PUBLIC_WEB_BASE_URL }}" + + echo "BUILD_ARGS=$BUILD_ARGS" >> $GITHUB_OUTPUT + - id: checkout_files name: Checkout Files uses: actions/checkout@v4 @@ -204,14 +234,10 @@ jobs: runs-on: ubuntu-20.04 needs: [branch_build_setup] steps: - - name: Load Vault Secrets - run: | - echo ${{ needs.branch_build_setup.outputs.vault_secrets }} | base64 -d > vault_secrets.json - jq -r 'to_entries|map("\(.key)=\(.value|tostring)")|.[]' vault_secrets.json >> $GITHUB_ENV - - id: checkout_files name: Checkout Files uses: actions/checkout@v4 + - name: Admin Build and Push uses: ./.github/actions/build-push-action with: @@ -234,14 +260,7 @@ jobs: buildx-version: ${{ needs.branch_build_setup.outputs.gh_buildx_version }} buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }} buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }} - build-args: | - NEXT_PUBLIC_WEB_BASE_URL=${{ env.NEXT_PUBLIC_WEB_BASE_URL }} - NEXT_PUBLIC_SPACE_BASE_URL=${{ env.NEXT_PUBLIC_SPACE_BASE_URL }} - NEXT_PUBLIC_ADMIN_BASE_URL=${{ env.NEXT_PUBLIC_ADMIN_BASE_URL }} - NEXT_PUBLIC_API_BASE_URL=${{ env.NEXT_PUBLIC_API_BASE_URL }} - NEXT_PUBLIC_ADMIN_BASE_PATH=${{ env.NEXT_PUBLIC_ADMIN_BASE_PATH }} - NEXT_PUBLIC_SPACE_BASE_PATH=${{ env.NEXT_PUBLIC_SPACE_BASE_PATH }} - NEXT_PUBLIC_API_BASE_PATH=${{ env.NEXT_PUBLIC_API_BASE_PATH }} + build-args: ${{ needs.branch_build_setup.outputs.build_args }} branch_build_push_web: if: ${{ needs.branch_build_setup.outputs.build_web == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }} @@ -277,16 +296,7 @@ jobs: buildx-version: ${{ needs.branch_build_setup.outputs.gh_buildx_version }} buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }} buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }} - build-args: | - NEXT_PUBLIC_WEB_BASE_URL=${{ env.NEXT_PUBLIC_WEB_BASE_URL }} - NEXT_PUBLIC_SPACE_BASE_URL=${{ env.NEXT_PUBLIC_SPACE_BASE_URL }} - NEXT_PUBLIC_ADMIN_BASE_URL=${{ env.NEXT_PUBLIC_ADMIN_BASE_URL }} - NEXT_PUBLIC_LIVE_BASE_URL=${{ env.NEXT_PUBLIC_LIVE_BASE_URL }} - NEXT_PUBLIC_API_BASE_URL=${{ env.NEXT_PUBLIC_API_BASE_URL }} - NEXT_PUBLIC_ADMIN_BASE_PATH=${{ env.NEXT_PUBLIC_ADMIN_BASE_PATH }} - NEXT_PUBLIC_SPACE_BASE_PATH=${{ env.NEXT_PUBLIC_SPACE_BASE_PATH }} - NEXT_PUBLIC_API_BASE_PATH=${{ env.NEXT_PUBLIC_API_BASE_PATH }} - NEXT_PUBLIC_LIVE_BASE_PATH=${{ env.NEXT_PUBLIC_LIVE_BASE_PATH }} + build-args: ${{ needs.branch_build_setup.outputs.build_args }} branch_build_push_space: if: ${{ needs.branch_build_setup.outputs.build_space == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }} @@ -322,14 +332,7 @@ jobs: buildx-version: ${{ needs.branch_build_setup.outputs.gh_buildx_version }} buildx-platforms: ${{ needs.branch_build_setup.outputs.gh_buildx_platforms }} buildx-endpoint: ${{ needs.branch_build_setup.outputs.gh_buildx_endpoint }} - build-args: | - NEXT_PUBLIC_WEB_BASE_URL=${{ env.NEXT_PUBLIC_WEB_BASE_URL }} - NEXT_PUBLIC_SPACE_BASE_URL=${{ env.NEXT_PUBLIC_SPACE_BASE_URL }} - NEXT_PUBLIC_ADMIN_BASE_URL=${{ env.NEXT_PUBLIC_ADMIN_BASE_URL }} - NEXT_PUBLIC_API_BASE_URL=${{ env.NEXT_PUBLIC_API_BASE_URL }} - NEXT_PUBLIC_ADMIN_BASE_PATH=${{ env.NEXT_PUBLIC_ADMIN_BASE_PATH }} - NEXT_PUBLIC_SPACE_BASE_PATH=${{ env.NEXT_PUBLIC_SPACE_BASE_PATH }} - NEXT_PUBLIC_API_BASE_PATH=${{ env.NEXT_PUBLIC_API_BASE_PATH }} + build-args: ${{ needs.branch_build_setup.outputs.build_args }} branch_build_push_live: if: ${{ needs.branch_build_setup.outputs.build_live == 'true' || github.event_name == 'workflow_dispatch' || needs.branch_build_setup.outputs.gh_branch_name == 'master' }} diff --git a/apiserver/plane/graphql/queries/dashboard.py b/apiserver/plane/graphql/queries/dashboard.py new file mode 100644 index 0000000000..85eb6b5abb --- /dev/null +++ b/apiserver/plane/graphql/queries/dashboard.py @@ -0,0 +1,36 @@ +from typing import Optional + +# Third-Party Imports +import strawberry +from asgiref.sync import sync_to_async + +# Strawberry Imports +from strawberry.types import Info +from strawberry.permission import PermissionExtension + + +# Module Imports +from plane.db.models import Workspace, Profile +from plane.graphql.types.dashboard import UserInformationType +from plane.graphql.permissions.workspace import IsAuthenticated + + +@strawberry.type +class userInformationQuery: + @strawberry.field( + extensions=[PermissionExtension(permissions=[IsAuthenticated()])] + ) + async def userInformation(self, info: Info) -> UserInformationType: + profile = await sync_to_async(Profile.objects.get)( + user=info.context.user + ) + + workspace_id = ( + profile.last_workspace_id if profile.last_workspace_id else None + ) + if workspace_id: + workspace = await sync_to_async(Workspace.objects.get)( + id=workspace_id + ) + + return UserInformationType(user=info.context.user, workspace=workspace) diff --git a/apiserver/plane/graphql/schema.py b/apiserver/plane/graphql/schema.py index 7085a9eccb..6236b9baca 100644 --- a/apiserver/plane/graphql/schema.py +++ b/apiserver/plane/graphql/schema.py @@ -46,6 +46,7 @@ from .queries.issues import ( IssuesSearchQuery, SubIssuesQuery, ) +from .queries.dashboard import userInformationQuery # mutations from .mutations.workspace import WorkspaceMutation, WorkspaceInviteMutation @@ -125,6 +126,7 @@ class Query( ModuleIssueUserPropertyQuery, IssueRelationQuery, IssuesSearchQuery, + userInformationQuery, ): pass diff --git a/apiserver/plane/graphql/types/dashboard.py b/apiserver/plane/graphql/types/dashboard.py new file mode 100644 index 0000000000..ebf21b86ac --- /dev/null +++ b/apiserver/plane/graphql/types/dashboard.py @@ -0,0 +1,12 @@ +# strawberry imports +import strawberry + +# module imports +from plane.graphql.types.users import UserType +from plane.graphql.types.workspace import WorkspaceType + + +@strawberry.type +class UserInformationType: + user: UserType + workspace: WorkspaceType diff --git a/packages/editor/src/core/extensions/custom-image/components/image-block.tsx b/packages/editor/src/core/extensions/custom-image/components/image-block.tsx index ed60f3dab0..35e7559683 100644 --- a/packages/editor/src/core/extensions/custom-image/components/image-block.tsx +++ b/packages/editor/src/core/extensions/custom-image/components/image-block.tsx @@ -62,7 +62,7 @@ export const CustomImageBlock: React.FC = (props) => { const [size, setSize] = useState({ width: ensurePixelString(width, "35%"), height: ensurePixelString(height, "auto"), - aspectRatio: aspectRatio || 1, + aspectRatio: aspectRatio || null, }); const [isResizing, setIsResizing] = useState(false); const [initialResizeComplete, setInitialResizeComplete] = useState(false); @@ -102,17 +102,17 @@ export const CustomImageBlock: React.FC = (props) => { } setEditorContainer(closestEditorContainer); - const aspectRatio = img.naturalWidth / img.naturalHeight; + const aspectRatioCalculated = img.naturalWidth / img.naturalHeight; if (width === "35%") { const editorWidth = closestEditorContainer.clientWidth; const initialWidth = Math.max(editorWidth * 0.35, MIN_SIZE); - const initialHeight = initialWidth / aspectRatio; + const initialHeight = initialWidth / aspectRatioCalculated; const initialComputedSize = { width: `${Math.round(initialWidth)}px` satisfies Pixel, height: `${Math.round(initialHeight)}px` satisfies Pixel, - aspectRatio: aspectRatio, + aspectRatio: aspectRatioCalculated, }; setSize(initialComputedSize); @@ -122,9 +122,10 @@ export const CustomImageBlock: React.FC = (props) => { ); } else { // as the aspect ratio in not stored for old images, we need to update the attrs - if (!aspectRatio) { + // or if aspectRatioCalculated from the image's width and height doesn't match stored aspectRatio then also we'll update the attrs + if (!aspectRatio || aspectRatio !== aspectRatioCalculated) { setSize((prevSize) => { - const newSize = { ...prevSize, aspectRatio }; + const newSize = { ...prevSize, aspectRatio: aspectRatioCalculated }; updateAttributesSafely( newSize, "Failed to update attributes while initializing images with width but no aspect ratio:" @@ -215,7 +216,7 @@ export const CustomImageBlock: React.FC = (props) => { onMouseDown={handleImageMouseDown} style={{ width: size.width, - aspectRatio: size.aspectRatio, + ...(size.aspectRatio && { aspectRatio: size.aspectRatio }), }} > {showImageLoader && ( @@ -241,7 +242,7 @@ export const CustomImageBlock: React.FC = (props) => { })} style={{ width: size.width, - aspectRatio: size.aspectRatio, + ...(size.aspectRatio && { aspectRatio: size.aspectRatio }), }} /> {showImageUtils && ( diff --git a/web/ee/components/workspace/activation-modal.tsx b/web/ee/components/workspace/activation-modal.tsx index e9696bace6..6f5f7b220b 100644 --- a/web/ee/components/workspace/activation-modal.tsx +++ b/web/ee/components/workspace/activation-modal.tsx @@ -61,7 +61,7 @@ export const SubscriptionActivationModal: FC = obs handleClose(); handleSuccessModalToggle(true); } catch { - setErrors("Your license is invalid or already in use. For any queries contact support@plane.so ."); + setErrors("Your license is invalid or already in use. For any queries contact support@plane.so"); } finally { setLoader(false); }