Add second plan

apps/client/package.json

@@ -29,7 +29,6 @@
     "clsx": "^2.1.1",
     "emoji-mart": "^5.6.0",
     "file-saver": "^2.0.5",
-    "highlightjs-sap-abap": "^0.3.0",
     "i18next": "^23.14.0",
     "i18next-http-backend": "^2.6.1",
     "jotai": "^2.12.1",

apps/client/src/features/editor/extensions/extensions.ts

@@ -58,7 +58,6 @@ import ExcalidrawView from "@/features/editor/components/excalidraw/excalidraw-v
 import EmbedView from "@/features/editor/components/embed/embed-view.tsx";
 import plaintext from "highlight.js/lib/languages/plaintext";
 import powershell from "highlight.js/lib/languages/powershell";
-import abap from "highlightjs-sap-abap";
 import elixir from "highlight.js/lib/languages/elixir";
 import erlang from "highlight.js/lib/languages/erlang";
 import dockerfile from "highlight.js/lib/languages/dockerfile";
@@ -77,7 +76,7 @@ import { CharacterCount } from "@tiptap/extension-character-count";
 const lowlight = createLowlight(common);
 lowlight.register("mermaid", plaintext);
 lowlight.register("powershell", powershell);
-lowlight.register("abap", abap);
+lowlight.register("powershell", powershell);
 lowlight.register("erlang", erlang);
 lowlight.register("elixir", elixir);
 lowlight.register("dockerfile", dockerfile);

apps/client/src/features/share/components/share-branding.tsx

@@ -1,16 +0,0 @@
-import { Affix, Button } from "@mantine/core";
-
-export default function ShareBranding() {
-  return (
-    <Affix position={{ bottom: 20, right: 20 }}>
-      <Button
-        variant="default"
-        component="a"
-        target="_blank"
-        href="https://docmost.com?ref=public-share"
-      >
-        Powered by Docmost
-      </Button>
-    </Affix>
-  );
-}

apps/client/src/features/share/components/share-shell.tsx

@@ -36,7 +36,6 @@ import {
 } from "@/features/search/components/search-control.tsx";
 import { ShareSearchSpotlight } from "@/features/search/share-search-spotlight";
 import { shareSearchSpotlight } from "@/features/search/constants";
-import ShareBranding from '@/features/share/components/share-branding.tsx';
 
 const MemoizedSharedTree = React.memo(SharedTree);
 
@@ -164,7 +163,16 @@ export default function ShareShell({
       <AppShell.Main>
         {children}
 
-        {data && shareId && !data.hasLicenseKey && <ShareBranding />}
+        <Affix position={{ bottom: 20, right: 20 }}>
+          <Button
+            variant="default"
+            component="a"
+            target="_blank"
+            href="https://docmost.com?ref=public-share"
+          >
+            Powered by Docmost
+          </Button>
+        </Affix>
       </AppShell.Main>
 
       <AppShell.Aside

apps/client/src/features/share/types/share.types.ts

@@ -41,7 +41,6 @@ export interface ISharedPage extends IShare {
     level: number;
     sharedPage: { id: string; slugId: string; title: string; icon: string };
   };
-  hasLicenseKey: boolean;
 }
 
 export interface IShareForPage extends IShare {
@@ -71,5 +70,4 @@ export interface IShareInfoInput {
 export interface ISharedPageTree {
   share: IShare;
   pageTree: Partial<IPage[]>;
-  hasLicenseKey: boolean;
 }

apps/client/src/pages/share/shared-page.tsx

@@ -7,9 +7,8 @@ import React, { useEffect } from "react";
 import ReadonlyPageEditor from "@/features/editor/readonly-page-editor.tsx";
 import { extractPageSlugId } from "@/lib";
 import { Error404 } from "@/components/ui/error-404.tsx";
-import ShareBranding from "@/features/share/components/share-branding.tsx";
 
-export default function SharedPage() {
+export default function SingleSharedPage() {
   const { t } = useTranslation();
   const { pageSlug } = useParams();
   const { shareId } = useParams();
@@ -54,8 +53,6 @@ export default function SharedPage() {
           content={data.page.content}
         />
       </Container>
-
-      {data && !shareId && !data.hasLicenseKey && <ShareBranding />}
     </div>
   );
 }

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

@@ -30,7 +30,6 @@ import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { Public } from '../../common/decorators/public.decorator';
 import { ShareRepo } from '@docmost/db/repos/share/share.repo';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
-import { EnvironmentService } from '../../integrations/environment/environment.service';
 
 @UseGuards(JwtAuthGuard)
 @Controller('shares')
@@ -40,7 +39,6 @@ export class ShareController {
     private readonly spaceAbility: SpaceAbilityFactory,
     private readonly shareRepo: ShareRepo,
     private readonly pageRepo: PageRepo,
-    private readonly environmentService: EnvironmentService,
   ) {}
 
   @HttpCode(HttpStatus.OK)
@@ -63,12 +61,7 @@ export class ShareController {
       throw new BadRequestException();
     }
 
-    return {
-      ...(await this.shareService.getSharedPage(dto, workspace.id)),
-      hasLicenseKey:
-        Boolean(workspace.licenseKey) ||
-        (this.environmentService.isCloud() && workspace.plan === 'business'),
-    };
+    return this.shareService.getSharedPage(dto, workspace.id);
   }
 
   @Public()
@@ -173,11 +166,6 @@ export class ShareController {
     @Body() dto: ShareIdDto,
     @AuthWorkspace() workspace: Workspace,
   ) {
-    return {
-      ...(await this.shareService.getShareTree(dto.shareId, workspace.id)),
-      hasLicenseKey:
-        Boolean(workspace.licenseKey) ||
-        (this.environmentService.isCloud() && workspace.plan === 'business'),
-    };
+    return this.shareService.getShareTree(dto.shareId, workspace.id);
   }
 }

pnpm-lock.yaml

@@ -257,9 +257,6 @@ importers:
       file-saver:
         specifier: ^2.0.5
         version: 2.0.5
-      highlightjs-sap-abap:
-        specifier: ^0.3.0
-        version: 0.3.0
       i18next:
         specifier: ^23.14.0
         version: 23.14.0
@@ -5875,9 +5872,6 @@ packages:
     resolution: {integrity: sha512-SYVnVFswQER+zu1laSya563s+F8VDGt7o35d4utbamowvUNLLMovFqwCLSocpZTz3MgaSRA1IbqRWZv97dtErQ==}
     engines: {node: '>=12.0.0'}
 
-  highlightjs-sap-abap@0.3.0:
-    resolution: {integrity: sha512-nSiUvEOCycjtFA3pHaTowrbAAk5+lciBHyoVkDsd6FTRBtW9sT2dt42o2jAKbXjZVUidtacdk+j0Y2xnd233Mw==}
-
   hoist-non-react-statics@3.3.2:
     resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
 
@@ -15442,8 +15436,6 @@ snapshots:
 
   highlight.js@11.10.0: {}
 
-  highlightjs-sap-abap@0.3.0: {}
-
   hoist-non-react-statics@3.3.2:
     dependencies:
       react-is: 16.13.1