Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

Delete assets with patches (#1368)

Bogdan Chadkin417b39833e2e
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsx
index 8fbfb5d6e2..9273263b36 100644
--- a/apps/builder/app/builder/builder.tsx
+++ b/apps/builder/app/builder/builder.tsx
@@ -240,7 +240,7 @@ const NavigatorPanel = ({
export type BuilderProps = {
project: Project;
build: Build;
- assets: Asset[];
+ assets: [Asset["id"], Asset][];
buildOrigin: string;
authToken?: string;
authPermit: AuthPermit;
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsx
index 254cc370dd..09dd430422 100644
--- a/apps/builder/app/builder/shared/assets/use-assets.tsx
+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx
@@ -5,7 +5,9 @@ import {
type ReactNode,
useState,
} from "react";
+import { useStore } from "@nanostores/react";
import warnOnce from "warn-once";
+import store from "immerhin";
import type { Project } from "@webstudio-is/project";
import {
type AssetType,
@@ -26,29 +28,30 @@ import { usePersistentFetcher } from "~/shared/fetcher";
import type { ActionData } from "~/builder/shared/assets";
import { normalizeErrors, toastUnknownFieldErrors } from "~/shared/form-utils";
import { assetsStore } from "~/shared/nano-states";
-import { useStore } from "@nanostores/react";
+
+export const deleteAssets = (assetIds: Asset["id"][]) => {
+ store.createTransaction([assetsStore], (assets) => {
+ for (const assetId of assetIds) {
+ assets.delete(assetId);
+ }
+ });
+};
// stubbed asset is necessary to preserve position of asset
// while uploading and after it is uploaded
// undefined is not stored in db and only persisted in current session
const stubAssets = (ids: Asset["id"][]) => {
- const assets = new Map(assetsStore.get());
- for (const assetId of ids) {
- assets.set(assetId, undefined);
- }
- assetsStore.set(assets);
+ store.createTransaction([assetsStore], (assets) => {
+ for (const assetId of ids) {
+ assets.set(assetId, undefined);
+ }
+ });
};
const setAsset = (asset: Asset) => {
- const assets = new Map(assetsStore.get());
- assets.set(asset.id, asset);
- assetsStore.set(assets);
-};
-
-const cleanAsset = (assetId: Asset["id"]) => {
- const assets = new Map(assetsStore.get());
- assets.delete(assetId);
- assetsStore.set(assets);
+ store.createTransaction([assetsStore], (assets) => {
+ assets.set(asset.id, asset);
+ });
};
export type UploadData = ActionData;
@@ -122,7 +125,6 @@ const getFilesFromInput = (_type: AssetType, input: HTMLInputElement) => {
type AssetsContext = {
handleSubmit: (type: AssetType, files: File[]) => Promise<void>;
assetContainers: AssetContainer[];
- handleDelete: (ids: Array<string>) => void;
};
const Context = createContext<AssetsContext | undefined>(undefined);
@@ -136,7 +138,6 @@ export const AssetsProvider = ({
authToken: string | undefined;
children: ReactNode;
}) => {
- const [deletingAssetIds, setDeletingAssetIds] = useState<Asset["id"][]>([]);
const [uploadingAssets, setUploadingAssets] = useState<
Array<Asset | PreviewAsset>
>([]);
@@ -144,33 +145,12 @@ export const AssetsProvider = ({
const action = restAssetsPath({ projectId: projectId, authToken });
- const handleDeleteAfterSubmit = (ids: Asset["id"][], data: UploadData) => {
- setDeletingAssetIds((prev) =>
- prev.filter((assetId) => ids.includes(assetId) === false)
- );
-
- const { errors, deletedAssets } = data;
- if (errors !== undefined) {
- return toastUnknownFieldErrors(normalizeErrors(errors), []);
- }
-
- if (deletedAssets === undefined) {
- warnOnce(true, "Deleted assets is undefined");
- toast.error("Could not delete assets");
- return;
- }
-
- for (const deletedId of ids) {
- cleanAsset(deletedId);
- }
- };
-
const handleAfterSubmit = (assetId: string, data: UploadData) => {
// remove uploaded or failed asset
setUploadingAssets((prev) => prev.filter((asset) => asset.id !== assetId));
if (data.errors !== undefined) {
- cleanAsset(assetId);
+ deleteAssets([assetId]);
return toastUnknownFieldErrors(
normalizeErrors(data.errors ?? "Could not upload an asset"),
[]
@@ -187,7 +167,7 @@ export const AssetsProvider = ({
if (uploadedAsset === undefined) {
warnOnce(true, "An uploaded asset is undefined");
toast.error("Could not upload an asset");
- cleanAsset(assetId);
+ deleteAssets([assetId]);
return;
}
@@ -195,19 +175,6 @@ export const AssetsProvider = ({
setAsset(uploadedAsset);
};
- const handleDelete = (ids: Array<string>) => {
- setDeletingAssetIds((prev) => [...prev, ...ids]);
-
- const formData = new FormData();
- for (const id of ids) {
- formData.append("assetId", id);
- }
-
- submit<UploadData>(formData, { method: "delete", action }, (data) =>
- handleDeleteAfterSubmit(ids, data)
- );
- };
-
const handleSubmit = async (type: AssetType, files: File[]) => {
try {
const uploadingAssetsAndFormData = await toUploadingAssetsAndFormData(
@@ -250,9 +217,6 @@ export const AssetsProvider = ({
const assetContainers: Array<AssetContainer> = [];
const assets = useStore(assetsStore);
for (const [assetId, asset] of assets) {
- if (deletingAssetIds.includes(assetId)) {
- continue;
- }
const uploadingAsset = uploadingAssetsMap.get(assetId);
if (uploadingAsset) {
assetContainers.push({
@@ -270,7 +234,7 @@ export const AssetsProvider = ({
}
return (
- <Context.Provider value={{ assetContainers, handleSubmit, handleDelete }}>
+ <Context.Provider value={{ assetContainers, handleSubmit }}>
{children}
</Context.Provider>
);
@@ -304,6 +268,5 @@ export const useAssets = (type: AssetType) => {
*/
assetContainers: assetsByType,
handleSubmit,
- handleDelete: assetContainersContext.handleDelete,
};
};
diff --git a/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx
index 363fc94eae..2b069f0eee 100644
--- a/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx
+++ b/apps/builder/app/builder/shared/fonts-manager/fonts-manager.tsx
@@ -6,6 +6,7 @@ import {
} from "@webstudio-is/design-system";
import {
AssetsShell,
+ deleteAssets,
Separator,
useAssets,
useSearch,
@@ -29,8 +30,7 @@ const useLogic = ({
onChange: (value: string) => void;
value: string;
}) => {
- const { assetContainers, handleDelete: handleDeleteAssets } =
- useAssets("font");
+ const { assetContainers } = useAssets("font");
const [selectedIndex, setSelectedIndex] = useState(-1);
const fontItems = useMemo(() => toItems(assetContainers), [assetContainers]);
const { filteredItems, resetFilteredItems, setFilteredItems } = useFilter({
@@ -68,7 +68,7 @@ const useLogic = ({
const handleDelete = (index: number) => {
const family = groupedItems[index].label;
const ids = filterIdsByFamily(family, assetContainers);
- handleDeleteAssets(ids);
+ deleteAssets(ids);
if (index === currentIndex) {
setCurrentIndex(-1);
}
diff --git a/apps/builder/app/builder/shared/image-manager/image-manager.tsx b/apps/builder/app/builder/shared/image-manager/image-manager.tsx
index 9e018d12ec..628ea724e9 100644
--- a/apps/builder/app/builder/shared/image-manager/image-manager.tsx
+++ b/apps/builder/app/builder/shared/image-manager/image-manager.tsx
@@ -5,6 +5,7 @@ import {
type AssetContainer,
useAssets,
useSearch,
+ deleteAssets,
} from "../assets";
import { useFilter } from "../assets/use-filter";
import { ImageThumbnail } from "./image-thumbnail";
@@ -18,7 +19,7 @@ const filterItems = (search: string, items: AssetContainer[]) => {
};
const useLogic = ({ onChange }: { onChange?: (asset: ImageAsset) => void }) => {
- const { assetContainers, handleDelete } = useAssets("image");
+ const { assetContainers } = useAssets("image");
const [selectedIndex, setSelectedIndex] = useState(-1);
@@ -69,7 +70,7 @@ const useLogic = ({ onChange }: { onChange?: (asset: ImageAsset) => void }) => {
return {
searchProps,
- handleDelete,
+ handleDelete: deleteAssets,
filteredItems,
handleSelect,
selectedIndex,
diff --git a/apps/builder/app/routes/builder/$projectId.tsx b/apps/builder/app/routes/builder/$projectId.tsx
index 6fbf9846f5..2c6a10800b 100644
--- a/apps/builder/app/routes/builder/$projectId.tsx
+++ b/apps/builder/app/routes/builder/$projectId.tsx
@@ -59,7 +59,7 @@ export const loader = async ({
return {
project,
build: devBuild,
- assets,
+ assets: assets.map((asset) => [asset.id, asset]),
buildOrigin: getBuildOrigin(request),
authToken,
authPermit,
diff --git a/apps/builder/app/routes/rest/assets.$projectId.tsx b/apps/builder/app/routes/rest/assets.$projectId.tsx
index 229b558adb..02916ab909 100644
--- a/apps/builder/app/routes/rest/assets.$projectId.tsx
+++ b/apps/builder/app/routes/rest/assets.$projectId.tsx
@@ -2,21 +2,15 @@ import type { ActionArgs, LoaderArgs } from "@remix-run/node";
import { useActionData } from "@remix-run/react";
import type { Asset } from "@webstudio-is/asset-uploader";
import {
- deleteAssets,
uploadAssets,
loadByProject,
} from "@webstudio-is/asset-uploader/server";
import { toast } from "@webstudio-is/design-system";
import { useEffect } from "react";
-import { zfd } from "zod-form-data";
import type { ActionData } from "~/builder/shared/assets";
import { sentryException } from "~/shared/sentry";
import { createContext } from "~/shared/context.server";
-const DeleteAssets = zfd.formData({
- assetId: zfd.repeatableOfType(zfd.text()),
-});
-
export const loader = async ({
params,
request,
@@ -40,15 +34,6 @@ export const action = async (
const context = await createContext(request);
try {
- if (request.method === "DELETE") {
- const { assetId: ids } = DeleteAssets.parse(await request.formData());
- const deletedAssets = await deleteAssets(
- { ids, projectId: params.projectId },
- context
- );
- return { deletedAssets };
- }
-
if (request.method === "POST") {
const assets = await uploadAssets(
{
diff --git a/apps/builder/app/routes/rest/patch.ts b/apps/builder/app/routes/rest/patch.ts
index 2b0bc8ae24..5c6dd60b89 100644
--- a/apps/builder/app/routes/rest/patch.ts
+++ b/apps/builder/app/routes/rest/patch.ts
@@ -10,6 +10,7 @@ import {
patchInstances,
patchPages,
} from "@webstudio-is/project-build/server";
+import { patchAssets } from "@webstudio-is/asset-uploader/server";
import type { Project } from "@webstudio-is/project";
import { createContext } from "~/shared/context.server";
@@ -55,6 +56,8 @@ export const action = async ({ request }: ActionArgs) => {
await patchProps({ buildId, projectId }, patches, context);
} else if (namespace === "breakpoints") {
await patchBreakpoints({ buildId, projectId }, patches, context);
+ } else if (namespace === "assets") {
+ await patchAssets({ projectId }, patches, context);
} else {
return { errors: `Unknown namespace "${namespace}"` };
}
diff --git a/apps/builder/app/shared/nano-states/nano-states.ts b/apps/builder/app/shared/nano-states/nano-states.ts
index 6342a79e1e..0717ec8bf1 100644
--- a/apps/builder/app/shared/nano-states/nano-states.ts
+++ b/apps/builder/app/shared/nano-states/nano-states.ts
@@ -287,9 +287,9 @@ export const useSetBreakpoints = (
};
export const assetsStore = atom<Assets>(new Map());
-export const useSetAssets = (assets: Asset[]) => {
+export const useSetAssets = (assets: [Asset["id"], Asset][]) => {
useSyncInitializeOnce(() => {
- assetsStore.set(new Map(assets.map((asset) => [asset.id, asset])));
+ assetsStore.set(new Map(assets));
});
};
diff --git a/apps/builder/app/shared/sync/sync-stores.ts b/apps/builder/app/shared/sync/sync-stores.ts
index 309702c074..034a81f7c2 100644
--- a/apps/builder/app/shared/sync/sync-stores.ts
+++ b/apps/builder/app/shared/sync/sync-stores.ts
@@ -59,8 +59,8 @@ export const registerContainers = () => {
store.register("styleSources", styleSourcesStore);
store.register("styleSourceSelections", styleSourceSelectionsStore);
store.register("props", propsStore);
+ store.register("assets", assetsStore);
// synchronize whole states
- clientStores.set("assets", assetsStore);
clientStores.set("selectedPageId", selectedPageIdStore);
clientStores.set("selectedInstanceSelector", selectedInstanceSelectorStore);
clientStores.set(
diff --git a/packages/asset-uploader/package.json b/packages/asset-uploader/package.json
index a2ba892627..d05cad7f0d 100644
--- a/packages/asset-uploader/package.json
+++ b/packages/asset-uploader/package.json
@@ -21,6 +21,7 @@
"@webstudio-is/prisma-client": "workspace:^",
"@webstudio-is/trpc-interface": "workspace:^",
"app-root-path": "^3.0.0",
+ "immer": "^9.0.12",
"nanoid": "^3.2.0",
"sharp": "^0.30.7"
},
diff --git a/packages/asset-uploader/src/index.server.ts b/packages/asset-uploader/src/index.server.ts
index 7206fd7de9..08d8563d71 100644
--- a/packages/asset-uploader/src/index.server.ts
+++ b/packages/asset-uploader/src/index.server.ts
@@ -1,4 +1,5 @@
export * from "./db";
export * from "./upload";
export * from "./delete";
+export * from "./patch";
export * from "./utils/format-asset";
diff --git a/packages/asset-uploader/src/patch.ts b/packages/asset-uploader/src/patch.ts
new file mode 100644
index 0000000000..7295692624
--- /dev/null
+++ b/packages/asset-uploader/src/patch.ts
@@ -0,0 +1,39 @@
+import { type Patch, applyPatches } from "immer";
+import type { Project } from "@webstudio-is/prisma-client";
+import {
+ type AppContext,
+ authorizeProject,
+} from "@webstudio-is/trpc-interface/server";
+import { type Asset, Assets } from "./schema";
+import { deleteAssets } from "./delete";
+import { loadByProject } from "./db/load";
+
+export const patchAssets = async (
+ { projectId }: { projectId: Project["id"] },
+ patches: Array<Patch>,
+ context: AppContext
+) => {
+ const canEdit = await authorizeProject.hasProjectPermit(
+ { projectId, permit: "edit" },
+ context
+ );
+ if (canEdit === false) {
+ throw new Error("You don't have edit access to this project");
+ }
+
+ const assetsList = await loadByProject(projectId, context);
+ const assets = new Map<Asset["id"], Asset>();
+ for (const asset of assetsList) {
+ assets.set(asset.id, asset);
+ }
+ const patchedAssets = Assets.parse(applyPatches(assets, patches));
+
+ // delete assets no longer existing in patched version
+ const deletedAssetIds: Asset["id"][] = [];
+ for (const assetId of assets.keys()) {
+ if (patchedAssets.has(assetId) === false) {
+ deletedAssetIds.push(assetId);
+ }
+ }
+ deleteAssets({ projectId, ids: deletedAssetIds }, context);
+};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a8074a7b9f..ff7831a3a4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -382,6 +382,9 @@ importers:
app-root-path:
specifier: ^3.0.0
version: 3.0.0
+ immer:
+ specifier: ^9.0.12
+ version: 9.0.15
nanoid:
specifier: ^3.2.0
version: 3.3.4