From 98e530c605d19fed84697ee4ed9fa3f964016752 Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Fri, 13 Sep 2024 14:04:27 +0530 Subject: [PATCH 1/4] fix: removing node engine settings --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index fe74d6bbe4..e4444025db 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,5 @@ "resolutions": { "@types/react": "18.2.48" }, - "engines": { - "node": "18.x" - }, "packageManager": "yarn@1.22.22" } From 82e9a83772a532694180950e18620001e5bf13f5 Mon Sep 17 00:00:00 2001 From: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:11:38 +0530 Subject: [PATCH 2/4] fix: issue type text deletion (#1120) --- .../ee/utils/issue_property_validators.py | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/apiserver/plane/ee/utils/issue_property_validators.py b/apiserver/plane/ee/utils/issue_property_validators.py index 6fec40cfa4..567f3e08de 100644 --- a/apiserver/plane/ee/utils/issue_property_validators.py +++ b/apiserver/plane/ee/utils/issue_property_validators.py @@ -116,9 +116,20 @@ def validate_file(issue_property, value): def save_text( issue_property, values, existing_values, issue_id, project_id, workspace_id ): + if values: + # Case 1 - The property is updated + if existing_values and values[0] != existing_values[0]: + return [ + IssuePropertyValue( + property=issue_property, + value_text=values[0], + issue_id=issue_id, + project_id=project_id, + workspace_id=workspace_id, + ) + ] - # Case 1 - The property is updated - if existing_values and values[0] != existing_values[0]: + # Case 2 - The property is created return [ IssuePropertyValue( property=issue_property, @@ -126,19 +137,11 @@ def save_text( issue_id=issue_id, project_id=project_id, workspace_id=workspace_id, - ) + ), ] - - # Case 2 - The property is created - return [ - IssuePropertyValue( - property=issue_property, - value_text=values[0], - issue_id=issue_id, - project_id=project_id, - workspace_id=workspace_id, - ), - ] + else: + # Case 3 - The property is deleted + return [] def save_datetime( From 485caaf2ec03b3aad055265a352c76070dcd47de Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:28:03 +0530 Subject: [PATCH 3/4] [WEB-2443] fix: project member validation (#5601) * fix: project member validation * fix: project member validation --- web/core/components/project/settings/member-columns.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/core/components/project/settings/member-columns.tsx b/web/core/components/project/settings/member-columns.tsx index 118311b73b..dae1253238 100644 --- a/web/core/components/project/settings/member-columns.tsx +++ b/web/core/components/project/settings/member-columns.tsx @@ -97,17 +97,17 @@ export const AccountTypeColumn: React.FC = observer((props) => // derived values const isCurrentUser = currentUser?.id === rowData.member.id; - const isAdminRole = currentProjectRole === EUserPermissions.ADMIN; - const isRoleNonEditable = isCurrentUser || !isAdminRole; + const isAdminOrGuest = [EUserPermissions.ADMIN, EUserPermissions.GUEST].includes(rowData.role); + const isRoleNonEditable = isCurrentUser || isAdminOrGuest; const checkCurrentOptionWorkspaceRole = (value: string) => { const currentMemberWorkspaceRole = getWorkspaceMemberDetails(value)?.role as EUserPermissions | undefined; if (!value || !currentMemberWorkspaceRole) return ROLE; - const isGuestOrViewer = [EUserPermissions.GUEST].includes(currentMemberWorkspaceRole); + const isGuestOROwner = [EUserPermissions.ADMIN, EUserPermissions.GUEST].includes(currentMemberWorkspaceRole); return Object.fromEntries( - Object.entries(ROLE).filter(([key]) => !isGuestOrViewer || [5, 10].includes(parseInt(key))) + Object.entries(ROLE).filter(([key]) => !isGuestOROwner || [currentMemberWorkspaceRole].includes(parseInt(key))) ); }; From db185735bd09e8adb9d1f6088c27e5cd3201560f Mon Sep 17 00:00:00 2001 From: Plane Bot <146718762+plane-bot@users.noreply.github.com> Date: Fri, 13 Sep 2024 19:02:39 +0530 Subject: [PATCH 4/4] fix: adding new session cookie name (#1123) Co-authored-by: sriram veeraghanta --- apiserver/plane/settings/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apiserver/plane/settings/common.py b/apiserver/plane/settings/common.py index ae96648c53..6934402dba 100644 --- a/apiserver/plane/settings/common.py +++ b/apiserver/plane/settings/common.py @@ -348,7 +348,7 @@ SESSION_COOKIE_SECURE = secure_origins SESSION_COOKIE_HTTPONLY = True SESSION_ENGINE = "plane.db.models.session" SESSION_COOKIE_AGE = os.environ.get("SESSION_COOKIE_AGE", 604800) -SESSION_COOKIE_NAME = "plane-session-id" +SESSION_COOKIE_NAME = os.environ.get("SESSION_COOKIE_NAME", "session-id") SESSION_COOKIE_DOMAIN = os.environ.get("COOKIE_DOMAIN", None) SESSION_SAVE_EVERY_REQUEST = ( os.environ.get("SESSION_SAVE_EVERY_REQUEST", "0") == "1" @@ -363,7 +363,7 @@ else: # Admin Cookie -ADMIN_SESSION_COOKIE_NAME = "plane-admin-session-id" +ADMIN_SESSION_COOKIE_NAME = "admin-session-id" ADMIN_SESSION_COOKIE_AGE = os.environ.get("ADMIN_SESSION_COOKIE_AGE", 3600) # CSRF cookies