Add download functionality to DAM folders

.gitignore

@@ -9,3 +9,4 @@ lang/
 .pnp.*
 junit.xml
 .env.local
+**/.idea

packages/admin/admin/src/rowActions/RowActionsItem.tsx

@@ -10,14 +10,24 @@ export interface CommonRowActionItemProps {
     onClick?: React.MouseEventHandler<HTMLElement>;
 }
 
-export type RowActionsItemPropsComponentsProps = RowActionsIconItemComponentsProps & RowActionsListItemComponentsProps;
+export type RowActionsItemPropsComponentsProps<T extends React.ElementType = "li"> = RowActionsIconItemComponentsProps &
+    RowActionsListItemComponentsProps<T>;
 
-export interface RowActionsItemProps extends Omit<RowActionsIconItemProps, "componentsProps">, Omit<RowActionsListItemProps, "componentsProps"> {
-    componentsProps?: RowActionsItemPropsComponentsProps;
+export interface RowActionsItemProps<T extends React.ElementType = "li">
+    extends Omit<RowActionsIconItemProps, "componentsProps">,
+        Omit<RowActionsListItemProps<T>, "componentsProps"> {
+    componentsProps?: RowActionsItemPropsComponentsProps<T>;
     children?: React.ReactNode;
 }
 
-export const RowActionsItem = ({ icon, children, disabled, onClick, componentsProps, ...restListItemProps }: RowActionsItemProps) => {
+export function RowActionsItem<MenuItemComponent extends React.ElementType = "li">({
+    icon,
+    children,
+    disabled,
+    onClick,
+    componentsProps,
+    ...restListItemProps
+}: RowActionsItemProps<MenuItemComponent>): React.ReactElement<RowActionsItemProps<MenuItemComponent>> {
     const { level, closeAllMenus } = React.useContext(RowActionsMenuContext);
 
     if (level === 1) {
@@ -33,7 +43,7 @@ export const RowActionsItem = ({ icon, children, disabled, onClick, componentsPr
     }
 
     return (
-        <RowActionsListItem
+        <RowActionsListItem<MenuItemComponent>
             icon={icon}
             disabled={disabled}
             onClick={(event) => {
@@ -50,4 +60,4 @@ export const RowActionsItem = ({ icon, children, disabled, onClick, componentsPr
             {children}
         </RowActionsListItem>
     );
-};
+}

packages/admin/admin/src/rowActions/RowActionsListItem.tsx

@@ -4,30 +4,38 @@ import * as React from "react";
 
 import { CommonRowActionItemProps } from "./RowActionsItem";
 
-export type RowActionsListItemComponentsProps = React.PropsWithChildren<{
+export type RowActionsListItemComponentsProps<MenuItemComponent extends React.ElementType = "li"> = React.PropsWithChildren<{
     listItemIcon?: Partial<ListItemIconProps>;
     listItemText?: Partial<ListItemTextProps>;
-    menuItem?: Partial<MenuItemProps>;
+    menuItem?: Partial<MenuItemProps<MenuItemComponent> & { component: MenuItemComponent }>;
 }>;
 
-export interface RowActionsListItemProps extends CommonRowActionItemProps {
+export interface RowActionsListItemProps<MenuItemComponent extends React.ElementType = "li"> extends CommonRowActionItemProps {
     textSecondary?: React.ReactNode;
     endIcon?: React.ReactNode;
-    componentsProps?: RowActionsListItemComponentsProps;
+    componentsProps?: RowActionsListItemComponentsProps<MenuItemComponent>;
     children?: React.ReactNode;
 }
 
-export const RowActionsListItem = React.forwardRef<HTMLLIElement, RowActionsListItemProps>(function RowActionsListItem(props, ref) {
+const RowActionsListItemNoRef = <MenuItemComponent extends React.ElementType>(
+    props: RowActionsListItemProps<MenuItemComponent>,
+    ref: React.ForwardedRef<HTMLLIElement>,
+) => {
     const { icon, children, textSecondary, endIcon, componentsProps = {}, ...restMenuItemProps } = props;
     const { listItemIcon: listItemIconProps, listItemText: listItemTextProps, menuItem: menuItemProps } = componentsProps;
+
     return (
         <MenuItem ref={ref} {...restMenuItemProps} {...menuItemProps}>
             {icon !== undefined && <ListItemIcon {...listItemIconProps}>{icon}</ListItemIcon>}
             {children !== undefined && <ListItemText primary={children} secondary={textSecondary} {...listItemTextProps} />}
             {Boolean(endIcon) && <EndIcon>{endIcon}</EndIcon>}
         </MenuItem>
     );
-});
+};
+
+export const RowActionsListItem = React.forwardRef(RowActionsListItemNoRef) as <MenuItemComponent extends React.ElementType>(
+    props: RowActionsListItemProps<MenuItemComponent> & { ref?: React.ForwardedRef<HTMLLIElement> },
+) => React.ReactElement;
 
 const EndIcon = styled("div")(({ theme }) => ({
     marginLeft: theme.spacing(2),

packages/admin/cms-admin/src/dam/Table/DamContextMenu.tsx

@@ -6,6 +6,7 @@ import saveAs from "file-saver";
 import * as React from "react";
 import { FormattedMessage } from "react-intl";
 
+import { useCmsBlockContext } from "../../blocks/useCmsBlockContext";
 import { UnknownError } from "../../common/errors/errorMessages";
 import {
     GQLArchiveFileMutation,
@@ -40,6 +41,7 @@ const FolderInnerMenu = ({ folder }: FolderInnerMenuProps): React.ReactElement =
     const editDialogApi = useEditDialogApi();
     const errorDialog = useErrorDialog();
     const apolloClient = useApolloClient();
+    const context = useCmsBlockContext();
 
     const [deleteDialogOpen, setDeleteDialogOpen] = React.useState<boolean>(false);
 
@@ -63,6 +65,8 @@ const FolderInnerMenu = ({ folder }: FolderInnerMenuProps): React.ReactElement =
         }
     };
 
+    const downloadUrl = `${context.damConfig.apiUrl}/dam/folders/${folder.id}/zip`;
+
     return (
         <>
             <RowActionsMenu>
@@ -75,6 +79,14 @@ const FolderInnerMenu = ({ folder }: FolderInnerMenuProps): React.ReactElement =
                     >
                         <FormattedMessage id="comet.pages.dam.rename" defaultMessage="Rename" />
                     </RowActionsItem>
+                    <RowActionsItem<"a">
+                        icon={<Download />}
+                        componentsProps={{
+                            menuItem: { component: "a", href: downloadUrl, target: "_blank" },
+                        }}
+                    >
+                        <FormattedMessage id="comet.pages.dam.downloadFolder" defaultMessage="Download folder" />
+                    </RowActionsItem>
                     <RowActionsItem
                         icon={<Delete />}
                         onClick={() => {

packages/api/cms-api/package.json

@@ -53,6 +53,7 @@
         "graphql-type-json": "^0.3.2",
         "hasha": "^5.2.2",
         "jsonwebtoken": "^8.5.1",
+        "jszip": "^3.10.1",
         "jwks-rsa": "^3.0.0",
         "lodash.isequal": "^4.0.0",
         "mime": "^3.0.0",

packages/api/cms-api/src/dam/dam.module.ts

@@ -15,6 +15,7 @@ import { FileLicensesResolver } from "./files/file-licenses.resolver";
 import { FilesController } from "./files/files.controller";
 import { FilesResolver } from "./files/files.resolver";
 import { FilesService } from "./files/files.service";
+import { FoldersController } from "./files/folders.controller";
 import { FoldersResolver } from "./files/folders.resolver";
 import { FoldersService } from "./files/folders.service";
 import { CalculateDominantImageColor } from "./images/calculateDominantImageColor.console";
@@ -67,7 +68,7 @@ export class DamModule {
                 FileImagesResolver,
                 CalculateDominantImageColor,
             ],
-            controllers: [FilesController, ImagesController],
+            controllers: [FilesController, FoldersController, ImagesController],
             exports: [ImgproxyService, FilesService, FoldersService, ImagesService, ScaledImagesCacheService, damConfigProvider],
         };
     }

packages/api/cms-api/src/dam/files/folders.controller.ts

@@ -0,0 +1,22 @@
+import { Controller, Get, NotFoundException, Param, Res } from "@nestjs/common";
+import { Response } from "express";
+
+import { FoldersService } from "./folders.service";
+
+@Controller("dam/folders")
+export class FoldersController {
+    constructor(private readonly foldersService: FoldersService) {}
+
+    @Get("/:folderId/zip")
+    async createZip(@Param("folderId") folderId: string, @Res() res: Response): Promise<void> {
+        const folder = await this.foldersService.findOneById(folderId);
+        if (!folder) {
+            throw new NotFoundException("Folder not found");
+        }
+        const zipStream = await this.foldersService.createZipStreamFromFolder(folderId);
+
+        res.setHeader("Content-Disposition", `attachment; filename="${folder.name}.zip"`);
+        res.setHeader("Content-Type", "application/zip");
+        zipStream.pipe(res);
+    }
+}

packages/api/cms-api/src/dam/files/folders.service.ts

@@ -1,13 +1,18 @@
 import { InjectRepository } from "@mikro-orm/nestjs";
 import { EntityRepository, QueryBuilder } from "@mikro-orm/postgresql";
 import { forwardRef, Inject, Injectable, Logger } from "@nestjs/common";
+import JSZip from "jszip";
 
+import { BlobStorageBackendService } from "../../blob-storage/backends/blob-storage-backend.service";
 import { CometEntityNotFoundException } from "../../common/errors/entity-not-found.exception";
 import { SortDirection } from "../../common/sorting/sort-direction.enum";
+import { DamConfig } from "../dam.config";
+import { DAM_CONFIG } from "../dam.constants";
 import { FolderArgs } from "./dto/folder.args";
 import { CreateFolderInput, UpdateFolderInput } from "./dto/folder.input";
 import { Folder } from "./entities/folder.entity";
 import { FilesService } from "./files.service";
+import { createHashedPath } from "./files.utils";
 
 export const withFoldersSelect = (
     qb: QueryBuilder<Folder>,
@@ -67,6 +72,8 @@ export class FoldersService {
     constructor(
         @InjectRepository(Folder) private readonly foldersRepository: EntityRepository<Folder>,
         @Inject(forwardRef(() => FilesService)) private readonly filesService: FilesService,
+        @Inject(forwardRef(() => BlobStorageBackendService)) private readonly blobStorageBackendService: BlobStorageBackendService,
+        @Inject(DAM_CONFIG) private readonly config: DamConfig,
     ) {}
 
     async findAll({ parentId, includeArchived, filter, sortColumnName, sortDirection }: Omit<FolderArgs, "offset" | "limit">): Promise<Folder[]> {
@@ -209,6 +216,53 @@ export class FoldersService {
         return mpath.map((id) => folders.find((folder) => folder.id === id) as Folder);
     }
 
+    async createZipStreamFromFolder(folderId: string): Promise<NodeJS.ReadableStream> {
+        const zip = new JSZip();
+
+        await this.addFolderToZip(folderId, zip);
+
+        return zip.generateNodeStream({ streamFiles: true });
+    }
+
+    private async addFolderToZip(folderId: string, zip: JSZip): Promise<void> {
+        const files = await this.filesService.findAll({ folderId: folderId });
+        const subfolders = await this.findAll({ parentId: folderId });
+
+        for (const file of files) {
+            const fileStream = await this.blobStorageBackendService.getFile(this.config.filesDirectory, createHashedPath(file.contentHash));
+
+            zip.file(file.name, fileStream);
+        }
+        const countedSubfolderNames: Record<string, number> = {};
+
+        for (const subfolder of subfolders) {
+            const subfolderName = subfolder.name;
+            const updatedSubfolderName = this.getUniqueFolderName(subfolderName, countedSubfolderNames);
+
+            const subfolderZip = zip.folder(updatedSubfolderName);
+            if (!subfolderZip) {
+                throw new Error(`Error while creating zip from folder with id ${folderId}`);
+            }
+            await this.addFolderToZip(subfolder.id, subfolderZip);
+        }
+    }
+
+    private getUniqueFolderName(folderName: string, countedFolderNames: Record<string, number>) {
+        if (!countedFolderNames[folderName]) {
+            countedFolderNames[folderName] = 1;
+        } else {
+            countedFolderNames[folderName]++;
+        }
+
+        const duplicateCount = countedFolderNames[folderName];
+
+        let updatedFolderName = folderName;
+        if (duplicateCount > 1) {
+            updatedFolderName = `${folderName} ${duplicateCount}`;
+        }
+        return updatedFolderName;
+    }
+
     private selectQueryBuilder(): QueryBuilder<Folder> {
         return this.foldersRepository
             .createQueryBuilder("folder")