From 6d8ba9dfa3d6728bee21a52df6a364fd0d568cce Mon Sep 17 00:00:00 2001 From: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Date: Thu, 29 Aug 2024 15:13:17 +0530 Subject: [PATCH 1/2] chore: add migration on svg (#5464) --- .../migrations/0075_alter_fileasset_asset.py | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 apiserver/plane/db/migrations/0075_alter_fileasset_asset.py diff --git a/apiserver/plane/db/migrations/0075_alter_fileasset_asset.py b/apiserver/plane/db/migrations/0075_alter_fileasset_asset.py new file mode 100644 index 0000000000..2295ddaca9 --- /dev/null +++ b/apiserver/plane/db/migrations/0075_alter_fileasset_asset.py @@ -0,0 +1,28 @@ +# Generated by Django 4.2.11 on 2024-08-29 09:40 + +import django.core.validators +from django.db import migrations, models +import plane.db.models.asset + + +class Migration(migrations.Migration): + + dependencies = [ + ("db", "0074_deploy_board_and_project_issues"), + ] + + operations = [ + migrations.AlterField( + model_name="fileasset", + name="asset", + field=models.FileField( + upload_to=plane.db.models.asset.get_upload_path, + validators=[ + django.core.validators.FileExtensionValidator( + allowed_extensions=["jpg", "jpeg", "png"] + ), + plane.db.models.asset.file_size, + ], + ), + ), + ] From 459bf8fe6192658b3d8480ff8c3cf8007fbf57fc Mon Sep 17 00:00:00 2001 From: Prateek Shourya Date: Thu, 29 Aug 2024 15:14:25 +0530 Subject: [PATCH 2/2] chore: remove workspace activation tab. (#991) * chore: remove workspace activation tab. * fix: activation page logic. --- .../(projects)/settings/activation/page.tsx | 8 +++++--- web/ee/constants/workspace.ts | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/app/[workspaceSlug]/(projects)/settings/activation/page.tsx b/web/app/[workspaceSlug]/(projects)/settings/activation/page.tsx index fd030c267b..fd059db362 100644 --- a/web/app/[workspaceSlug]/(projects)/settings/activation/page.tsx +++ b/web/app/[workspaceSlug]/(projects)/settings/activation/page.tsx @@ -12,7 +12,7 @@ import { useUser, useWorkspace } from "@/hooks/store"; // plane web components import { SubscriptionActivation } from "@/plane-web/components/workspace"; // plane web hooks -import { useSelfHostedSubscription } from "@/plane-web/hooks/store"; +import { useSelfHostedSubscription, useWorkspaceSubscription } from "@/plane-web/hooks/store"; const ActivationPage = observer(() => { // router @@ -22,14 +22,16 @@ const ActivationPage = observer(() => { membership: { currentWorkspaceRole }, } = useUser(); const { currentWorkspace } = useWorkspace(); + const { currentWorkspaceSubscribedPlanDetail: currentWorkspaceSubscribedPlan } = useWorkspaceSubscription(); const { licenseActivationByWorkspaceSlug } = useSelfHostedSubscription(); // derived values const pageTitle = currentWorkspace?.name ? `${currentWorkspace.name} - Activation` : undefined; const isAdmin = currentWorkspaceRole === EUserWorkspaceRoles.ADMIN; + const isSelfManaged = !!currentWorkspaceSubscribedPlan?.is_self_managed; - if (!workspaceSlug || !currentWorkspace?.id) return <>; + if (!workspaceSlug || !currentWorkspace?.id || !isSelfManaged) return <>; - if (!isAdmin || licenseActivationByWorkspaceSlug()) + if (!isAdmin && licenseActivationByWorkspaceSlug()) return ( <> diff --git a/web/ee/constants/workspace.ts b/web/ee/constants/workspace.ts index ccd91844a8..0802b9f6c3 100644 --- a/web/ee/constants/workspace.ts +++ b/web/ee/constants/workspace.ts @@ -55,7 +55,7 @@ export const WORKSPACE_SETTINGS = { export const WORKSPACE_SETTINGS_LINKS = [ WORKSPACE_SETTINGS["general"], WORKSPACE_SETTINGS["members"], - WORKSPACE_SETTINGS["activation"], + // WORKSPACE_SETTINGS["activation"], // FIXME: Temporary hide this tab WORKSPACE_SETTINGS["project_states"], WORKSPACE_SETTINGS["billing-and-plans"], WORKSPACE_SETTINGS["integrations"],