@wix/himalaya-cli 0.1071.0 → 0.1073.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/dev-server/src/app-config.d.ts +18 -0
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/wix-sdk/events/src/index.d.ts +21 -3
- package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/wix-events.mjs +4 -2
- package/dist/cli.mjs +114 -42
- package/dist/preview-assets.generated.bin +0 -0
- package/guides/sdk-reference.json +17 -5
- package/package.json +2 -2
- package/templates/beauty-salon/dev/index.ts +1 -0
- package/templates/beauty-salon-owner/dev/index.ts +64 -0
- package/templates/beauty-salon-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/beauty-salon-owner/tier5-src/himi-owner-lite-product-form/index.ts +24 -5
- package/templates/community-club-owner/dev/index.ts +96 -0
- package/templates/community-club-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/community-club-owner/tier5-src/himi-owner-lite-event-form/index.ts +44 -10
- package/templates/community-club-owner/tier5-src/himi-owner-lite-product-form/index.ts +24 -5
- package/templates/events-meetups-owner/dev/index.ts +32 -0
- package/templates/events-meetups-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/events-meetups-owner/tier5-src/himi-owner-lite-event-form/index.ts +44 -10
- package/templates/gym-fitness/dev/index.ts +1 -0
- package/templates/gym-fitness-owner/dev/index.ts +96 -0
- package/templates/gym-fitness-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/gym-fitness-owner/tier5-src/himi-owner-lite-event-form/index.ts +44 -10
- package/templates/gym-fitness-owner/tier5-src/himi-owner-lite-product-form/index.ts +24 -5
- package/templates/nonprofit-cause-owner/dev/index.ts +32 -0
- package/templates/nonprofit-cause-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-event-form/index.ts +44 -10
- package/templates/owner-lite/dev/index.ts +192 -0
- package/templates/owner-lite/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/owner-lite/tier5-src/himi-owner-lite-event-form/index.ts +44 -10
- package/templates/owner-lite/tier5-src/himi-owner-lite-faq-question-form/index.ts +18 -5
- package/templates/owner-lite/tier5-src/himi-owner-lite-product-form/index.ts +24 -5
- package/templates/podcast-creator-owner/dev/index.ts +96 -0
- package/templates/podcast-creator-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/podcast-creator-owner/tier5-src/himi-owner-lite-event-form/index.ts +44 -10
- package/templates/podcast-creator-owner/tier5-src/himi-owner-lite-product-form/index.ts +24 -5
- package/templates/portfolio-creative-owner/dev/index.ts +64 -0
- package/templates/portfolio-creative-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/portfolio-creative-owner/tier5-src/himi-owner-lite-product-form/index.ts +24 -5
- package/templates/restaurant/dev/index.ts +1 -0
- package/templates/restaurant-owner/dev/index.ts +96 -0
- package/templates/restaurant-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/restaurant-owner/tier5-src/himi-owner-lite-event-form/index.ts +44 -10
- package/templates/restaurant-owner/tier5-src/himi-owner-lite-product-form/index.ts +24 -5
- package/templates/retail-store-owner/dev/index.ts +64 -0
- package/templates/retail-store-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/retail-store-owner/tier5-src/himi-owner-lite-product-form/index.ts +24 -5
- package/templates/yoga-studio-owner/dev/index.ts +32 -0
- package/templates/yoga-studio-owner/tier5-src/_shared/owner-rich-guard.ts +64 -0
- package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-event-form/index.ts +44 -10
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
type WixProductWrite,
|
|
17
17
|
} from "@himalaya/wix-stores";
|
|
18
18
|
import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
|
|
19
|
-
import {
|
|
19
|
+
import { htmlIsTrivial, htmlPreviewText } from "../_shared/owner-rich-guard.js";
|
|
20
20
|
import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
|
|
21
21
|
import { DEMO_PRODUCTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch, editablePrice } from "../_shared/owner-preview-demo.js";
|
|
22
22
|
import { stashCopy, copyParam } from "../_shared/himi-copy.js";
|
|
@@ -46,6 +46,14 @@ interface ProductFormState {
|
|
|
46
46
|
price: string;
|
|
47
47
|
sku: string;
|
|
48
48
|
description: string;
|
|
49
|
+
/** [rico] #3363 — the description as loaded (or last saved). A save sends `description` only
|
|
50
|
+
* when the submitted value differs from it, so an untouched body is never re-written. */
|
|
51
|
+
originalDescription: string;
|
|
52
|
+
/** A rich HTML description (more than one bare `<p>`) the plain field would flatten: it loads
|
|
53
|
+
* locked, the descriptor shows `description` as a preview + `descriptionNote`, and an edit is refused. */
|
|
54
|
+
descriptionProtected: boolean;
|
|
55
|
+
descriptionEditable: boolean;
|
|
56
|
+
descriptionNote: string;
|
|
49
57
|
visible: string;
|
|
50
58
|
status: "idle" | "loading" | "saving" | "saved" | "error";
|
|
51
59
|
error: string;
|
|
@@ -115,6 +123,10 @@ function shape(s: Partial<ProductFormState>): ProductFormState {
|
|
|
115
123
|
price: s.price ?? "",
|
|
116
124
|
sku: s.sku ?? "",
|
|
117
125
|
description: s.description ?? "",
|
|
126
|
+
originalDescription: s.originalDescription ?? s.description ?? "",
|
|
127
|
+
descriptionProtected: s.descriptionProtected ?? false,
|
|
128
|
+
descriptionEditable: !(s.descriptionProtected ?? false),
|
|
129
|
+
descriptionNote: s.descriptionProtected ? copyParam("ownerProductForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; name, price and SKU can be changed here.") : "",
|
|
118
130
|
visible: s.visible ?? "true",
|
|
119
131
|
status: s.status ?? "idle",
|
|
120
132
|
error: s.error ?? "",
|
|
@@ -177,7 +189,7 @@ const svc = defineService<ProductFormState, {
|
|
|
177
189
|
name: (p as any).name ?? "",
|
|
178
190
|
price: priceOf(p),
|
|
179
191
|
sku: (p as any).sku ?? "",
|
|
180
|
-
description:
|
|
192
|
+
...((html: string) => ({ description: htmlPreviewText(html), originalDescription: htmlPreviewText(html), descriptionProtected: !htmlIsTrivial(html) }))(String((p as any).description ?? "")),
|
|
181
193
|
visible: (p as any).visible !== false ? "true" : "false",
|
|
182
194
|
status: "idle",
|
|
183
195
|
error: "",
|
|
@@ -190,6 +202,8 @@ const svc = defineService<ProductFormState, {
|
|
|
190
202
|
return shape({
|
|
191
203
|
...s, mode: "edit", id, heading: "Edit product",
|
|
192
204
|
name: String(cached.name ?? ""), price: editablePrice(String(cached.price ?? "")), sku: String(cached.sku ?? ""),
|
|
205
|
+
// An older cached row carries no verdict, so it stays locked: fail closed.
|
|
206
|
+
description: String(cached.description ?? ""), originalDescription: String(cached.description ?? ""), descriptionProtected: cached.descriptionProtected !== "false",
|
|
193
207
|
visible: cached.visible === "false" ? "false" : "true",
|
|
194
208
|
status: "idle", error: "", savedMessage: "",
|
|
195
209
|
});
|
|
@@ -217,6 +231,9 @@ const svc = defineService<ProductFormState, {
|
|
|
217
231
|
const price = editablePrice(rawPrice);
|
|
218
232
|
const sku = String(v.sku ?? s.sku).trim();
|
|
219
233
|
const description = String(v.description ?? s.description).trim();
|
|
234
|
+
// A queue replay boots a FRESH worker (empty baseline), so it carries the original verdict.
|
|
235
|
+
const descriptionEdited = typeof v.descriptionEdited === "string" ? v.descriptionEdited === "true" : description !== s.originalDescription.trim();
|
|
236
|
+
if (descriptionEdited && s.descriptionProtected) return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerProductForm.richDescriptionError", "This description has formatting or media. Edit it in your site dashboard to keep that content intact.") });
|
|
220
237
|
const visible = boolString(v.visible, s.visible) === "true";
|
|
221
238
|
if (!name) return shape({ ...s, status: "error", error: copyParam("ownerProductForm.nameRequired", "Name is required"), savedMessage: "" });
|
|
222
239
|
const priceNum = Number(price);
|
|
@@ -232,12 +249,12 @@ const svc = defineService<ProductFormState, {
|
|
|
232
249
|
priceData: { price: priceNum, currency: CURRENCY },
|
|
233
250
|
visible,
|
|
234
251
|
...(sku ? { sku } : {}),
|
|
235
|
-
...(
|
|
252
|
+
...(descriptionEdited ? { description } : {}),
|
|
236
253
|
...(s.mode === "edit" && s.id ? {} : { productType: "physical" }),
|
|
237
254
|
};
|
|
238
255
|
|
|
239
256
|
// Optimistic local write — the list repaints from cache immediately (offline or not).
|
|
240
|
-
const localRow = (id: string): DbEntity => ({ id, name, price, sku, visible: visible ? "true" : "false", statusLabel: visible ? "Visible" : "Hidden" });
|
|
257
|
+
const localRow = (id: string): DbEntity => ({ id, name, price, sku, description, descriptionProtected: s.descriptionProtected ? "true" : "false", visible: visible ? "true" : "false", statusLabel: visible ? "Visible" : "Hidden" });
|
|
241
258
|
const localId = s.mode === "edit" && s.id ? s.id : `local-${Date.now()}`;
|
|
242
259
|
await cachePut(localRow(localId));
|
|
243
260
|
try {
|
|
@@ -259,6 +276,7 @@ const svc = defineService<ProductFormState, {
|
|
|
259
276
|
price,
|
|
260
277
|
sku,
|
|
261
278
|
description,
|
|
279
|
+
originalDescription: descriptionEdited ? description : s.originalDescription,
|
|
262
280
|
visible: visible ? "true" : "false",
|
|
263
281
|
status: "saved",
|
|
264
282
|
error: "",
|
|
@@ -273,9 +291,10 @@ const svc = defineService<ProductFormState, {
|
|
|
273
291
|
if (s.demoNote) return demoRefusal(s);
|
|
274
292
|
// Real device offline: the optimistic cache row already shows; queue the
|
|
275
293
|
// write to replay (WriteQueue, idempotent) when connectivity returns.
|
|
276
|
-
await queueWrite("tier5.himiOwnerLiteProductForm.submit", { id: s.id, name, price, sku, visible: String(visible), mode: s.mode });
|
|
294
|
+
await queueWrite("tier5.himiOwnerLiteProductForm.submit", { id: s.id, name, price, sku, description, descriptionEdited: String(descriptionEdited), visible: String(visible), mode: s.mode });
|
|
277
295
|
return shape({
|
|
278
296
|
...s, mode: "edit", id: localId, name, price, sku, description,
|
|
297
|
+
originalDescription: descriptionEdited ? description : s.originalDescription,
|
|
279
298
|
visible: visible ? "true" : "false", status: "saved", error: "",
|
|
280
299
|
savedMessage: copyParam("ownerProductForm.savedOffline", "Saved offline — will sync when you reconnect."),
|
|
281
300
|
savedId: localId,
|
|
@@ -73953,6 +73953,35 @@ const SCREENS = runtimeSetting({
|
|
|
73953
73953
|
}
|
|
73954
73954
|
}
|
|
73955
73955
|
},
|
|
73956
|
+
{
|
|
73957
|
+
"id": "product_form.description_note",
|
|
73958
|
+
"body": {
|
|
73959
|
+
"package": "himalaya",
|
|
73960
|
+
"type": "Text",
|
|
73961
|
+
"props": {
|
|
73962
|
+
"text": "$service:himiOwnerLiteProductForm.descriptionNote",
|
|
73963
|
+
"style": "footnote",
|
|
73964
|
+
"color": "textSecondary",
|
|
73965
|
+
"collapseWhenEmpty": true
|
|
73966
|
+
}
|
|
73967
|
+
}
|
|
73968
|
+
},
|
|
73969
|
+
{
|
|
73970
|
+
"id": "product_form.description_preview",
|
|
73971
|
+
"body": {
|
|
73972
|
+
"package": "himalaya",
|
|
73973
|
+
"type": "Text",
|
|
73974
|
+
"props": {
|
|
73975
|
+
"text": "$service:himiOwnerLiteProductForm.description",
|
|
73976
|
+
"style": "body",
|
|
73977
|
+
"maxLines": 8,
|
|
73978
|
+
"collapseWhenEmpty": true
|
|
73979
|
+
}
|
|
73980
|
+
},
|
|
73981
|
+
"modifiers": {
|
|
73982
|
+
"hiddenPath": "$service:himiOwnerLiteProductForm.descriptionEditable"
|
|
73983
|
+
}
|
|
73984
|
+
},
|
|
73956
73985
|
{
|
|
73957
73986
|
"id": "product_form.form",
|
|
73958
73987
|
"body": {
|
|
@@ -74039,6 +74068,9 @@ const SCREENS = runtimeSetting({
|
|
|
74039
74068
|
"multilineMaxLines": 3
|
|
74040
74069
|
}
|
|
74041
74070
|
}
|
|
74071
|
+
},
|
|
74072
|
+
"modifiers": {
|
|
74073
|
+
"hiddenPath": "$service:himiOwnerLiteProductForm.descriptionProtected"
|
|
74042
74074
|
}
|
|
74043
74075
|
}
|
|
74044
74076
|
],
|
|
@@ -74566,6 +74598,35 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
|
|
|
74566
74598
|
}
|
|
74567
74599
|
}
|
|
74568
74600
|
},
|
|
74601
|
+
{
|
|
74602
|
+
"id": "product_form.description_note",
|
|
74603
|
+
"body": {
|
|
74604
|
+
"package": "himalaya",
|
|
74605
|
+
"type": "Text",
|
|
74606
|
+
"props": {
|
|
74607
|
+
"text": "$service:himiOwnerLiteProductForm.descriptionNote",
|
|
74608
|
+
"style": "footnote",
|
|
74609
|
+
"color": "textSecondary",
|
|
74610
|
+
"collapseWhenEmpty": true
|
|
74611
|
+
}
|
|
74612
|
+
}
|
|
74613
|
+
},
|
|
74614
|
+
{
|
|
74615
|
+
"id": "product_form.description_preview",
|
|
74616
|
+
"body": {
|
|
74617
|
+
"package": "himalaya",
|
|
74618
|
+
"type": "Text",
|
|
74619
|
+
"props": {
|
|
74620
|
+
"text": "$service:himiOwnerLiteProductForm.description",
|
|
74621
|
+
"style": "body",
|
|
74622
|
+
"maxLines": 8,
|
|
74623
|
+
"collapseWhenEmpty": true
|
|
74624
|
+
}
|
|
74625
|
+
},
|
|
74626
|
+
"modifiers": {
|
|
74627
|
+
"hiddenPath": "$service:himiOwnerLiteProductForm.descriptionEditable"
|
|
74628
|
+
}
|
|
74629
|
+
},
|
|
74569
74630
|
{
|
|
74570
74631
|
"id": "product_form.form",
|
|
74571
74632
|
"body": {
|
|
@@ -74652,6 +74713,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
|
|
|
74652
74713
|
"multilineMaxLines": 3
|
|
74653
74714
|
}
|
|
74654
74715
|
}
|
|
74716
|
+
},
|
|
74717
|
+
"modifiers": {
|
|
74718
|
+
"hiddenPath": "$service:himiOwnerLiteProductForm.descriptionProtected"
|
|
74655
74719
|
}
|
|
74656
74720
|
}
|
|
74657
74721
|
],
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
// [rico] #3363 — may a plain owner form round-trip this body? Ricos uses owner-post-content's
|
|
2
|
+
// hasRichBody; these cover the Stores HTML description and the FAQ's legacy DraftJS answer.
|
|
3
|
+
// [rico] #3365 moves htmlIsTrivial into @himalaya/wix-rich-content with these exact semantics.
|
|
4
|
+
|
|
5
|
+
/** A tag opener (`<p`, `</p`, `<!--`), as opposed to a bare `<` in prose ("cups < 8 cm"). */
|
|
6
|
+
const TAG = /<[a-z!/?]/i;
|
|
7
|
+
|
|
8
|
+
/** True when a plain text field can hold this HTML without losing anything: empty, bare text
|
|
9
|
+
* (no tag — a lone `<` in prose is text), or exactly one attribute-less `<p>…</p>` with no
|
|
10
|
+
* inner tags. */
|
|
11
|
+
export function htmlIsTrivial(html: string | null | undefined): boolean {
|
|
12
|
+
const s = (html ?? "").trim();
|
|
13
|
+
return !s || !TAG.test(s) || /^<p>[^<>]*<\/p>$/.test(s);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
const ENTITIES: Record<string, string> = { " ": " ", "&": "&", "<": "<", ">": ">", """: "\"", "'": "'" };
|
|
17
|
+
|
|
18
|
+
/** Read-only preview text for an HTML body: block closes become lines, tags are stripped (a bare
|
|
19
|
+
* `<` in prose is kept), the basic entities decode, and blank lines drop. */
|
|
20
|
+
export function htmlPreviewText(html: string | null | undefined): string {
|
|
21
|
+
return (html ?? "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|h[1-6]|li|div|blockquote|pre|tr)>/gi, "\n")
|
|
22
|
+
.replace(/<\/?[a-z!?][^>]*>/gi, "").replace(/&(nbsp|amp|lt|gt|quot|#39);/g, (m) => ENTITIES[m] ?? m)
|
|
23
|
+
.split("\n").map((l) => l.replace(/\s+/g, " ").trim()).filter(Boolean).join("\n");
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
type RicosNode = { type?: unknown; nodes?: unknown; textData?: { decorations?: unknown }; paragraphData?: unknown; [key: string]: unknown };
|
|
27
|
+
const onlyKeys = (o: object, allowed: string[]) => Object.keys(o).every((k) => allowed.includes(k));
|
|
28
|
+
const emptyObject = (v: unknown) => v === undefined || (!!v && typeof v === "object" && Object.keys(v as object).length === 0);
|
|
29
|
+
|
|
30
|
+
/** The paragraph styling a PLAIN paragraph still carries on the Ricos wire (Events v3 sends
|
|
31
|
+
* `{ textStyle: { textAlignment: "AUTO" }, indentation: 0 }` on every paragraph). */
|
|
32
|
+
function defaultParagraphData(pd: unknown): boolean {
|
|
33
|
+
if (pd === undefined) return true;
|
|
34
|
+
if (!pd || typeof pd !== "object" || !onlyKeys(pd, ["textStyle", "indentation"])) return false;
|
|
35
|
+
const { textStyle, indentation } = pd as { textStyle?: unknown; indentation?: unknown };
|
|
36
|
+
if (indentation !== undefined && indentation !== 0) return false;
|
|
37
|
+
if (textStyle === undefined) return true;
|
|
38
|
+
if (!textStyle || typeof textStyle !== "object" || !onlyKeys(textStyle, ["textAlignment"])) return false;
|
|
39
|
+
const align = (textStyle as { textAlignment?: unknown }).textAlignment;
|
|
40
|
+
return align === undefined || align === "AUTO";
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** True when a plain text field can round-trip this Ricos document: no document styling, and
|
|
44
|
+
* only paragraphs of undecorated text whose paragraph data is the wire default. Anything else —
|
|
45
|
+
* a heading, list, link, bold run, media node, alignment or indent — is rich. */
|
|
46
|
+
export function ricosIsPlain(doc: { nodes?: unknown; documentStyle?: unknown } | null | undefined): boolean {
|
|
47
|
+
if (!doc || !emptyObject(doc.documentStyle)) return false;
|
|
48
|
+
const nodes = Array.isArray(doc.nodes) ? (doc.nodes as RicosNode[]) : [];
|
|
49
|
+
return nodes.every((n) => !!n && typeof n === "object" && n.type === "PARAGRAPH"
|
|
50
|
+
&& onlyKeys(n, ["type", "id", "nodes", "paragraphData"]) && defaultParagraphData(n.paragraphData)
|
|
51
|
+
&& (Array.isArray(n.nodes) ? (n.nodes as RicosNode[]) : []).every((t) => !!t && typeof t === "object" && t.type === "TEXT"
|
|
52
|
+
&& onlyKeys(t, ["type", "id", "textData", "nodes"]) && (!Array.isArray(t.nodes) || t.nodes.length === 0)
|
|
53
|
+
&& !(Array.isArray(t.textData?.decorations) && t.textData.decorations.length)));
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** Preview text for a legacy DraftJS document: its `blocks[].text` joined by a blank line, or ""
|
|
57
|
+
* when the payload is not DraftJS JSON (never a throw). */
|
|
58
|
+
export function draftjsText(raw: string | null | undefined): string {
|
|
59
|
+
try {
|
|
60
|
+
const doc = JSON.parse(raw ?? "") as { blocks?: Array<{ text?: unknown }> } | null;
|
|
61
|
+
const blocks = Array.isArray(doc?.blocks) ? doc.blocks : [];
|
|
62
|
+
return blocks.map((b) => (typeof b?.text === "string" ? b.text : "")).join("\n\n").trim();
|
|
63
|
+
} catch { return ""; }
|
|
64
|
+
}
|
|
@@ -16,7 +16,7 @@ import {
|
|
|
16
16
|
type WixProductWrite,
|
|
17
17
|
} from "@himalaya/wix-stores";
|
|
18
18
|
import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
|
|
19
|
-
import {
|
|
19
|
+
import { htmlIsTrivial, htmlPreviewText } from "../_shared/owner-rich-guard.js";
|
|
20
20
|
import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
|
|
21
21
|
import { DEMO_PRODUCTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch, editablePrice } from "../_shared/owner-preview-demo.js";
|
|
22
22
|
import { stashCopy, copyParam } from "../_shared/himi-copy.js";
|
|
@@ -46,6 +46,14 @@ interface ProductFormState {
|
|
|
46
46
|
price: string;
|
|
47
47
|
sku: string;
|
|
48
48
|
description: string;
|
|
49
|
+
/** [rico] #3363 — the description as loaded (or last saved). A save sends `description` only
|
|
50
|
+
* when the submitted value differs from it, so an untouched body is never re-written. */
|
|
51
|
+
originalDescription: string;
|
|
52
|
+
/** A rich HTML description (more than one bare `<p>`) the plain field would flatten: it loads
|
|
53
|
+
* locked, the descriptor shows `description` as a preview + `descriptionNote`, and an edit is refused. */
|
|
54
|
+
descriptionProtected: boolean;
|
|
55
|
+
descriptionEditable: boolean;
|
|
56
|
+
descriptionNote: string;
|
|
49
57
|
visible: string;
|
|
50
58
|
status: "idle" | "loading" | "saving" | "saved" | "error";
|
|
51
59
|
error: string;
|
|
@@ -115,6 +123,10 @@ function shape(s: Partial<ProductFormState>): ProductFormState {
|
|
|
115
123
|
price: s.price ?? "",
|
|
116
124
|
sku: s.sku ?? "",
|
|
117
125
|
description: s.description ?? "",
|
|
126
|
+
originalDescription: s.originalDescription ?? s.description ?? "",
|
|
127
|
+
descriptionProtected: s.descriptionProtected ?? false,
|
|
128
|
+
descriptionEditable: !(s.descriptionProtected ?? false),
|
|
129
|
+
descriptionNote: s.descriptionProtected ? copyParam("ownerProductForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; name, price and SKU can be changed here.") : "",
|
|
118
130
|
visible: s.visible ?? "true",
|
|
119
131
|
status: s.status ?? "idle",
|
|
120
132
|
error: s.error ?? "",
|
|
@@ -177,7 +189,7 @@ const svc = defineService<ProductFormState, {
|
|
|
177
189
|
name: (p as any).name ?? "",
|
|
178
190
|
price: priceOf(p),
|
|
179
191
|
sku: (p as any).sku ?? "",
|
|
180
|
-
description:
|
|
192
|
+
...((html: string) => ({ description: htmlPreviewText(html), originalDescription: htmlPreviewText(html), descriptionProtected: !htmlIsTrivial(html) }))(String((p as any).description ?? "")),
|
|
181
193
|
visible: (p as any).visible !== false ? "true" : "false",
|
|
182
194
|
status: "idle",
|
|
183
195
|
error: "",
|
|
@@ -190,6 +202,8 @@ const svc = defineService<ProductFormState, {
|
|
|
190
202
|
return shape({
|
|
191
203
|
...s, mode: "edit", id, heading: "Edit product",
|
|
192
204
|
name: String(cached.name ?? ""), price: editablePrice(String(cached.price ?? "")), sku: String(cached.sku ?? ""),
|
|
205
|
+
// An older cached row carries no verdict, so it stays locked: fail closed.
|
|
206
|
+
description: String(cached.description ?? ""), originalDescription: String(cached.description ?? ""), descriptionProtected: cached.descriptionProtected !== "false",
|
|
193
207
|
visible: cached.visible === "false" ? "false" : "true",
|
|
194
208
|
status: "idle", error: "", savedMessage: "",
|
|
195
209
|
});
|
|
@@ -217,6 +231,9 @@ const svc = defineService<ProductFormState, {
|
|
|
217
231
|
const price = editablePrice(rawPrice);
|
|
218
232
|
const sku = String(v.sku ?? s.sku).trim();
|
|
219
233
|
const description = String(v.description ?? s.description).trim();
|
|
234
|
+
// A queue replay boots a FRESH worker (empty baseline), so it carries the original verdict.
|
|
235
|
+
const descriptionEdited = typeof v.descriptionEdited === "string" ? v.descriptionEdited === "true" : description !== s.originalDescription.trim();
|
|
236
|
+
if (descriptionEdited && s.descriptionProtected) return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerProductForm.richDescriptionError", "This description has formatting or media. Edit it in your site dashboard to keep that content intact.") });
|
|
220
237
|
const visible = boolString(v.visible, s.visible) === "true";
|
|
221
238
|
if (!name) return shape({ ...s, status: "error", error: copyParam("ownerProductForm.nameRequired", "Name is required"), savedMessage: "" });
|
|
222
239
|
const priceNum = Number(price);
|
|
@@ -232,12 +249,12 @@ const svc = defineService<ProductFormState, {
|
|
|
232
249
|
priceData: { price: priceNum, currency: CURRENCY },
|
|
233
250
|
visible,
|
|
234
251
|
...(sku ? { sku } : {}),
|
|
235
|
-
...(
|
|
252
|
+
...(descriptionEdited ? { description } : {}),
|
|
236
253
|
...(s.mode === "edit" && s.id ? {} : { productType: "physical" }),
|
|
237
254
|
};
|
|
238
255
|
|
|
239
256
|
// Optimistic local write — the list repaints from cache immediately (offline or not).
|
|
240
|
-
const localRow = (id: string): DbEntity => ({ id, name, price, sku, visible: visible ? "true" : "false", statusLabel: visible ? "Visible" : "Hidden" });
|
|
257
|
+
const localRow = (id: string): DbEntity => ({ id, name, price, sku, description, descriptionProtected: s.descriptionProtected ? "true" : "false", visible: visible ? "true" : "false", statusLabel: visible ? "Visible" : "Hidden" });
|
|
241
258
|
const localId = s.mode === "edit" && s.id ? s.id : `local-${Date.now()}`;
|
|
242
259
|
await cachePut(localRow(localId));
|
|
243
260
|
try {
|
|
@@ -259,6 +276,7 @@ const svc = defineService<ProductFormState, {
|
|
|
259
276
|
price,
|
|
260
277
|
sku,
|
|
261
278
|
description,
|
|
279
|
+
originalDescription: descriptionEdited ? description : s.originalDescription,
|
|
262
280
|
visible: visible ? "true" : "false",
|
|
263
281
|
status: "saved",
|
|
264
282
|
error: "",
|
|
@@ -273,9 +291,10 @@ const svc = defineService<ProductFormState, {
|
|
|
273
291
|
if (s.demoNote) return demoRefusal(s);
|
|
274
292
|
// Real device offline: the optimistic cache row already shows; queue the
|
|
275
293
|
// write to replay (WriteQueue, idempotent) when connectivity returns.
|
|
276
|
-
await queueWrite("tier5.himiOwnerLiteProductForm.submit", { id: s.id, name, price, sku, visible: String(visible), mode: s.mode });
|
|
294
|
+
await queueWrite("tier5.himiOwnerLiteProductForm.submit", { id: s.id, name, price, sku, description, descriptionEdited: String(descriptionEdited), visible: String(visible), mode: s.mode });
|
|
277
295
|
return shape({
|
|
278
296
|
...s, mode: "edit", id: localId, name, price, sku, description,
|
|
297
|
+
originalDescription: descriptionEdited ? description : s.originalDescription,
|
|
279
298
|
visible: visible ? "true" : "false", status: "saved", error: "",
|
|
280
299
|
savedMessage: copyParam("ownerProductForm.savedOffline", "Saved offline — will sync when you reconnect."),
|
|
281
300
|
savedId: localId,
|
|
@@ -76531,6 +76531,35 @@ const SCREENS = runtimeSetting({
|
|
|
76531
76531
|
}
|
|
76532
76532
|
}
|
|
76533
76533
|
},
|
|
76534
|
+
{
|
|
76535
|
+
"id": "product_form.description_note",
|
|
76536
|
+
"body": {
|
|
76537
|
+
"package": "himalaya",
|
|
76538
|
+
"type": "Text",
|
|
76539
|
+
"props": {
|
|
76540
|
+
"text": "$service:himiOwnerLiteProductForm.descriptionNote",
|
|
76541
|
+
"style": "footnote",
|
|
76542
|
+
"color": "textSecondary",
|
|
76543
|
+
"collapseWhenEmpty": true
|
|
76544
|
+
}
|
|
76545
|
+
}
|
|
76546
|
+
},
|
|
76547
|
+
{
|
|
76548
|
+
"id": "product_form.description_preview",
|
|
76549
|
+
"body": {
|
|
76550
|
+
"package": "himalaya",
|
|
76551
|
+
"type": "Text",
|
|
76552
|
+
"props": {
|
|
76553
|
+
"text": "$service:himiOwnerLiteProductForm.description",
|
|
76554
|
+
"style": "body",
|
|
76555
|
+
"maxLines": 8,
|
|
76556
|
+
"collapseWhenEmpty": true
|
|
76557
|
+
}
|
|
76558
|
+
},
|
|
76559
|
+
"modifiers": {
|
|
76560
|
+
"hiddenPath": "$service:himiOwnerLiteProductForm.descriptionEditable"
|
|
76561
|
+
}
|
|
76562
|
+
},
|
|
76534
76563
|
{
|
|
76535
76564
|
"id": "product_form.form",
|
|
76536
76565
|
"body": {
|
|
@@ -76617,6 +76646,9 @@ const SCREENS = runtimeSetting({
|
|
|
76617
76646
|
"multilineMaxLines": 3
|
|
76618
76647
|
}
|
|
76619
76648
|
}
|
|
76649
|
+
},
|
|
76650
|
+
"modifiers": {
|
|
76651
|
+
"hiddenPath": "$service:himiOwnerLiteProductForm.descriptionProtected"
|
|
76620
76652
|
}
|
|
76621
76653
|
}
|
|
76622
76654
|
],
|
|
@@ -77145,6 +77177,35 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
|
|
|
77145
77177
|
}
|
|
77146
77178
|
}
|
|
77147
77179
|
},
|
|
77180
|
+
{
|
|
77181
|
+
"id": "product_form.description_note",
|
|
77182
|
+
"body": {
|
|
77183
|
+
"package": "himalaya",
|
|
77184
|
+
"type": "Text",
|
|
77185
|
+
"props": {
|
|
77186
|
+
"text": "$service:himiOwnerLiteProductForm.descriptionNote",
|
|
77187
|
+
"style": "footnote",
|
|
77188
|
+
"color": "textSecondary",
|
|
77189
|
+
"collapseWhenEmpty": true
|
|
77190
|
+
}
|
|
77191
|
+
}
|
|
77192
|
+
},
|
|
77193
|
+
{
|
|
77194
|
+
"id": "product_form.description_preview",
|
|
77195
|
+
"body": {
|
|
77196
|
+
"package": "himalaya",
|
|
77197
|
+
"type": "Text",
|
|
77198
|
+
"props": {
|
|
77199
|
+
"text": "$service:himiOwnerLiteProductForm.description",
|
|
77200
|
+
"style": "body",
|
|
77201
|
+
"maxLines": 8,
|
|
77202
|
+
"collapseWhenEmpty": true
|
|
77203
|
+
}
|
|
77204
|
+
},
|
|
77205
|
+
"modifiers": {
|
|
77206
|
+
"hiddenPath": "$service:himiOwnerLiteProductForm.descriptionEditable"
|
|
77207
|
+
}
|
|
77208
|
+
},
|
|
77148
77209
|
{
|
|
77149
77210
|
"id": "product_form.form",
|
|
77150
77211
|
"body": {
|
|
@@ -77231,6 +77292,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
|
|
|
77231
77292
|
"multilineMaxLines": 3
|
|
77232
77293
|
}
|
|
77233
77294
|
}
|
|
77295
|
+
},
|
|
77296
|
+
"modifiers": {
|
|
77297
|
+
"hiddenPath": "$service:himiOwnerLiteProductForm.descriptionProtected"
|
|
77234
77298
|
}
|
|
77235
77299
|
}
|
|
77236
77300
|
],
|
|
@@ -77670,6 +77734,35 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
|
|
|
77670
77734
|
}
|
|
77671
77735
|
}
|
|
77672
77736
|
},
|
|
77737
|
+
{
|
|
77738
|
+
"id": "event_form.description_note",
|
|
77739
|
+
"body": {
|
|
77740
|
+
"package": "himalaya",
|
|
77741
|
+
"type": "Text",
|
|
77742
|
+
"props": {
|
|
77743
|
+
"text": "$service:himiOwnerLiteEventForm.descriptionNote",
|
|
77744
|
+
"style": "footnote",
|
|
77745
|
+
"color": "textSecondary",
|
|
77746
|
+
"collapseWhenEmpty": true
|
|
77747
|
+
}
|
|
77748
|
+
}
|
|
77749
|
+
},
|
|
77750
|
+
{
|
|
77751
|
+
"id": "event_form.description_preview",
|
|
77752
|
+
"body": {
|
|
77753
|
+
"package": "himalaya",
|
|
77754
|
+
"type": "Text",
|
|
77755
|
+
"props": {
|
|
77756
|
+
"text": "$service:himiOwnerLiteEventForm.description",
|
|
77757
|
+
"style": "body",
|
|
77758
|
+
"maxLines": 8,
|
|
77759
|
+
"collapseWhenEmpty": true
|
|
77760
|
+
}
|
|
77761
|
+
},
|
|
77762
|
+
"modifiers": {
|
|
77763
|
+
"hiddenPath": "$service:himiOwnerLiteEventForm.descriptionEditable"
|
|
77764
|
+
}
|
|
77765
|
+
},
|
|
77673
77766
|
{
|
|
77674
77767
|
"id": "event_form.form",
|
|
77675
77768
|
"body": {
|
|
@@ -77714,6 +77807,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
|
|
|
77714
77807
|
"multilineMaxLines": 3
|
|
77715
77808
|
}
|
|
77716
77809
|
}
|
|
77810
|
+
},
|
|
77811
|
+
"modifiers": {
|
|
77812
|
+
"hiddenPath": "$service:himiOwnerLiteEventForm.descriptionProtected"
|
|
77717
77813
|
}
|
|
77718
77814
|
}
|
|
77719
77815
|
],
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
// [rico] #3363 — may a plain owner form round-trip this body? Ricos uses owner-post-content's
|
|
2
|
+
// hasRichBody; these cover the Stores HTML description and the FAQ's legacy DraftJS answer.
|
|
3
|
+
// [rico] #3365 moves htmlIsTrivial into @himalaya/wix-rich-content with these exact semantics.
|
|
4
|
+
|
|
5
|
+
/** A tag opener (`<p`, `</p`, `<!--`), as opposed to a bare `<` in prose ("cups < 8 cm"). */
|
|
6
|
+
const TAG = /<[a-z!/?]/i;
|
|
7
|
+
|
|
8
|
+
/** True when a plain text field can hold this HTML without losing anything: empty, bare text
|
|
9
|
+
* (no tag — a lone `<` in prose is text), or exactly one attribute-less `<p>…</p>` with no
|
|
10
|
+
* inner tags. */
|
|
11
|
+
export function htmlIsTrivial(html: string | null | undefined): boolean {
|
|
12
|
+
const s = (html ?? "").trim();
|
|
13
|
+
return !s || !TAG.test(s) || /^<p>[^<>]*<\/p>$/.test(s);
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
const ENTITIES: Record<string, string> = { " ": " ", "&": "&", "<": "<", ">": ">", """: "\"", "'": "'" };
|
|
17
|
+
|
|
18
|
+
/** Read-only preview text for an HTML body: block closes become lines, tags are stripped (a bare
|
|
19
|
+
* `<` in prose is kept), the basic entities decode, and blank lines drop. */
|
|
20
|
+
export function htmlPreviewText(html: string | null | undefined): string {
|
|
21
|
+
return (html ?? "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|h[1-6]|li|div|blockquote|pre|tr)>/gi, "\n")
|
|
22
|
+
.replace(/<\/?[a-z!?][^>]*>/gi, "").replace(/&(nbsp|amp|lt|gt|quot|#39);/g, (m) => ENTITIES[m] ?? m)
|
|
23
|
+
.split("\n").map((l) => l.replace(/\s+/g, " ").trim()).filter(Boolean).join("\n");
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
type RicosNode = { type?: unknown; nodes?: unknown; textData?: { decorations?: unknown }; paragraphData?: unknown; [key: string]: unknown };
|
|
27
|
+
const onlyKeys = (o: object, allowed: string[]) => Object.keys(o).every((k) => allowed.includes(k));
|
|
28
|
+
const emptyObject = (v: unknown) => v === undefined || (!!v && typeof v === "object" && Object.keys(v as object).length === 0);
|
|
29
|
+
|
|
30
|
+
/** The paragraph styling a PLAIN paragraph still carries on the Ricos wire (Events v3 sends
|
|
31
|
+
* `{ textStyle: { textAlignment: "AUTO" }, indentation: 0 }` on every paragraph). */
|
|
32
|
+
function defaultParagraphData(pd: unknown): boolean {
|
|
33
|
+
if (pd === undefined) return true;
|
|
34
|
+
if (!pd || typeof pd !== "object" || !onlyKeys(pd, ["textStyle", "indentation"])) return false;
|
|
35
|
+
const { textStyle, indentation } = pd as { textStyle?: unknown; indentation?: unknown };
|
|
36
|
+
if (indentation !== undefined && indentation !== 0) return false;
|
|
37
|
+
if (textStyle === undefined) return true;
|
|
38
|
+
if (!textStyle || typeof textStyle !== "object" || !onlyKeys(textStyle, ["textAlignment"])) return false;
|
|
39
|
+
const align = (textStyle as { textAlignment?: unknown }).textAlignment;
|
|
40
|
+
return align === undefined || align === "AUTO";
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** True when a plain text field can round-trip this Ricos document: no document styling, and
|
|
44
|
+
* only paragraphs of undecorated text whose paragraph data is the wire default. Anything else —
|
|
45
|
+
* a heading, list, link, bold run, media node, alignment or indent — is rich. */
|
|
46
|
+
export function ricosIsPlain(doc: { nodes?: unknown; documentStyle?: unknown } | null | undefined): boolean {
|
|
47
|
+
if (!doc || !emptyObject(doc.documentStyle)) return false;
|
|
48
|
+
const nodes = Array.isArray(doc.nodes) ? (doc.nodes as RicosNode[]) : [];
|
|
49
|
+
return nodes.every((n) => !!n && typeof n === "object" && n.type === "PARAGRAPH"
|
|
50
|
+
&& onlyKeys(n, ["type", "id", "nodes", "paragraphData"]) && defaultParagraphData(n.paragraphData)
|
|
51
|
+
&& (Array.isArray(n.nodes) ? (n.nodes as RicosNode[]) : []).every((t) => !!t && typeof t === "object" && t.type === "TEXT"
|
|
52
|
+
&& onlyKeys(t, ["type", "id", "textData", "nodes"]) && (!Array.isArray(t.nodes) || t.nodes.length === 0)
|
|
53
|
+
&& !(Array.isArray(t.textData?.decorations) && t.textData.decorations.length)));
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** Preview text for a legacy DraftJS document: its `blocks[].text` joined by a blank line, or ""
|
|
57
|
+
* when the payload is not DraftJS JSON (never a throw). */
|
|
58
|
+
export function draftjsText(raw: string | null | undefined): string {
|
|
59
|
+
try {
|
|
60
|
+
const doc = JSON.parse(raw ?? "") as { blocks?: Array<{ text?: unknown }> } | null;
|
|
61
|
+
const blocks = Array.isArray(doc?.blocks) ? doc.blocks : [];
|
|
62
|
+
return blocks.map((b) => (typeof b?.text === "string" ? b.text : "")).join("\n\n").trim();
|
|
63
|
+
} catch { return ""; }
|
|
64
|
+
}
|