feat: give workspace owners global space management permission

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.23.1",
+  "version": "0.23.2",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

apps/client/src/features/space/components/space-list.tsx

@@ -8,11 +8,20 @@ import { useTranslation } from "react-i18next";
 import Paginate from "@/components/common/paginate.tsx";
 import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
 import { AvatarIconType } from "@/features/attachments/types/attachment.types.ts";
+import { useAtom } from "jotai";
+import { userAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { UserRole } from "@/lib/types.ts";
+import { useIsEEOnly } from "@/hooks/use-is-cloud-ee.tsx";
 
 export default function SpaceList() {
   const { t } = useTranslation();
   const [page, setPage] = useState(1);
-  const { data, isLoading } = useGetSpacesQuery({ page });
+  const [user] = useAtom(userAtom);
+  const isEEOnly = useIsEEOnly();
+  const { data, isLoading } = useGetSpacesQuery({
+    page,
+    ...(isEEOnly && user.role === UserRole.OWNER && { includeAllSpaces: true }),
+  });
   const [opened, { open, close }] = useDisclosure(false);
   const [selectedSpaceId, setSelectedSpaceId] = useState<string>(null);
 

apps/client/src/features/space/queries/space-query.ts

@@ -152,13 +152,36 @@ export function useDeleteSpaceMutation() {
         });
       }
 
-      const spaces = queryClient.getQueryData(["spaces"]) as any;
+      // Remove space-specific queries
+      if (variables.id) {
+        queryClient.removeQueries({
+          queryKey: ["space", variables.id],
+          exact: true,
+        });
+
+        // Invalidate recent changes
+        queryClient.invalidateQueries({
+          queryKey: ["recent-changes"],
+        });
+
+        queryClient.invalidateQueries({
+          queryKey: ["recent-changes", variables.id],
+        });
+      }
+
+      // Update spaces list cache
+      /* const spaces = queryClient.getQueryData(["spaces"]) as any;
       if (spaces) {
         spaces.items = spaces.items?.filter(
           (space: ISpace) => space.id !== variables.id,
         );
         queryClient.setQueryData(["spaces"], spaces);
-      }
+      }*/
+
+      // Invalidate all spaces queries to refresh lists
+      queryClient.invalidateQueries({
+        predicate: (item) => ["spaces"].includes(item.queryKey[0] as string),
+      });
     },
     onError: (error) => {
       const errorMessage = error["response"]?.data?.message;

apps/client/src/hooks/use-is-cloud-ee.tsx

@@ -1,7 +1,16 @@
 import { isCloud } from "@/lib/config";
 import { useLicense } from "@/ee/hooks/use-license";
+import { useAtom } from "jotai/index";
+import { currentUserAtom } from "@/features/user/atoms/current-user-atom.ts";
+import usePlan from "@/ee/hooks/use-plan";
 
 export const useIsCloudEE = () => {
   const { hasLicenseKey } = useLicense();
   return isCloud() || !!hasLicenseKey;
-}; 
+};
+
+export const useIsEEOnly = () => {
+  const { hasLicenseKey } = useLicense();
+  const { isBusiness } = usePlan();
+  return (isCloud() && isBusiness) || !!hasLicenseKey;
+};

apps/client/src/lib/types.ts

@@ -2,6 +2,7 @@ export interface QueryParams {
   query?: string;
   page?: number;
   limit?: number;
+  includeAllSpaces?: boolean;
 }
 
 export enum UserRole {

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.23.1",
+  "version": "0.23.2",
   "description": "",
   "author": "",
   "private": true,

apps/server/src/collaboration/extensions/authentication.extension.ts

@@ -10,7 +10,7 @@ import { UserRepo } from '@docmost/db/repos/user/user.repo';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
 import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 import { findHighestUserSpaceRole } from '@docmost/db/repos/space/utils';
-import { SpaceRole } from '../../common/helpers/types/permission';
+import { SpaceRole, UserRole } from '../../common/helpers/types/permission';
 import { getPageId } from '../collaboration.util';
 import { JwtCollabPayload, JwtType } from '../../core/auth/dto/jwt-payload';
 
@@ -63,7 +63,10 @@ export class AuthenticationExtension implements Extension {
 
     const userSpaceRole = findHighestUserSpaceRole(userSpaceRoles);
 
-    if (!userSpaceRole) {
+    // if role not found but user is a workspace owner, grant them readonly permission
+    if (!userSpaceRole && user.role === UserRole.OWNER) {
+      data.connection.readOnly = true;
+    } else if (!userSpaceRole) {
       this.logger.warn(`User not authorized to access page: ${pageId}`);
       throw new UnauthorizedException();
     }

apps/server/src/core/casl/abilities/space-ability.factory.ts

@@ -4,7 +4,7 @@ import {
   createMongoAbility,
   MongoAbility,
 } from '@casl/ability';
-import { SpaceRole } from '../../../common/helpers/types/permission';
+import { SpaceRole, UserRole } from '../../../common/helpers/types/permission';
 import { User } from '@docmost/db/types/entity.types';
 import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 import {
@@ -25,13 +25,17 @@ export default class SpaceAbilityFactory {
 
     const userSpaceRole = findHighestUserSpaceRole(userSpaceRoles);
 
+    if (!userSpaceRole && user.role === UserRole.OWNER) {
+      return buildWorkspaceOwnerAbility();
+    }
+
     switch (userSpaceRole) {
       case SpaceRole.ADMIN:
         return buildSpaceAdminAbility();
       case SpaceRole.WRITER:
-        return buildSpaceWriterAbility();
+        return buildSpaceWriterAbility(user.role);
       case SpaceRole.READER:
-        return buildSpaceReaderAbility();
+        return buildSpaceReaderAbility(user.role);
       default:
         throw new NotFoundException('Space permissions not found');
     }
@@ -49,23 +53,50 @@ function buildSpaceAdminAbility() {
   return build();
 }
 
-function buildSpaceWriterAbility() {
+function buildSpaceWriterAbility(workspaceRole?: string) {
   const { can, build } = new AbilityBuilder<MongoAbility<ISpaceAbility>>(
     createMongoAbility,
   );
-  can(SpaceCaslAction.Read, SpaceCaslSubject.Settings);
-  can(SpaceCaslAction.Read, SpaceCaslSubject.Member);
+
+  if (workspaceRole === UserRole.OWNER) {
+    // Workspace owners get manage permissions even with writer space role
+    can(SpaceCaslAction.Manage, SpaceCaslSubject.Settings);
+    can(SpaceCaslAction.Manage, SpaceCaslSubject.Member);
+  } else {
+    can(SpaceCaslAction.Read, SpaceCaslSubject.Settings);
+    can(SpaceCaslAction.Read, SpaceCaslSubject.Member);
+  }
+
   can(SpaceCaslAction.Manage, SpaceCaslSubject.Page);
   can(SpaceCaslAction.Manage, SpaceCaslSubject.Share);
   return build();
 }
 
-function buildSpaceReaderAbility() {
+function buildSpaceReaderAbility(workspaceRole?: string) {
   const { can, build } = new AbilityBuilder<MongoAbility<ISpaceAbility>>(
     createMongoAbility,
   );
-  can(SpaceCaslAction.Read, SpaceCaslSubject.Settings);
-  can(SpaceCaslAction.Read, SpaceCaslSubject.Member);
+
+  if (workspaceRole === UserRole.OWNER) {
+    // Workspace owners get manage permissions even with reader space role
+    can(SpaceCaslAction.Manage, SpaceCaslSubject.Settings);
+    can(SpaceCaslAction.Manage, SpaceCaslSubject.Member);
+  } else {
+    can(SpaceCaslAction.Read, SpaceCaslSubject.Settings);
+    can(SpaceCaslAction.Read, SpaceCaslSubject.Member);
+  }
+
+  can(SpaceCaslAction.Read, SpaceCaslSubject.Page);
+  can(SpaceCaslAction.Read, SpaceCaslSubject.Share);
+  return build();
+}
+
+function buildWorkspaceOwnerAbility() {
+  const { can, build } = new AbilityBuilder<MongoAbility<ISpaceAbility>>(
+    createMongoAbility,
+  );
+  can(SpaceCaslAction.Manage, SpaceCaslSubject.Settings);
+  can(SpaceCaslAction.Manage, SpaceCaslSubject.Member);
   can(SpaceCaslAction.Read, SpaceCaslSubject.Page);
   can(SpaceCaslAction.Read, SpaceCaslSubject.Share);
   return build();

apps/server/src/core/space/services/space-member.service.ts

@@ -279,4 +279,14 @@ export class SpaceMemberService {
   ): Promise<PaginationResult<Space>> {
     return await this.spaceMemberRepo.getUserSpaces(userId, pagination);
   }
+
+  async getAllWorkspaceSpaces(
+    workspaceId: string,
+    pagination: PaginationOptions,
+  ): Promise<PaginationResult<Space>> {
+    return await this.spaceMemberRepo.getAllWorkspaceSpaces(
+      workspaceId,
+      pagination,
+    );
+  }
 }

apps/server/src/core/space/space.controller.ts

@@ -34,6 +34,7 @@ import {
 } from '../casl/interfaces/workspace-ability.type';
 import WorkspaceAbilityFactory from '../casl/abilities/workspace-ability.factory';
 import { CreateSpaceDto } from './dto/create-space.dto';
+import { SpaceRole, UserRole } from '../../common/helpers/types/permission';
 
 @UseGuards(JwtAuthGuard)
 @Controller('spaces')
@@ -52,7 +53,17 @@ export class SpaceController {
     @Body()
     pagination: PaginationOptions,
     @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
   ) {
+    if (pagination.includeAllSpaces) {
+      if (user.role !== UserRole.OWNER) {
+        throw new ForbiddenException('Only workspace owners view all spaces');
+      }
+      return this.spaceMemberService.getAllWorkspaceSpaces(
+        workspace.id,
+        pagination,
+      );
+    }
     return this.spaceMemberService.getUserSpaces(user.id, pagination);
   }
 
@@ -82,7 +93,10 @@ export class SpaceController {
       space.id,
     );
 
-    const userSpaceRole = findHighestUserSpaceRole(userSpaceRoles);
+    let userSpaceRole = findHighestUserSpaceRole(userSpaceRoles);
+    if (!userSpaceRole && user.role === UserRole.OWNER) {
+      userSpaceRole = SpaceRole.READER;
+    }
 
     const membership = {
       userId: user.id,

apps/server/src/database/pagination/pagination-options.ts

@@ -1,4 +1,5 @@
 import {
+  IsBoolean,
   IsNumber,
   IsOptional,
   IsPositive,
@@ -23,4 +24,9 @@ export class PaginationOptions {
   @IsOptional()
   @IsString()
   query: string;
+
+  //for space endpoint workspace owners
+  @IsOptional()
+  @IsBoolean()
+  includeAllSpaces?: boolean;
 }

apps/server/src/database/repos/space/space-member.repo.ts

@@ -263,4 +263,37 @@ export class SpaceMemberRepo {
 
     return result;
   }
+
+  async getAllWorkspaceSpaces(
+    workspaceId: string,
+    pagination: PaginationOptions,
+  ) {
+    let query = this.db
+      .selectFrom('spaces')
+      .selectAll()
+      .select((eb) => [this.spaceRepo.withMemberCount(eb)])
+      .where('workspaceId', '=', workspaceId)
+      .orderBy('createdAt', 'asc');
+
+    if (pagination.query) {
+      query = query.where((eb) =>
+        eb(
+          sql`f_unaccent(name)`,
+          'ilike',
+          sql`f_unaccent(${'%' + pagination.query + '%'})`,
+        ).or(
+          sql`f_unaccent(description)`,
+          'ilike',
+          sql`f_unaccent(${'%' + pagination.query + '%'})`,
+        ),
+      );
+    }
+
+    const result = executeWithPagination(query, {
+      page: pagination.page,
+      perPage: pagination.limit,
+    });
+
+    return result;
+  }
 }

apps/server/src/integrations/import/utils/import-formatter.ts

@@ -222,17 +222,40 @@ export function notionFormatter($: CheerioAPI, $root: Cheerio<any>) {
 }
 
 export function unwrapFromParagraph($: CheerioAPI, $node: Cheerio<any>) {
-  // find the nearest <p> or <a> ancestor
-  let $wrapper = $node.closest('p, a');
+  // Keep track of processed wrappers to avoid infinite loops
+  const processedWrappers = new Set<any>();
 
+  let $wrapper = $node.closest('p, a');
   while ($wrapper.length) {
-    // if the wrapper has only our node inside, replace it entirely
-    if ($wrapper.contents().length === 1) {
+    const wrapperElement = $wrapper.get(0);
+
+    // If we've already processed this wrapper, break to avoid infinite loop
+    if (processedWrappers.has(wrapperElement)) {
+      break;
+    }
+
+    processedWrappers.add(wrapperElement);
+
+    // Check if the wrapper contains only whitespace and our target node
+    const hasOnlyTargetNode =
+      $wrapper.contents().filter((_, el) => {
+        const $el = $(el);
+        // Skip whitespace-only text nodes. NodeType 3 = text node
+        if (el.nodeType === 3 && !$el.text().trim()) {
+          return false;
+        }
+        // Return true if this is not our target node
+        return !$el.is($node) && !$node.is($el);
+      }).length === 0;
+
+    if (hasOnlyTargetNode) {
+      // Replace the wrapper entirely with our node
       $wrapper.replaceWith($node);
     } else {
-      // otherwise just move the node to before the wrapper
+      // Move the node to before the wrapper, preserving other content
       $wrapper.before($node);
     }
+
     // look again for any new wrapper around $node
     $wrapper = $node.closest('p, a');
   }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "docmost",
   "homepage": "https://docmost.com",
-  "version": "0.23.1",
+  "version": "0.23.2",
   "private": true,
   "scripts": {
     "build": "nx run-many -t build",