@parallelworks/tandem-web 0.142.0 → 0.143.0

package/components/IssueFilters.js

@@ -1,17 +1,20 @@
 import { customersQuery as e, cyclesQuery as t, labelsQuery as n, projectsQuery as r, statusesQuery as i, teamsQuery as a } from "../api/queries.js";
-import { CalendarIcon as o, CycleIcon as s, FolderIcon as c, PriorityIcon as l, ProjectIcon as u, StatusIcon as d, TagIcon as f, UserIcon as p, UsersIcon as m, usePriorityNames as h } from "./icons.js";
-import { statusRef as g } from "../lib/refs.js";
-import { ProjectStatusIcon as _ } from "./Planning.js";
-import { usePeople as v } from "../lib/people.js";
-import { projectRef as y } from "../lib/projects.js";
-import { Avatar as b } from "@parallelworks/ui";
-import { useMemo as x } from "react";
-import { useTranslations as S } from "use-intl";
-import { jsx as C } from "react/jsx-runtime";
-import { useQuery as w } from "@tanstack/react-query";
-import { useListFilters as T } from "@parallelworks/ui/list";
+import { customFieldsQuery as o, fieldsFor as s, filterableKinds as c, formatFieldFilters as l, parseFieldFilters as u } from "../lib/customFields.js";
+import { issueTypesQuery as d } from "../lib/issueTypes.js";
+import { CalendarIcon as f, CycleIcon as ee, FolderIcon as p, PriorityIcon as m, ProjectIcon as h, StatusIcon as g, TagIcon as _, UserIcon as v, UsersIcon as y, usePriorityNames as te } from "./icons.js";
+import { TypeIcon as ne } from "./IssueTypes.js";
+import { statusRef as re } from "../lib/refs.js";
+import { ProjectStatusIcon as b } from "./Planning.js";
+import { usePeople as x } from "../lib/people.js";
+import { projectRef as S } from "../lib/projects.js";
+import { Avatar as C } from "@parallelworks/ui";
+import { useMemo as ie } from "react";
+import { useTranslations as w } from "use-intl";
+import { jsx as T } from "react/jsx-runtime";
+import { useQuery as E } from "@tanstack/react-query";
+import { useListFilters as D } from "@parallelworks/ui/list";
 // src/components/IssueFilters.tsx
-var E = [
+var O = (e) => `field:${e}`, k = [
 	"team",
 	"assignee",
 	"assigneeKind",
@@ -22,9 +25,11 @@ var E = [
 	"project",
 	"customer",
 	"cycle",
+	"type",
+	"fields",
 	"overdue"
-], D = (e) => `agent:${e}`;
-function O(e) {
+], A = (e) => `agent:${e}`;
+function j(e) {
 	let t = [], n = (e, n) => {
 		n && t.push({
 			field: e,
@@ -32,7 +37,7 @@ function O(e) {
 			values: [n]
 		});
 	};
-	n("team", e.team), n("assignee", e.assignee && (e.assigneeKind === "agent" ? D(e.assignee) : e.assignee)), n("creator", e.creator);
+	n("team", e.team), n("assignee", e.assignee && (e.assigneeKind === "agent" ? A(e.assignee) : e.assignee)), n("creator", e.creator);
 	for (let n of ["status", "priority"]) {
 		let r = e[n]?.split(",").filter(Boolean) ?? [];
 		r.length > 0 && t.push({
@@ -41,64 +46,85 @@ function O(e) {
 			values: r
 		});
 	}
-	return n("label", e.label), n("project", e.project), n("customer", e.customer), n("cycle", e.cycle), n("overdue", e.overdue), t;
+	n("label", e.label), n("project", e.project), n("customer", e.customer), n("cycle", e.cycle);
+	let r = e.type?.split(",").filter(Boolean) ?? [];
+	r.length > 0 && t.push({
+		field: "type",
+		op: "is",
+		values: r
+	});
+	let i = /* @__PURE__ */ new Map();
+	for (let t of u(e.fields)) i.set(t.field, [...i.get(t.field) ?? [], t.value]);
+	for (let [e, n] of i) t.push({
+		field: O(e),
+		op: "is",
+		values: n
+	});
+	return n("overdue", e.overdue), t;
 }
-function k(e) {
-	let t = {};
-	for (let n of e) {
-		let e = n.values[0];
-		if (e) switch (n.field) {
-			case "assignee":
-				e.startsWith("agent:") ? (t.assignee = e.slice(6), t.assigneeKind = "agent") : t.assignee = e;
-				break;
-			case "overdue":
-				e === "true" && (t.overdue = "true");
-				break;
-			case "status":
-			case "priority":
-				t[n.field] = n.values.join(",");
-				break;
-			case "team":
-			case "creator":
-			case "label":
-			case "project":
-			case "customer":
-			case "cycle": t[n.field] = e;
+function M(e) {
+	let t = {}, n = [];
+	for (let r of e) {
+		let e = r.values[0];
+		if (e) {
+			if (r.field.startsWith("field:")) for (let e of r.values) n.push({
+				field: r.field.slice(6),
+				value: e
+			});
+			else switch (r.field) {
+				case "assignee":
+					e.startsWith("agent:") ? (t.assignee = e.slice(6), t.assigneeKind = "agent") : t.assignee = e;
+					break;
+				case "overdue":
+					e === "true" && (t.overdue = "true");
+					break;
+				case "status":
+				case "priority":
+				case "type":
+					t[r.field] = r.values.join(",");
+					break;
+				case "team":
+				case "creator":
+				case "label":
+				case "project":
+				case "customer":
+				case "cycle": t[r.field] = e;
+			}
 		}
 	}
-	return t;
+	return n.length > 0 && (t.fields = l(n)), t;
 }
-function A(e, t) {
+function N(e, t) {
 	let n = { ...e };
-	for (let e of E) delete n[e];
+	for (let e of k) delete n[e];
 	return {
 		...n,
 		...t
 	};
 }
-function j(E, A, j, M = !1) {
-	let N = S("issueFilters"), P = S("planning"), { data: F = [] } = w(a(E)), { data: I = [] } = w(n(E)), { data: L = [] } = w(r(E)), { data: R = [] } = w(e(E)), z = F.find((e) => e.key === A.team), { data: B = [] } = w({
-		...t(E, z?.key ?? ""),
-		enabled: !!z?.cyclesEnabled
-	}), { data: V = [] } = w({
-		...i(E, z?.key ?? ""),
-		enabled: !!z
-	}), H = h(), { members: U, agents: W, person: G, agentName: K } = v(E), q = x(() => {
+function P(l, k, N, P = !1) {
+	let F = w("issueFilters"), I = w("planning"), { data: L = [] } = E(a(l)), { data: R = [] } = E(n(l)), { data: z = [] } = E(r(l)), { data: B = [] } = E(e(l)), V = L.find((e) => e.key === k.team), { data: H = [] } = E({
+		...t(l, V?.key ?? ""),
+		enabled: !!V?.cyclesEnabled
+	}), { data: U = [] } = E({
+		...i(l, V?.key ?? ""),
+		enabled: !!V
+	}), W = te(), { members: G, agents: K, person: q, agentName: J } = x(l), { data: Y } = E(o(l)), { data: X } = E(d(l)), Z = w("issueTypes"), Q = w("customFields"), ae = ie(() => {
 		let e = {
 			multiple: !1,
 			operators: ["is"]
-		}, t = (e) => e.name ? P("cycleNamed", {
+		}, t = (e) => e.name ? I("cycleNamed", {
 			number: e.number,
 			name: e.name
-		}) : P("cycle", { number: e.number }), n = [
+		}) : I("cycle", { number: e.number }), n = [
 			{
 				key: "team",
-				label: N("team"),
-				icon: /* @__PURE__ */ C(c, {}),
+				label: F("team"),
+				icon: /* @__PURE__ */ T(p, {}),
 				kind: "enum",
 				...e,
-				required: M,
-				options: F.filter((e) => !e.archivedAt).map((e) => ({
+				required: P,
+				options: L.filter((e) => !e.archivedAt).map((e) => ({
 					value: e.key,
 					label: e.name,
 					description: e.key
@@ -106,55 +132,55 @@ function j(E, A, j, M = !1) {
 			},
 			{
 				key: "assignee",
-				label: N("assignee"),
-				icon: /* @__PURE__ */ C(p, {}),
+				label: F("assignee"),
+				icon: /* @__PURE__ */ T(v, {}),
 				kind: "people",
 				...e,
-				options: [...U.map((e) => ({
+				options: [...G.map((e) => ({
 					value: e.user.username,
 					label: e.user.name,
-					group: N("people"),
-					icon: /* @__PURE__ */ C(b, {
+					group: F("people"),
+					icon: /* @__PURE__ */ T(C, {
 						name: e.user.name,
 						src: e.user.avatarUrl,
 						size: "xs",
 						decorative: !0
 					})
-				})), ...W.map((e) => ({
-					value: D(e.slug),
+				})), ...K.map((e) => ({
+					value: A(e.slug),
 					label: e.name,
-					group: N("agents"),
-					icon: /* @__PURE__ */ C(b, {
+					group: F("agents"),
+					icon: /* @__PURE__ */ T(C, {
 						name: e.name,
 						kind: "agent",
 						size: "xs",
 						decorative: !0
 					})
 				}))],
-				valueLabel: (e) => e.startsWith("agent:") ? K(e.slice(6)) : G(e).name
+				valueLabel: (e) => e.startsWith("agent:") ? J(e.slice(6)) : q(e).name
 			},
 			{
 				key: "creator",
-				label: N("creator"),
-				icon: /* @__PURE__ */ C(p, {}),
+				label: F("creator"),
+				icon: /* @__PURE__ */ T(v, {}),
 				kind: "people",
 				...e,
-				options: U.map((e) => ({
+				options: G.map((e) => ({
 					value: e.user.username,
 					label: e.user.name,
-					icon: /* @__PURE__ */ C(b, {
+					icon: /* @__PURE__ */ T(C, {
 						name: e.user.name,
 						src: e.user.avatarUrl,
 						size: "xs",
 						decorative: !0
 					})
 				})),
-				valueLabel: (e) => G(e).name
+				valueLabel: (e) => q(e).name
 			},
 			{
 				key: "priority",
-				label: N("priority"),
-				icon: /* @__PURE__ */ C(l, { priority: 2 }),
+				label: F("priority"),
+				icon: /* @__PURE__ */ T(m, { priority: 2 }),
 				kind: "enum",
 				operators: ["is"],
 				options: [
@@ -165,108 +191,170 @@ function j(E, A, j, M = !1) {
 					0
 				].map((e) => ({
 					value: String(e),
-					label: H[e] ?? "",
-					icon: /* @__PURE__ */ C(l, { priority: e })
+					label: W[e] ?? "",
+					icon: /* @__PURE__ */ T(m, { priority: e })
 				}))
 			},
 			{
 				key: "label",
-				label: N("label"),
-				icon: /* @__PURE__ */ C(f, {}),
+				label: F("label"),
+				icon: /* @__PURE__ */ T(_, {}),
 				kind: "enum",
 				...e,
-				options: I.map((e) => ({
+				options: R.map((e) => ({
 					value: e.name,
 					label: e.name,
-					icon: /* @__PURE__ */ C("span", {
+					icon: /* @__PURE__ */ T("span", {
 						className: "size-2 rounded-full",
 						style: { background: e.color }
 					})
 				})),
-				valueLabel: () => N("deletedLabel")
+				valueLabel: () => F("deletedLabel")
 			},
 			{
 				key: "project",
-				label: N("project"),
-				icon: /* @__PURE__ */ C(u, {}),
+				label: F("project"),
+				icon: /* @__PURE__ */ T(h, {}),
 				kind: "enum",
 				...e,
-				options: L.map((e) => ({
-					value: y(e),
+				options: z.map((e) => ({
+					value: S(e),
 					label: e.name,
-					icon: /* @__PURE__ */ C(_, { status: e.status })
+					icon: /* @__PURE__ */ T(b, { status: e.status })
 				}))
 			}
 		];
-		return (R.length > 0 || A.customer) && n.push({
+		(B.length > 0 || k.customer) && n.push({
 			key: "customer",
-			label: N("customer"),
-			icon: /* @__PURE__ */ C(m, {}),
+			label: F("customer"),
+			icon: /* @__PURE__ */ T(y, {}),
 			kind: "enum",
 			...e,
-			options: R.map((e) => ({
+			options: B.map((e) => ({
 				value: e.id,
 				label: e.name
 			}))
-		}), (z || A.status) && n.splice(3, 0, {
+		}), (V || k.status) && n.splice(3, 0, {
 			key: "status",
-			label: N("status"),
-			icon: /* @__PURE__ */ C(d, { category: "started" }),
+			label: F("status"),
+			icon: /* @__PURE__ */ T(g, { category: "started" }),
 			kind: "enum",
 			operators: ["is"],
-			options: V.map((e) => ({
-				value: g(e),
+			options: U.map((e) => ({
+				value: re(e),
 				label: e.name,
-				icon: /* @__PURE__ */ C(d, { category: e.category })
+				icon: /* @__PURE__ */ T(g, { category: e.category })
 			}))
-		}), (z?.cyclesEnabled || A.cycle) && n.push({
+		}), (V?.cyclesEnabled || k.cycle) && n.push({
 			key: "cycle",
-			label: N("cycle"),
-			icon: /* @__PURE__ */ C(s, {}),
+			label: F("cycle"),
+			icon: /* @__PURE__ */ T(ee, {}),
 			kind: "enum",
 			...e,
-			options: B.map((e) => ({
+			options: H.map((e) => ({
 				value: String(e.number),
 				label: t(e),
-				description: P(`states.${e.state}`)
+				description: I(`states.${e.state}`)
 			}))
-		}), n.push({
+		});
+		let r = (X ?? []).filter((e) => !e.archivedAt && (!V || e.teamIds.length === 0 || e.teamIds.includes(V.id)));
+		(r.length > 0 || k.type) && n.push({
+			key: "type",
+			label: Z("type"),
+			icon: /* @__PURE__ */ T(_, {}),
+			kind: "enum",
+			multiple: !0,
+			operators: ["is"],
+			options: [...r.map((e) => ({
+				value: e.id,
+				label: e.name,
+				icon: /* @__PURE__ */ T(ne, {
+					type: e,
+					className: "size-3.5"
+				})
+			})), {
+				value: "none",
+				label: Z("noType")
+			}]
+		});
+		let i = new Set(u(k.fields).map((e) => e.field));
+		for (let e of (Y ?? []).filter((e) => e.target === "issue" && c.includes(e.kind) && (s([e], "issue", V?.id).length > 0 || i.has(e.id)))) {
+			let t = {
+				value: "none",
+				label: Q("noValue")
+			};
+			n.push({
+				key: O(e.id),
+				label: e.name,
+				icon: /* @__PURE__ */ T(_, {}),
+				kind: "enum",
+				multiple: !0,
+				operators: ["is"],
+				options: e.kind === "person" ? [...G.map((e) => ({
+					value: e.user.username,
+					label: e.user.name,
+					icon: /* @__PURE__ */ T(C, {
+						name: e.user.name,
+						src: e.user.avatarUrl,
+						size: "xs",
+						decorative: !0
+					})
+				})), t] : e.kind === "checkbox" ? [{
+					value: "true",
+					label: Q("yes")
+				}, t] : [...e.options.map((e) => ({
+					value: e.id ?? "",
+					label: e.name,
+					...e.color && { icon: /* @__PURE__ */ T("span", {
+						className: "size-2 rounded-full",
+						style: { background: e.color }
+					}) }
+				})), t]
+			});
+		}
+		return n.push({
 			key: "overdue",
-			label: N("overdue"),
-			icon: /* @__PURE__ */ C(o, {}),
+			label: F("overdue"),
+			icon: /* @__PURE__ */ T(f, {}),
 			kind: "boolean"
 		}), n;
 	}, [
-		N,
-		P,
+		X,
+		Z,
+		k.type,
+		Y,
+		Q,
+		k.fields,
 		F,
-		U,
-		W,
 		I,
 		L,
+		G,
+		K,
 		R,
-		A.customer,
+		z,
 		B,
-		V,
+		k.customer,
 		H,
-		z,
-		A.cycle,
-		A.status,
-		G,
-		K,
-		M
-	]), J = O(A), Y = {
-		value: J.length > 0 ? J : null,
+		U,
+		W,
+		V,
+		k.cycle,
+		k.status,
+		q,
+		J,
+		P
+	]), $ = j(k), oe = {
+		value: $.length > 0 ? $ : null,
 		onChange: (e) => {
-			let t = k(e);
-			t.team !== A.team && delete t.status, j(t);
+			let t = M(e);
+			t.team !== k.team && delete t.status, N(t);
 		}
 	};
-	return T({
-		storageKey: `issues:${E}`,
-		fields: q,
-		store: Y,
+	return D({
+		storageKey: `issues:${l}`,
+		fields: ae,
+		store: oe,
 		remember: !1
 	});
 }
-export { j as useIssueFilters, A as withIssueFilters };
+export { P as useIssueFilters, N as withIssueFilters };

package/components/IssueImport.js

@@ -105,7 +105,7 @@ function b({ workspace: e, row: t }) {
 					}),
 					t.warnings.length > 0 && /* @__PURE__ */ m("span", {
 						className: "mt-0.5 block text-muted-foreground",
-						children: r("leftOut", { values: t.warnings.map((e) => `${r(`field.${e.field}`)} “${e.value}”`).join(", ") })
+						children: r("leftOut", { values: t.warnings.map((e) => `${e.field === "field" && e.name ? e.name : r(`field.${e.field}`)} “${e.value}”`).join(", ") })
 					})
 				]
 			}),