Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

minor improvements for workspace management (#6099)

Prateek Shourya712339a6381d
diff --git a/admin/core/components/workspace/list-item.tsx b/admin/core/components/workspace/list-item.tsx
index 9289140f7d..691e9dbb6c 100644
--- a/admin/core/components/workspace/list-item.tsx
+++ b/admin/core/components/workspace/list-item.tsx
@@ -22,7 +22,7 @@ export const WorkspaceListItem = observer(({ workspaceId }: TWorkspaceListItemPr
return (
<Link
key={workspaceId}
- href={encodeURI(WEB_BASE_URL + "/" + workspace.slug)}
+ href={`${WEB_BASE_URL}/${encodeURIComponent(workspace.slug)}`}
target="_blank"
className="group flex items-center justify-between p-4 gap-2.5 truncate border border-custom-border-200/70 hover:border-custom-border-200 hover:bg-custom-background-90 rounded-md"
>
diff --git a/admin/core/services/workspace.service.ts b/admin/core/services/workspace.service.ts
index 1de24fd9b0..81ba36a6f7 100644
--- a/admin/core/services/workspace.service.ts
+++ b/admin/core/services/workspace.service.ts
@@ -30,7 +30,8 @@ export class WorkspaceService extends APIService {
* @returns Promise<any>
*/
async workspaceSlugCheck(slug: string): Promise<any> {
- return this.get(`/api/instances/workspace-slug-check/?slug=${slug}`)
+ const params = new URLSearchParams({ slug });
+ return this.get(`/api/instances/workspace-slug-check/?${params.toString()}`)
.then((response) => response?.data)
.catch((error) => {
throw error?.response?.data;
diff --git a/admin/core/store/workspace.store.ts b/admin/core/store/workspace.store.ts
index dafe96760b..f892e14f0c 100644
--- a/admin/core/store/workspace.store.ts
+++ b/admin/core/store/workspace.store.ts
@@ -14,7 +14,7 @@ export interface IWorkspaceStore {
// computed
workspaceIds: string[];
// helper actions
- hydrate: (data: any) => void;
+ hydrate: (data: Record<string, IWorkspace>) => void;
getWorkspaceById: (workspaceId: string) => IWorkspace | undefined;
// fetch actions
fetchWorkspaces: () => Promise<IWorkspace[]>;
@@ -59,9 +59,9 @@ export class WorkspaceStore implements IWorkspaceStore {
// helper actions
/**
* @description Hydrates the workspaces
- * @param data - any
+ * @param data - Record<string, IWorkspace>
*/
- hydrate = (data: any) => {
+ hydrate = (data: Record<string, IWorkspace>) => {
if (data) this.workspaces = data;
};
diff --git a/apiserver/plane/license/api/serializers/workspace.py b/apiserver/plane/license/api/serializers/workspace.py
index 1d3bfa8905..75dd938e45 100644
--- a/apiserver/plane/license/api/serializers/workspace.py
+++ b/apiserver/plane/license/api/serializers/workspace.py
@@ -18,6 +18,9 @@ class WorkspaceSerializer(BaseSerializer):
# Check if the slug is restricted
if value in RESTRICTED_WORKSPACE_SLUGS:
raise serializers.ValidationError("Slug is not valid")
+ # Check uniqueness case-insensitively
+ if Workspace.objects.filter(slug__iexact=value).exists():
+ raise serializers.ValidationError("Slug is already in use")
return value
class Meta:
diff --git a/apiserver/plane/license/api/views/workspace.py b/apiserver/plane/license/api/views/workspace.py
index af9e8773ad..14118d85bc 100644
--- a/apiserver/plane/license/api/views/workspace.py
+++ b/apiserver/plane/license/api/views/workspace.py
@@ -25,7 +25,7 @@ class InstanceWorkSpaceAvailabilityCheckEndpoint(BaseAPIView):
)
workspace = (
- Workspace.objects.filter(slug=slug).exists()
+ Workspace.objects.filter(slug__iexact=slug).exists()
or slug in RESTRICTED_WORKSPACE_SLUGS
)
return Response({"status": not workspace}, status=status.HTTP_200_OK)
diff --git a/packages/ui/src/icons/workspace-icon.tsx b/packages/ui/src/icons/workspace-icon.tsx
index 07872b264c..e15d33f30b 100644
--- a/packages/ui/src/icons/workspace-icon.tsx
+++ b/packages/ui/src/icons/workspace-icon.tsx
@@ -3,7 +3,14 @@ import * as React from "react";
import { ISvgIcons } from "./type";
export const WorkspaceIcon: React.FC<ISvgIcons> = ({ className }) => (
- <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
+ <svg
+ viewBox="0 0 24 24"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+ className={className}
+ role="img"
+ aria-label="Workspace icon"
+ >
<path
fillRule="evenodd"
clipRule="evenodd"