@jytextiles/medusa-plugin-faire-store-sync 0.2.7 → 0.2.8

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.
@@ -65,6 +65,7 @@ const prepareProductStep = (0, workflows_sdk_1.createStep)("faire-prepare-produc
65
65
  "description",
66
66
  "status",
67
67
  "metadata",
68
+ "type.value",
68
69
  "tags.*",
69
70
  "variants.*",
70
71
  "variants.prices.*",
@@ -152,17 +153,22 @@ const prepareProductStep = (0, workflows_sdk_1.createStep)("faire-prepare-produc
152
153
  .filter((i) => i.url);
153
154
  // Resolve taxonomy_type.id — REQUIRED by Faire create. Priority:
154
155
  // product.metadata.faire_taxonomy_type_id (tt_… or a category name)
156
+ // → product.metadata.faire_category (name)
157
+ // → product.type.value (the native Medusa Product Type, matched by name)
155
158
  // → settings.default_category (id or name) → error.
159
+ // Product Type is the natural per-product carrier; the product widget lets an
160
+ // operator pin an exact `tt_…` id in metadata when the type name is ambiguous.
156
161
  const client = service.getClient(input.auth_mode);
157
162
  const categoryHint = metadata.faire_taxonomy_type_id ||
158
163
  metadata.faire_category ||
164
+ product.type?.value ||
159
165
  settings.default_category ||
160
166
  "";
161
167
  const taxonomyTypeId = await client.resolveTaxonomyTypeId(input.access_token, String(categoryHint));
162
168
  if (!taxonomyTypeId) {
163
- throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Faire requires a product category (taxonomy_type). Set a Faire " +
164
- "category in sync settings (default_category) or on the product " +
165
- "(metadata.faire_taxonomy_type_id a `tt_…` id or a category name).");
169
+ throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Faire requires a product category (taxonomy_type). Set the product's " +
170
+ "Type to a Faire category name, pick one from the Faire panel on the " +
171
+ "product page, or set a fallback category in Faire sync settings.");
166
172
  }
167
173
  const lifecycle_state = settings.follow_product_status !== false && product.status === "published"
168
174
  ? "PUBLISHED"
@@ -331,4 +337,4 @@ exports.syncProductToFaireWorkflow = (0, workflows_sdk_1.createWorkflow)(exports
331
337
  warnings: result.warnings,
332
338
  });
333
339
  });
334
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-product-to-faire.js","sourceRoot":"","sources":["../../../../src/workflows/sync-product-to-faire.ts"],"names":[],"mappings":"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"}
340
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-product-to-faire.js","sourceRoot":"","sources":["../../../../src/workflows/sync-product-to-faire.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jytextiles/medusa-plugin-faire-store-sync",
3
- "version": "0.2.7",
3
+ "version": "0.2.8",
4
4
  "publishConfig": {
5
5
  "access": "public",
6
6
  "registry": "https://registry.npmjs.org/"
@@ -17,7 +17,7 @@ export const faireApi = {
17
17
  connected: boolean
18
18
  brand: boolean
19
19
  wholesale_pricing: boolean
20
- shipping_policy: boolean
20
+ taxonomy: boolean
21
21
  ready_to_publish: boolean
22
22
  }
23
23
  }>("/admin/faire/status"),
@@ -203,13 +203,9 @@ const FaireBulkPage = () => {
203
203
  return (
204
204
  <RouteFocusModal prev="/settings/faire">
205
205
  <RouteFocusModal.Header>
206
- <div className="flex flex-col">
207
- <Heading>Bulk sync products to Faire</Heading>
208
- <Text className="text-ui-fg-subtle" size="small">
209
- Select products (or all matching) and push them to Faire as a
210
- background sync via the command bar.
211
- </Text>
212
- </div>
206
+ <RouteFocusModal.Title asChild>
207
+ <Heading level="h2">Bulk sync</Heading>
208
+ </RouteFocusModal.Title>
213
209
  </RouteFocusModal.Header>
214
210
  <RouteFocusModal.Body className="flex flex-1 flex-col overflow-hidden p-0">
215
211
  <DataTable instance={table}>
@@ -251,6 +247,20 @@ const FaireBulkPage = () => {
251
247
  ? `All ${count} selected`
252
248
  : `Select all ${count}`}
253
249
  </Button>
250
+ <Button
251
+ size="small"
252
+ onClick={() => {
253
+ if (!connected) {
254
+ toast.error("Faire is not connected")
255
+ return
256
+ }
257
+ pushMutation.mutate()
258
+ }}
259
+ disabled={!connected || targetCount === 0}
260
+ isLoading={pushMutation.isPending}
261
+ >
262
+ Push to Faire
263
+ </Button>
254
264
  </div>
255
265
  </div>
256
266
  {targetCount > 0 && (
@@ -31,7 +31,6 @@ const cleanSettings = (form: any) => {
31
31
  const out: any = { ...form }
32
32
  for (const key of [
33
33
  "default_brand_id",
34
- "default_shipping_policy_id",
35
34
  "default_category",
36
35
  ]) {
37
36
  if (!out[key] || out[key] === NONE) out[key] = null
@@ -56,7 +55,6 @@ type Status = {
56
55
  connected: boolean
57
56
  brand: boolean
58
57
  wholesale_pricing: boolean
59
- shipping_policy: boolean
60
58
  taxonomy: boolean
61
59
  ready_to_publish: boolean
62
60
  }
@@ -139,7 +137,6 @@ const FaireSyncSettingsDrawer = () => {
139
137
  <ChecklistItem ok={status?.readiness.connected} label="Faire connected" />
140
138
  <ChecklistItem ok={status?.readiness.brand} label="Brand configured" />
141
139
  <ChecklistItem ok={status?.readiness.wholesale_pricing} label="Wholesale pricing" />
142
- <ChecklistItem ok={status?.readiness.shipping_policy} label="Shipping policy" />
143
140
  <ChecklistItem ok={status?.readiness.taxonomy} label="Default category" />
144
141
  </div>
145
142
  </div>
@@ -213,25 +210,17 @@ const FaireSyncSettingsDrawer = () => {
213
210
  placeholder="e.g. 14"
214
211
  />
215
212
  </Field>
216
- <Field label="Default category (taxonomy)">
217
- <SelectField
218
- value={String(form.default_category ?? "")}
219
- onValueChange={(v) =>
220
- setForm({ ...form, default_category: v || null })
221
- }
222
- disabled={!connected}
223
- options={taxonomy.map((t: any) => ({ value: t.id, label: t.name }))}
224
- />
225
- </Field>
226
- <Field label="Shipping policy ID">
227
- <Input
228
- value={String(form.default_shipping_policy_id ?? "")}
229
- onChange={(e) =>
230
- setForm({ ...form, default_shipping_policy_id: e.target.value || null })
231
- }
232
- disabled={!connected}
233
- placeholder="sp_..."
234
- />
213
+ <Field label="Fallback category (taxonomy)">
214
+ <Tooltip content="Faire requires a category per product. Resolution order: product metadata → the product's Type (matched by name) → this fallback. Set the product Type or pick a category on the product page for accuracy.">
215
+ <SelectField
216
+ value={String(form.default_category ?? "")}
217
+ onValueChange={(v) =>
218
+ setForm({ ...form, default_category: v || null })
219
+ }
220
+ disabled={!connected}
221
+ options={taxonomy.map((t: any) => ({ value: t.id, label: t.name }))}
222
+ />
223
+ </Tooltip>
235
224
  </Field>
236
225
  <Field label="Follow product status">
237
226
  <Tooltip content="If on, published Medusa products are published on Faire; draft products sync as drafts.">
@@ -27,7 +27,7 @@ import {
27
27
  useQueryClient,
28
28
  } from "@tanstack/react-query"
29
29
  import { useState } from "react"
30
- import { useNavigate } from "react-router-dom"
30
+ import { Outlet, useNavigate } from "react-router-dom"
31
31
  import { faireApi } from "../../../lib/api"
32
32
  import { useFaireSyncColumns, FaireSyncRecord } from "./hooks/use-faire-sync-columns"
33
33
 
@@ -42,7 +42,7 @@ type Status = {
42
42
  connected: boolean
43
43
  brand: boolean
44
44
  wholesale_pricing: boolean
45
- shipping_policy: boolean
45
+ taxonomy: boolean
46
46
  ready_to_publish: boolean
47
47
  }
48
48
  }
@@ -181,6 +181,9 @@ const FaireSettingsPage = () => {
181
181
  ))}
182
182
  </div>
183
183
  </Container>
184
+ {/* Nested @-routes (the @settings drawer) render here so they overlay
185
+ the list instead of replacing it. */}
186
+ <Outlet />
184
187
  </div>
185
188
  )
186
189
  }
@@ -334,6 +337,10 @@ const FaireSettingsPage = () => {
334
337
  </Drawer.Content>
335
338
  </Drawer>
336
339
 
340
+ {/* Nested routes (e.g. @settings drawer) render here so they overlay the
341
+ list instead of navigating away and blanking the page. */}
342
+ <Outlet />
343
+
337
344
  <Toaster />
338
345
  </div>
339
346
  )
@@ -2,15 +2,24 @@ import { defineWidgetConfig } from "@medusajs/admin-sdk"
2
2
  import {
3
3
  Button,
4
4
  Container,
5
+ Drawer,
5
6
  Heading,
7
+ Input,
8
+ Label,
6
9
  Text,
7
10
  Alert,
11
+ Badge,
8
12
  StatusBadge,
9
13
  Tooltip,
14
+ clx,
15
+ toast,
10
16
  } from "@medusajs/ui"
11
17
  import { DetailWidgetProps, AdminProduct } from "@medusajs/framework/types"
12
18
  import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
13
- import { faireApi } from "../lib/api"
19
+ import { useMemo, useState } from "react"
20
+ import { faireApi, sdk } from "../lib/api"
21
+
22
+ const MAX_RENDERED = 60
14
23
 
15
24
  const badgeColor = (status?: string): "green" | "red" | "orange" | "grey" => {
16
25
  switch (status) {
@@ -83,6 +92,72 @@ const FaireProductWidget = ({ data }: DetailWidgetProps<AdminProduct>) => {
83
92
 
84
93
  const notReady = connected && readiness && !readiness.ready_to_publish
85
94
 
95
+ // ── Faire category (taxonomy_type) picker ────────────────────────────────
96
+ // Faire requires a category per product. Sync resolves it in this order:
97
+ // metadata.faire_taxonomy_type_id → metadata.faire_category →
98
+ // product Type (by name) → account fallback. This panel pins an exact
99
+ // `tt_…` id in metadata so the mapping is unambiguous.
100
+ const metadata: Record<string, any> = (data as any).metadata || {}
101
+ const productType: string | undefined = (data as any).type?.value
102
+
103
+ const [pickerOpen, setPickerOpen] = useState(false)
104
+ const [pickerSearch, setPickerSearch] = useState("")
105
+ // Local echo of the saved pin so the panel updates instantly (the parent
106
+ // product page's `data.metadata` only refreshes on its own refetch).
107
+ const [pinnedOverride, setPinnedOverride] = useState<string | null | undefined>(
108
+ undefined
109
+ )
110
+
111
+ const taxonomyQuery = useQuery({
112
+ queryKey: ["faire", "taxonomy"],
113
+ enabled: pickerOpen,
114
+ queryFn: async () => (await faireApi.taxonomy()).taxonomy ?? [],
115
+ })
116
+ const taxonomy = taxonomyQuery.data ?? []
117
+
118
+ const pinnedId: string | undefined =
119
+ pinnedOverride !== undefined
120
+ ? pinnedOverride ?? undefined
121
+ : metadata.faire_taxonomy_type_id
122
+ const pinnedName = useMemo(() => {
123
+ if (!pinnedId) return undefined
124
+ if (!/^tt_/.test(String(pinnedId))) return String(pinnedId)
125
+ return taxonomy.find((t: any) => t.id === pinnedId)?.name
126
+ }, [pinnedId, taxonomy])
127
+
128
+ // What the sync will actually use as the category source, for display.
129
+ const resolvedSource = pinnedId
130
+ ? { label: pinnedName || String(pinnedId), from: "pinned" as const }
131
+ : metadata.faire_category
132
+ ? { label: String(metadata.faire_category), from: "metadata" as const }
133
+ : productType
134
+ ? { label: productType, from: "type" as const }
135
+ : { label: "Account fallback", from: "fallback" as const }
136
+
137
+ const filteredTaxonomy = useMemo(() => {
138
+ const q = pickerSearch.trim().toLowerCase()
139
+ const list = q
140
+ ? taxonomy.filter((t: any) => t.name.toLowerCase().includes(q))
141
+ : taxonomy
142
+ return list.slice(0, MAX_RENDERED)
143
+ }, [taxonomy, pickerSearch])
144
+
145
+ const saveCategory = useMutation({
146
+ mutationFn: (value: string | null) =>
147
+ sdk.admin.product.update(data.id, {
148
+ metadata: { ...metadata, faire_taxonomy_type_id: value },
149
+ }),
150
+ onSuccess: (_res, value) => {
151
+ setPinnedOverride(value)
152
+ queryClient.invalidateQueries({ queryKey: ["product", data.id] })
153
+ setPickerOpen(false)
154
+ setPickerSearch("")
155
+ toast.success(value ? "Faire category set" : "Faire category cleared")
156
+ },
157
+ onError: (err: any) =>
158
+ toast.error("Failed to save category", { description: err?.message }),
159
+ })
160
+
86
161
  return (
87
162
  <Container className="divide-y p-0">
88
163
  <div className="flex items-center justify-between px-6 py-4">
@@ -150,6 +225,37 @@ const FaireProductWidget = ({ data }: DetailWidgetProps<AdminProduct>) => {
150
225
  </Alert>
151
226
  )}
152
227
 
228
+ {/* Faire category (taxonomy_type) */}
229
+ <div className="flex items-center justify-between gap-3 rounded-lg border px-3 py-2">
230
+ <div className="flex flex-col gap-0.5">
231
+ <div className="flex items-center gap-2">
232
+ <Text size="small" weight="plus">
233
+ Faire category
234
+ </Text>
235
+ <Badge size="2xsmall" color={resolvedSource.from === "fallback" ? "orange" : "grey"}>
236
+ {resolvedSource.from === "pinned"
237
+ ? "Pinned"
238
+ : resolvedSource.from === "type"
239
+ ? "From Type"
240
+ : resolvedSource.from === "metadata"
241
+ ? "Metadata"
242
+ : "Fallback"}
243
+ </Badge>
244
+ </div>
245
+ <Text size="small" className="text-ui-fg-subtle">
246
+ {resolvedSource.label}
247
+ </Text>
248
+ </div>
249
+ <Button
250
+ size="small"
251
+ variant="secondary"
252
+ disabled={!connected}
253
+ onClick={() => setPickerOpen(true)}
254
+ >
255
+ {pinnedId ? "Change" : "Set category"}
256
+ </Button>
257
+ </div>
258
+
153
259
  <div className="flex items-center gap-3">
154
260
  <Tooltip
155
261
  content={
@@ -169,6 +275,81 @@ const FaireProductWidget = ({ data }: DetailWidgetProps<AdminProduct>) => {
169
275
  </Tooltip>
170
276
  </div>
171
277
  </div>
278
+
279
+ {/* Category picker — searchable list from Faire's taxonomy API. */}
280
+ <Drawer open={pickerOpen} onOpenChange={setPickerOpen}>
281
+ <Drawer.Content>
282
+ <Drawer.Header>
283
+ <Drawer.Title>Pick a Faire category</Drawer.Title>
284
+ <Drawer.Description>
285
+ Search Faire's product taxonomy and pin an exact category to this
286
+ product.
287
+ </Drawer.Description>
288
+ </Drawer.Header>
289
+ <Drawer.Body className="flex flex-col gap-3 overflow-hidden">
290
+ <Input
291
+ type="search"
292
+ autoFocus
293
+ placeholder="Search categories…"
294
+ value={pickerSearch}
295
+ onChange={(e) => setPickerSearch(e.target.value)}
296
+ />
297
+ <div className="flex flex-col gap-1 overflow-y-auto">
298
+ {taxonomyQuery.isLoading ? (
299
+ <Text size="small" className="text-ui-fg-subtle px-1 py-2">
300
+ Loading categories…
301
+ </Text>
302
+ ) : filteredTaxonomy.length === 0 ? (
303
+ <Text size="small" className="text-ui-fg-subtle px-1 py-2">
304
+ No categories match “{pickerSearch}”.
305
+ </Text>
306
+ ) : (
307
+ filteredTaxonomy.map((t: any) => (
308
+ <button
309
+ key={t.id}
310
+ type="button"
311
+ onClick={() => saveCategory.mutate(t.id)}
312
+ disabled={saveCategory.isPending}
313
+ className={clx(
314
+ "flex items-center justify-between rounded-md px-3 py-2 text-left text-sm",
315
+ "hover:bg-ui-bg-base-hover",
316
+ t.id === pinnedId && "bg-ui-bg-highlight"
317
+ )}
318
+ >
319
+ <span>{t.name}</span>
320
+ {t.id === pinnedId && (
321
+ <Badge size="2xsmall" color="green">
322
+ Current
323
+ </Badge>
324
+ )}
325
+ </button>
326
+ ))
327
+ )}
328
+ {!taxonomyQuery.isLoading &&
329
+ taxonomy.length > filteredTaxonomy.length && (
330
+ <Text size="xsmall" className="text-ui-fg-muted px-1 py-1">
331
+ Showing {filteredTaxonomy.length} of {taxonomy.length} — refine
332
+ your search to narrow down.
333
+ </Text>
334
+ )}
335
+ </div>
336
+ </Drawer.Body>
337
+ <Drawer.Footer>
338
+ {pinnedId && (
339
+ <Button
340
+ variant="secondary"
341
+ onClick={() => saveCategory.mutate(null)}
342
+ isLoading={saveCategory.isPending}
343
+ >
344
+ Clear
345
+ </Button>
346
+ )}
347
+ <Drawer.Close asChild>
348
+ <Button variant="secondary">Cancel</Button>
349
+ </Drawer.Close>
350
+ </Drawer.Footer>
351
+ </Drawer.Content>
352
+ </Drawer>
172
353
  </Container>
173
354
  )
174
355
  }
@@ -13,7 +13,6 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
13
13
  const hasMarkup =
14
14
  settings.default_wholesale_markup_percent != null &&
15
15
  settings.default_wholesale_markup_percent > 0
16
- const hasShipping = !!settings.default_shipping_policy_id
17
16
  const hasTaxonomy = !!settings.default_category
18
17
 
19
18
  res.json({
@@ -41,7 +40,6 @@ export const GET = async (req: MedusaRequest, res: MedusaResponse) => {
41
40
  connected,
42
41
  brand: hasBrand,
43
42
  wholesale_pricing: hasMarkup,
44
- shipping_policy: hasShipping,
45
43
  taxonomy: hasTaxonomy,
46
44
  ready_to_publish: connected && hasBrand && hasTaxonomy,
47
45
  },
@@ -131,6 +131,7 @@ const prepareProductStep = createStep(
131
131
  "description",
132
132
  "status",
133
133
  "metadata",
134
+ "type.value",
134
135
  "tags.*",
135
136
  "variants.*",
136
137
  "variants.prices.*",
@@ -238,11 +239,16 @@ const prepareProductStep = createStep(
238
239
 
239
240
  // Resolve taxonomy_type.id — REQUIRED by Faire create. Priority:
240
241
  // product.metadata.faire_taxonomy_type_id (tt_… or a category name)
242
+ // → product.metadata.faire_category (name)
243
+ // → product.type.value (the native Medusa Product Type, matched by name)
241
244
  // → settings.default_category (id or name) → error.
245
+ // Product Type is the natural per-product carrier; the product widget lets an
246
+ // operator pin an exact `tt_…` id in metadata when the type name is ambiguous.
242
247
  const client = service.getClient(input.auth_mode)
243
248
  const categoryHint =
244
249
  metadata.faire_taxonomy_type_id ||
245
250
  metadata.faire_category ||
251
+ product.type?.value ||
246
252
  settings.default_category ||
247
253
  ""
248
254
  const taxonomyTypeId = await client.resolveTaxonomyTypeId(
@@ -252,9 +258,9 @@ const prepareProductStep = createStep(
252
258
  if (!taxonomyTypeId) {
253
259
  throw new MedusaError(
254
260
  MedusaError.Types.INVALID_DATA,
255
- "Faire requires a product category (taxonomy_type). Set a Faire " +
256
- "category in sync settings (default_category) or on the product " +
257
- "(metadata.faire_taxonomy_type_id a `tt_…` id or a category name)."
261
+ "Faire requires a product category (taxonomy_type). Set the product's " +
262
+ "Type to a Faire category name, pick one from the Faire panel on the " +
263
+ "product page, or set a fallback category in Faire sync settings."
258
264
  )
259
265
  }
260
266