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.

Remove assets stubbing (#2219)

Bogdan Chadkin2b0e9ae2063a
diff --git a/apps/builder/app/builder/shared/assets/types.ts b/apps/builder/app/builder/shared/assets/types.ts
index 2977c3d084..8342fc63dc 100644
--- a/apps/builder/app/builder/shared/assets/types.ts
+++ b/apps/builder/app/builder/shared/assets/types.ts
@@ -1,6 +1,6 @@
import type { Asset } from "@webstudio-is/asset-uploader";
-export type PreviewAsset = Pick<
+type PreviewAsset = Pick<
Asset,
"name" | "id" | "format" | "description" | "type"
>;
@@ -13,7 +13,7 @@ export type UploadedAssetContainer = {
export type UploadingAssetContainer = {
status: "uploading";
objectURL: string;
- asset: Asset | PreviewAsset;
+ asset: PreviewAsset;
};
/**
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsx
index fbe810f177..48ba94bbf9 100644
--- a/apps/builder/app/builder/shared/assets/use-assets.tsx
+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx
@@ -8,7 +8,6 @@ import { sanitizeS3Key } from "@webstudio-is/asset-uploader";
import { restAssetsUploadPath, restAssetsPath } from "~/shared/router-utils";
import type {
AssetContainer,
- PreviewAsset,
UploadedAssetContainer,
UploadingAssetContainer,
} from "./types";
@@ -28,17 +27,6 @@ export const deleteAssets = (assetIds: Asset["id"][]) => {
});
};
-// 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"][]) => {
- store.createTransaction([assetsStore], (assets) => {
- for (const assetId of ids) {
- assets.set(assetId, undefined);
- }
- });
-};
-
const setAsset = (asset: Asset) => {
store.createTransaction([assetsStore], (assets) => {
assets.set(asset.id, asset);
@@ -80,12 +68,9 @@ const deleteUploadingFileData = (id: FileData["assetId"]) => {
const assetContainersStore = computed(
[assetsStore, uploadingFilesDataStore],
(assets, uploadingFilesData) => {
- const uploadingAssets = new Map<
- PreviewAsset["id"],
- UploadingAssetContainer
- >();
+ const uploadingContainers: UploadingAssetContainer[] = [];
for (const { assetId, type, file, objectURL } of uploadingFilesData) {
- uploadingAssets.set(assetId, {
+ uploadingContainers.push({
status: "uploading",
objectURL: objectURL,
asset: {
@@ -97,20 +82,12 @@ const assetContainersStore = computed(
},
});
}
- const uploadingContainers: UploadingAssetContainer[] = [];
const uploadedContainers: UploadedAssetContainer[] = [];
- for (const [assetId, asset] of assets) {
- const uploadingAsset = uploadingAssets.get(assetId);
- if (uploadingAsset) {
- uploadingContainers.push(uploadingAsset);
- continue;
- }
- if (asset) {
- uploadedContainers.push({
- status: "uploaded",
- asset,
- });
- }
+ for (const asset of assets.values()) {
+ uploadedContainers.push({
+ status: "uploaded",
+ asset,
+ });
}
// sort newest uploaded assets first
uploadedContainers.sort(
@@ -204,7 +181,6 @@ export const useUploadAsset = () => {
const filesData = getFilesData(type, files);
addUploadingFilesData(filesData);
- stubAssets(filesData.map((fileData) => fileData.assetId));
for (const fileData of filesData) {
const assetId = fileData.assetId;
diff --git a/packages/asset-uploader/src/patch.ts b/packages/asset-uploader/src/patch.ts
index 259a007038..02ad74f2b3 100644
--- a/packages/asset-uploader/src/patch.ts
+++ b/packages/asset-uploader/src/patch.ts
@@ -46,10 +46,6 @@ export const patchAssets = async (
// add new assets found in patched version
const addedAssets: Asset[] = [];
for (const [assetId, asset] of patchedAssets) {
- // skip stubbed assets
- if (asset === undefined) {
- continue;
- }
if (assets.has(assetId) === false) {
addedAssets.push(asset);
}
diff --git a/packages/asset-uploader/src/schema.ts b/packages/asset-uploader/src/schema.ts
index e406d4e96e..812f1b9baa 100644
--- a/packages/asset-uploader/src/schema.ts
+++ b/packages/asset-uploader/src/schema.ts
@@ -45,7 +45,5 @@ export type ImageAsset = z.infer<typeof ImageAsset>;
export const Asset = z.union([FontAsset, ImageAsset]);
export type Asset = z.infer<typeof Asset>;
-// undefined is necessary to represent uploading state
-// to be able to upload data while preserving order
-export const Assets = z.map(AssetId, z.union([z.undefined(), Asset]));
+export const Assets = z.map(AssetId, Asset);
export type Assets = z.infer<typeof Assets>;
diff --git a/packages/react-sdk/src/css/css.ts b/packages/react-sdk/src/css/css.ts
index f093a4e092..e67aa5f9e0 100644
--- a/packages/react-sdk/src/css/css.ts
+++ b/packages/react-sdk/src/css/css.ts
@@ -43,9 +43,7 @@ export const createImageValueTransformer =
};
export const generateCssText = (data: Data, options: CssOptions) => {
- const assets = new Map<Asset["id"], Asset>(
- data.assets.map((asset) => [asset.id, asset])
- );
+ const assets: Assets = new Map(data.assets.map((asset) => [asset.id, asset]));
const breakpoints = new Map(data.breakpoints);
const styles = new Map(data.styles);
const styleSourceSelections = new Map(data.styleSourceSelections);
diff --git a/packages/react-sdk/src/css/global-rules.ts b/packages/react-sdk/src/css/global-rules.ts
index f5cff31a24..0f4ba420b3 100644
--- a/packages/react-sdk/src/css/global-rules.ts
+++ b/packages/react-sdk/src/css/global-rules.ts
@@ -14,7 +14,7 @@ export const addGlobalRules = (
const fontAssets: FontAsset[] = [];
for (const asset of assets.values()) {
- if (asset?.type === "font") {
+ if (asset.type === "font") {
fontAssets.push(asset);
}
}