@urateam/dashboard 0.1.2 → 0.1.5
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/__tests__/audit.test.d.ts +2 -0
- package/dist/__tests__/audit.test.d.ts.map +1 -0
- package/dist/__tests__/audit.test.js +219 -0
- package/dist/__tests__/audit.test.js.map +1 -0
- package/dist/__tests__/auth-routes.test.d.ts +2 -0
- package/dist/__tests__/auth-routes.test.d.ts.map +1 -0
- package/dist/__tests__/auth-routes.test.js +116 -0
- package/dist/__tests__/auth-routes.test.js.map +1 -0
- package/dist/__tests__/bootstrap-integration.test.d.ts +2 -0
- package/dist/__tests__/bootstrap-integration.test.d.ts.map +1 -0
- package/dist/__tests__/bootstrap-integration.test.js +75 -0
- package/dist/__tests__/bootstrap-integration.test.js.map +1 -0
- package/dist/__tests__/cost-chart.test.d.ts +2 -0
- package/dist/__tests__/cost-chart.test.d.ts.map +1 -0
- package/dist/__tests__/cost-chart.test.js +51 -0
- package/dist/__tests__/cost-chart.test.js.map +1 -0
- package/dist/__tests__/cost.test.d.ts +2 -0
- package/dist/__tests__/cost.test.d.ts.map +1 -0
- package/dist/__tests__/cost.test.js +197 -0
- package/dist/__tests__/cost.test.js.map +1 -0
- package/dist/__tests__/helpers/license.d.ts +8 -0
- package/dist/__tests__/helpers/license.d.ts.map +1 -0
- package/dist/__tests__/helpers/license.js +71 -0
- package/dist/__tests__/helpers/license.js.map +1 -0
- package/dist/__tests__/rbac-middleware.test.d.ts +2 -0
- package/dist/__tests__/rbac-middleware.test.d.ts.map +1 -0
- package/dist/__tests__/rbac-middleware.test.js +59 -0
- package/dist/__tests__/rbac-middleware.test.js.map +1 -0
- package/dist/__tests__/retry-route.test.d.ts +2 -0
- package/dist/__tests__/retry-route.test.d.ts.map +1 -0
- package/dist/__tests__/retry-route.test.js +115 -0
- package/dist/__tests__/retry-route.test.js.map +1 -0
- package/dist/__tests__/sso-integration.test.d.ts +2 -0
- package/dist/__tests__/sso-integration.test.d.ts.map +1 -0
- package/dist/__tests__/sso-integration.test.js +91 -0
- package/dist/__tests__/sso-integration.test.js.map +1 -0
- package/dist/__tests__/sso-middleware.test.d.ts +2 -0
- package/dist/__tests__/sso-middleware.test.d.ts.map +1 -0
- package/dist/__tests__/sso-middleware.test.js +66 -0
- package/dist/__tests__/sso-middleware.test.js.map +1 -0
- package/dist/__tests__/users-routes.test.d.ts +2 -0
- package/dist/__tests__/users-routes.test.d.ts.map +1 -0
- package/dist/__tests__/users-routes.test.js +127 -0
- package/dist/__tests__/users-routes.test.js.map +1 -0
- package/dist/middleware/rbac.d.ts +4 -0
- package/dist/middleware/rbac.d.ts.map +1 -0
- package/dist/middleware/rbac.js +21 -0
- package/dist/middleware/rbac.js.map +1 -0
- package/dist/middleware/sso.d.ts +9 -0
- package/dist/middleware/sso.d.ts.map +1 -0
- package/dist/middleware/sso.js +47 -0
- package/dist/middleware/sso.js.map +1 -0
- package/dist/routes/audit.d.ts +4 -0
- package/dist/routes/audit.d.ts.map +1 -0
- package/dist/routes/audit.js +123 -0
- package/dist/routes/audit.js.map +1 -0
- package/dist/routes/auth.d.ts +10 -0
- package/dist/routes/auth.d.ts.map +1 -0
- package/dist/routes/auth.js +105 -0
- package/dist/routes/auth.js.map +1 -0
- package/dist/routes/config.d.ts.map +1 -1
- package/dist/routes/config.js +4 -2
- package/dist/routes/config.js.map +1 -1
- package/dist/routes/coordination.d.ts.map +1 -1
- package/dist/routes/coordination.js +5 -3
- package/dist/routes/coordination.js.map +1 -1
- package/dist/routes/cost.d.ts +10 -0
- package/dist/routes/cost.d.ts.map +1 -0
- package/dist/routes/cost.js +104 -0
- package/dist/routes/cost.js.map +1 -0
- package/dist/routes/errors.d.ts.map +1 -1
- package/dist/routes/errors.js +4 -2
- package/dist/routes/errors.js.map +1 -1
- package/dist/routes/runs.d.ts +9 -1
- package/dist/routes/runs.d.ts.map +1 -1
- package/dist/routes/runs.js +82 -9
- package/dist/routes/runs.js.map +1 -1
- package/dist/routes/tokens.d.ts.map +1 -1
- package/dist/routes/tokens.js +4 -2
- package/dist/routes/tokens.js.map +1 -1
- package/dist/routes/users.d.ts +8 -0
- package/dist/routes/users.d.ts.map +1 -0
- package/dist/routes/users.js +64 -0
- package/dist/routes/users.js.map +1 -0
- package/dist/server.d.ts +13 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +65 -7
- package/dist/server.js.map +1 -1
- package/dist/static/style.css +648 -0
- package/dist/views/audit.d.ts +29 -0
- package/dist/views/audit.d.ts.map +1 -0
- package/dist/views/audit.js +144 -0
- package/dist/views/audit.js.map +1 -0
- package/dist/views/cost.d.ts +28 -0
- package/dist/views/cost.d.ts.map +1 -0
- package/dist/views/cost.js +173 -0
- package/dist/views/cost.js.map +1 -0
- package/dist/views/forbidden.d.ts +7 -0
- package/dist/views/forbidden.d.ts.map +1 -0
- package/dist/views/forbidden.js +18 -0
- package/dist/views/forbidden.js.map +1 -0
- package/dist/views/layout.d.ts +11 -1
- package/dist/views/layout.d.ts.map +1 -1
- package/dist/views/layout.js +12 -18
- package/dist/views/layout.js.map +1 -1
- package/dist/views/run-detail.d.ts +1 -1
- package/dist/views/run-detail.d.ts.map +1 -1
- package/dist/views/run-detail.js +6 -1
- package/dist/views/run-detail.js.map +1 -1
- package/dist/views/users.d.ts +16 -0
- package/dist/views/users.d.ts.map +1 -0
- package/dist/views/users.js +44 -0
- package/dist/views/users.js.map +1 -0
- package/package.json +7 -5
- package/LICENSE +0 -27
|
@@ -2,18 +2,20 @@ import { Hono } from "hono";
|
|
|
2
2
|
import { getActiveWork } from "@urateam/core";
|
|
3
3
|
import { layout } from "../views/layout.js";
|
|
4
4
|
import { coordinationView } from "../views/coordination.js";
|
|
5
|
+
import { requirePermission } from "../middleware/rbac.js";
|
|
5
6
|
export function createCoordinationRouter(db, basePath = "") {
|
|
6
7
|
const router = new Hono();
|
|
7
|
-
router.get("/coordination", async (c) => {
|
|
8
|
+
router.get("/coordination", requirePermission("coordination.view"), async (c) => {
|
|
8
9
|
const entries = await getActiveWork(db);
|
|
9
10
|
const content = coordinationView(entries);
|
|
10
11
|
if (c.req.header("HX-Request")) {
|
|
11
12
|
return c.html(content);
|
|
12
13
|
}
|
|
13
|
-
|
|
14
|
+
const user = c.get("user");
|
|
15
|
+
return c.html(layout("Coordination", content, basePath, { userEmail: user?.email }));
|
|
14
16
|
});
|
|
15
17
|
// HTMX partial: active coordination feed (polled every 10s)
|
|
16
|
-
router.get("/coordination/feed", async (c) => {
|
|
18
|
+
router.get("/coordination/feed", requirePermission("coordination.view"), async (c) => {
|
|
17
19
|
const entries = await getActiveWork(db);
|
|
18
20
|
return c.html(coordinationView(entries));
|
|
19
21
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordination.js","sourceRoot":"","sources":["../../src/routes/coordination.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"coordination.js","sourceRoot":"","sources":["../../src/routes/coordination.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,UAAU,wBAAwB,CAAC,EAAM,EAAE,QAAQ,GAAG,EAAE;IAC5D,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;IAE1B,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9E,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAS,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAE1C,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;QAED,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,MAAe,CAAmC,CAAC;QACtE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,4DAA4D;IAC5D,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,mBAAmB,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACnF,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,EAAS,CAAC,CAAC;QAC/C,OAAO,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Hono } from "hono";
|
|
2
|
+
import type { Db, CostsConfig, PipelineConfig } from "@urateam/core";
|
|
3
|
+
export interface CostRouterDeps {
|
|
4
|
+
db: Db;
|
|
5
|
+
costs?: CostsConfig;
|
|
6
|
+
pipelineConfigs?: Record<string, PipelineConfig>;
|
|
7
|
+
basePath?: string;
|
|
8
|
+
}
|
|
9
|
+
export declare function createCostRouter(deps: CostRouterDeps): Hono;
|
|
10
|
+
//# sourceMappingURL=cost.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cost.d.ts","sourceRoot":"","sources":["../../src/routes/cost.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAKrE,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,EAAE,CAAC;IACP,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AA4BD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAuF3D"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { Hono } from "hono";
|
|
2
|
+
import { isFeatureLicensed, aggregateHybrid, snapToUtcDayStart, streamCostCsv } from "@urateam/core";
|
|
3
|
+
import { layout } from "../views/layout.js";
|
|
4
|
+
import { renderCostPage } from "../views/cost.js";
|
|
5
|
+
function parseWindow(url) {
|
|
6
|
+
const preset = url.searchParams.get("window") ?? "30d";
|
|
7
|
+
const now = new Date();
|
|
8
|
+
let from;
|
|
9
|
+
// Half-open interval [from, to) — add 1s to "now" so runs completing at the
|
|
10
|
+
// current second are still included in the window. SQLite stores timestamps
|
|
11
|
+
// as epoch seconds (integer), so a 1ms buffer would still floor to the same
|
|
12
|
+
// second and exclude runs that completed within the current second.
|
|
13
|
+
let to = new Date(now.getTime() + 1000);
|
|
14
|
+
if (preset === "custom") {
|
|
15
|
+
const fromStr = url.searchParams.get("from");
|
|
16
|
+
const toStr = url.searchParams.get("to");
|
|
17
|
+
from = fromStr ? new Date(fromStr) : new Date(now.getTime() - 30 * 86_400_000);
|
|
18
|
+
to = toStr ? new Date(toStr) : new Date(now.getTime() + 1000);
|
|
19
|
+
if (isNaN(from.getTime()))
|
|
20
|
+
from = new Date(now.getTime() - 30 * 86_400_000);
|
|
21
|
+
if (isNaN(to.getTime()))
|
|
22
|
+
to = now;
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
// For preset windows: snap `from` to UTC day start so `aggregateHybrid`
|
|
26
|
+
// can read pre-computed rollup rows without boundary slicing. The window
|
|
27
|
+
// effectively becomes "last N complete UTC days + today-so-far".
|
|
28
|
+
const days = preset === "7d" ? 7 : preset === "90d" ? 90 : preset === "365d" ? 365 : 30;
|
|
29
|
+
from = new Date(snapToUtcDayStart(now).getTime() - days * 86_400_000);
|
|
30
|
+
}
|
|
31
|
+
return { from, to, preset };
|
|
32
|
+
}
|
|
33
|
+
export function createCostRouter(deps) {
|
|
34
|
+
const router = new Hono();
|
|
35
|
+
const basePath = deps.basePath ?? "";
|
|
36
|
+
const costs = deps.costs ?? {
|
|
37
|
+
modelPricing: {},
|
|
38
|
+
hourlyEngRate: 50,
|
|
39
|
+
timeSavedPerPrDefault: 4,
|
|
40
|
+
};
|
|
41
|
+
const pipelineConfigs = deps.pipelineConfigs ?? {};
|
|
42
|
+
// Gate every cost route behind the license feature flag.
|
|
43
|
+
router.use("/cost", async (c, next) => {
|
|
44
|
+
if (!isFeatureLicensed("cost-roi"))
|
|
45
|
+
return c.notFound();
|
|
46
|
+
await next();
|
|
47
|
+
});
|
|
48
|
+
router.use("/cost/*", async (c, next) => {
|
|
49
|
+
if (!isFeatureLicensed("cost-roi"))
|
|
50
|
+
return c.notFound();
|
|
51
|
+
await next();
|
|
52
|
+
});
|
|
53
|
+
router.get("/cost", async (c) => {
|
|
54
|
+
const url = new URL(c.req.url);
|
|
55
|
+
const filters = parseWindow(url);
|
|
56
|
+
const result = await aggregateHybrid(deps.db, { from: filters.from, to: filters.to }, { costs, pipelineConfigs },
|
|
57
|
+
// Rollup-backed reads only for preset windows (where `from` is snapped
|
|
58
|
+
// to UTC midnight). Custom ranges go through live aggregation.
|
|
59
|
+
{ enableRollups: filters.preset !== "custom" });
|
|
60
|
+
const content = renderCostPage({ result, filters, costs, basePath });
|
|
61
|
+
if (c.req.header("HX-Request"))
|
|
62
|
+
return c.html(content);
|
|
63
|
+
const user = c.get("user");
|
|
64
|
+
return c.html(layout("Cost & ROI", content, basePath, { userEmail: user?.email }));
|
|
65
|
+
});
|
|
66
|
+
router.get("/cost/page", async (c) => {
|
|
67
|
+
const url = new URL(c.req.url);
|
|
68
|
+
const filters = parseWindow(url);
|
|
69
|
+
const result = await aggregateHybrid(deps.db, { from: filters.from, to: filters.to }, { costs, pipelineConfigs }, { enableRollups: filters.preset !== "custom" });
|
|
70
|
+
return c.html(renderCostPage({ result, filters, costs, basePath, partial: true }));
|
|
71
|
+
});
|
|
72
|
+
router.get("/cost/export.csv", async (c) => {
|
|
73
|
+
const url = new URL(c.req.url);
|
|
74
|
+
const { from, to } = parseWindow(url);
|
|
75
|
+
const iter = streamCostCsv(deps.db, { from, to }, { costs, pipelineConfigs })[Symbol.asyncIterator]();
|
|
76
|
+
const encoder = new TextEncoder();
|
|
77
|
+
const stream = new ReadableStream({
|
|
78
|
+
async pull(controller) {
|
|
79
|
+
const { value, done } = await iter.next();
|
|
80
|
+
if (done) {
|
|
81
|
+
controller.close();
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
controller.enqueue(encoder.encode(value));
|
|
85
|
+
},
|
|
86
|
+
async cancel() {
|
|
87
|
+
if (typeof iter.return === "function")
|
|
88
|
+
await iter.return();
|
|
89
|
+
},
|
|
90
|
+
});
|
|
91
|
+
const fromStr = from.toISOString().slice(0, 10);
|
|
92
|
+
const toStr = to.toISOString().slice(0, 10);
|
|
93
|
+
return new Response(stream, {
|
|
94
|
+
status: 200,
|
|
95
|
+
headers: {
|
|
96
|
+
"Content-Type": "text/csv; charset=utf-8",
|
|
97
|
+
"Content-Disposition": `attachment; filename="cost-${fromStr}-${toStr}.csv"`,
|
|
98
|
+
"Cache-Control": "no-store",
|
|
99
|
+
},
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
return router;
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=cost.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cost.js","sourceRoot":"","sources":["../../src/routes/cost.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/routes/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/routes/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAQxC,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,SAAK,GAAG,IAAI,CAkC9D"}
|
package/dist/routes/errors.js
CHANGED
|
@@ -3,10 +3,11 @@ import { sql } from "drizzle-orm";
|
|
|
3
3
|
import { stageRuns } from "@urateam/core";
|
|
4
4
|
import { layout } from "../views/layout.js";
|
|
5
5
|
import { errorsView } from "../views/errors.js";
|
|
6
|
+
import { requirePermission } from "../middleware/rbac.js";
|
|
6
7
|
export function createErrorsRouter(db, basePath = "") {
|
|
7
8
|
const router = new Hono();
|
|
8
9
|
const d = db;
|
|
9
|
-
router.get("/errors", async (c) => {
|
|
10
|
+
router.get("/errors", requirePermission("errors.view"), async (c) => {
|
|
10
11
|
const stageFailures = await d
|
|
11
12
|
.select({
|
|
12
13
|
stage: stageRuns.stage,
|
|
@@ -29,7 +30,8 @@ export function createErrorsRouter(db, basePath = "") {
|
|
|
29
30
|
.orderBy(sql `"count" DESC`)
|
|
30
31
|
.limit(50);
|
|
31
32
|
const content = errorsView(stageFailures, errorPatterns);
|
|
32
|
-
|
|
33
|
+
const user = c.get("user");
|
|
34
|
+
return c.html(layout("Errors", content, basePath, { userEmail: user?.email }));
|
|
33
35
|
});
|
|
34
36
|
return router;
|
|
35
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/routes/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/routes/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAI1D,MAAM,UAAU,kBAAkB,CAAC,EAAM,EAAE,QAAQ,GAAG,EAAE;IACtD,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;IAC1B,MAAM,CAAC,GAAG,EAAW,CAAC;IAEtB,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,iBAAiB,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAClE,MAAM,aAAa,GAAG,MAAM,CAAC;aAC1B,MAAM,CAAC;YACN,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,SAAS,EAAE,GAAG,CAAQ,UAAU,CAAC,EAAE,CAAC,WAAW,CAAC;YAChD,UAAU,EAAE,GAAG,CAAQ,iBAAiB,SAAS,CAAC,MAAM,gCAAgC,CAAC,EAAE,CAAC,YAAY,CAAC;YACzG,WAAW,EAAE,GAAG,CAAQ,4BAA4B,SAAS,CAAC,MAAM,iEAAiE,CAAC,EAAE,CAAC,aAAa,CAAC;SACxJ,CAAC;aACD,IAAI,CAAC,SAAS,CAAC;aACf,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC;aACxB,OAAO,CAAC,GAAG,CAAA,oBAAoB,CAAC,CAAC;QAEpC,MAAM,aAAa,GAAG,MAAM,CAAC;aAC1B,MAAM,CAAC;YACN,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,YAAY,EAAE,GAAG,CAAQ,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC,EAAE,CAAC,cAAc,CAAC;YACvE,KAAK,EAAE,GAAG,CAAQ,UAAU,CAAC,EAAE,CAAC,OAAO,CAAC;SACzC,CAAC;aACD,IAAI,CAAC,SAAS,CAAC;aACf,KAAK,CAAC,GAAG,CAAA,GAAG,SAAS,CAAC,MAAM,mBAAmB,SAAS,CAAC,YAAY,cAAc,CAAC;aACpF,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,YAAY,CAAC;aAChD,OAAO,CAAC,GAAG,CAAA,cAAc,CAAC;aAC1B,KAAK,CAAC,EAAE,CAAC,CAAC;QAEb,MAAM,OAAO,GAAG,UAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,MAAe,CAAmC,CAAC;QACtE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/routes/runs.d.ts
CHANGED
|
@@ -1,4 +1,12 @@
|
|
|
1
1
|
import { Hono } from "hono";
|
|
2
2
|
import type { Db } from "@urateam/core";
|
|
3
|
-
export
|
|
3
|
+
export interface RunsRouterDeps {
|
|
4
|
+
db: Db;
|
|
5
|
+
runner?: {
|
|
6
|
+
resume: (runOrIssueId: string) => Promise<void>;
|
|
7
|
+
start: (...args: any[]) => Promise<void>;
|
|
8
|
+
};
|
|
9
|
+
basePath?: string;
|
|
10
|
+
}
|
|
11
|
+
export declare function createRunsRouter(dbOrDeps: Db | RunsRouterDeps, basePath?: string): Hono;
|
|
4
12
|
//# sourceMappingURL=runs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runs.d.ts","sourceRoot":"","sources":["../../src/routes/runs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"runs.d.ts","sourceRoot":"","sources":["../../src/routes/runs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAkBxC,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,EAAE,CAAC;IACP,MAAM,CAAC,EAAE;QACP,MAAM,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KAC1C,CAAC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,EAAE,GAAG,cAAc,EAC7B,QAAQ,SAAK,GACZ,IAAI,CAuKN"}
|
package/dist/routes/runs.js
CHANGED
|
@@ -1,13 +1,30 @@
|
|
|
1
1
|
import { Hono } from "hono";
|
|
2
2
|
import { desc, eq, inArray, count } from "drizzle-orm";
|
|
3
|
-
import { pipelineRuns, stageRuns, agentLogs } from "@urateam/core";
|
|
3
|
+
import { pipelineRuns, stageRuns, agentLogs, logAuditEvent, dashboardRetryRunEvent, isFeatureLicensed, canAccess, } from "@urateam/core";
|
|
4
4
|
import { layout } from "../views/layout.js";
|
|
5
5
|
import { runFeedView } from "../views/run-feed.js";
|
|
6
6
|
import { runDetailView } from "../views/run-detail.js";
|
|
7
|
-
|
|
7
|
+
import { requirePermission } from "../middleware/rbac.js";
|
|
8
|
+
export function createRunsRouter(dbOrDeps, basePath = "") {
|
|
9
|
+
// Backwards-compatible: accept either (db, basePath) or a deps object.
|
|
10
|
+
let db;
|
|
11
|
+
let runner;
|
|
12
|
+
let effectiveBasePath;
|
|
13
|
+
if (dbOrDeps &&
|
|
14
|
+
typeof dbOrDeps === "object" &&
|
|
15
|
+
"db" in dbOrDeps) {
|
|
16
|
+
const deps = dbOrDeps;
|
|
17
|
+
db = deps.db;
|
|
18
|
+
runner = deps.runner;
|
|
19
|
+
effectiveBasePath = deps.basePath ?? "";
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
db = dbOrDeps;
|
|
23
|
+
effectiveBasePath = basePath;
|
|
24
|
+
}
|
|
8
25
|
const router = new Hono();
|
|
9
26
|
const d = db;
|
|
10
|
-
router.get("/", async (c) => {
|
|
27
|
+
router.get("/", requirePermission("runs.view"), async (c) => {
|
|
11
28
|
const runs = await d
|
|
12
29
|
.select()
|
|
13
30
|
.from(pipelineRuns)
|
|
@@ -17,10 +34,11 @@ export function createRunsRouter(db, basePath = "") {
|
|
|
17
34
|
if (c.req.header("HX-Request")) {
|
|
18
35
|
return c.html(content);
|
|
19
36
|
}
|
|
20
|
-
|
|
37
|
+
const user = c.get("user");
|
|
38
|
+
return c.html(layout("Pipeline Runs", content, effectiveBasePath, { userEmail: user?.email }));
|
|
21
39
|
});
|
|
22
40
|
// HTMX partial: feed of latest pipeline runs (polled every 5s)
|
|
23
|
-
router.get("/runs/feed", async (c) => {
|
|
41
|
+
router.get("/runs/feed", requirePermission("runs.view"), async (c) => {
|
|
24
42
|
const runs = await d
|
|
25
43
|
.select()
|
|
26
44
|
.from(pipelineRuns)
|
|
@@ -28,17 +46,18 @@ export function createRunsRouter(db, basePath = "") {
|
|
|
28
46
|
.limit(50);
|
|
29
47
|
return c.html(runFeedView(runs));
|
|
30
48
|
});
|
|
31
|
-
router.get("/runs/:id", async (c) => {
|
|
49
|
+
router.get("/runs/:id", requirePermission("runs.view"), async (c) => {
|
|
32
50
|
const id = c.req.param("id");
|
|
33
51
|
const page = Math.max(1, parseInt(c.req.query("page") || "1", 10));
|
|
34
52
|
const logsPerPage = 50;
|
|
53
|
+
const user = c.get("user");
|
|
35
54
|
const [run] = await d
|
|
36
55
|
.select()
|
|
37
56
|
.from(pipelineRuns)
|
|
38
57
|
.where(eq(pipelineRuns.id, id))
|
|
39
58
|
.limit(1);
|
|
40
59
|
if (!run) {
|
|
41
|
-
return c.html(layout("Not Found", "<p>Run not found</p>",
|
|
60
|
+
return c.html(layout("Not Found", "<p>Run not found</p>", effectiveBasePath, { userEmail: user?.email }), 404);
|
|
42
61
|
}
|
|
43
62
|
const stages = await d
|
|
44
63
|
.select()
|
|
@@ -64,8 +83,62 @@ export function createRunsRouter(db, basePath = "") {
|
|
|
64
83
|
.limit(logsPerPage)
|
|
65
84
|
.offset(offset);
|
|
66
85
|
}
|
|
67
|
-
const
|
|
68
|
-
|
|
86
|
+
const canRetry = isFeatureLicensed("rbac")
|
|
87
|
+
? canAccess((user?.role ?? "viewer"), "runs.retry")
|
|
88
|
+
: true;
|
|
89
|
+
const content = runDetailView(run, stages, logs, page, totalLogs, canRetry);
|
|
90
|
+
return c.html(layout(`Run ${id}`, content, effectiveBasePath, { userEmail: user?.email }));
|
|
91
|
+
});
|
|
92
|
+
router.post("/runs/:id/retry", async (c, next) => {
|
|
93
|
+
// Per spec §10: retry endpoint returns 404 when RBAC is unlicensed.
|
|
94
|
+
// Without this gate the endpoint would be wide-open in unlicensed
|
|
95
|
+
// deployments because requirePermission is a no-op then.
|
|
96
|
+
if (!isFeatureLicensed("rbac"))
|
|
97
|
+
return c.notFound();
|
|
98
|
+
return next();
|
|
99
|
+
}, requirePermission("runs.retry"), async (c) => {
|
|
100
|
+
const id = c.req.param("id");
|
|
101
|
+
const rows = await d
|
|
102
|
+
.select()
|
|
103
|
+
.from(pipelineRuns)
|
|
104
|
+
.where(eq(pipelineRuns.id, id))
|
|
105
|
+
.limit(1);
|
|
106
|
+
if (rows.length === 0) {
|
|
107
|
+
return c.text("Run not found", 404);
|
|
108
|
+
}
|
|
109
|
+
const run = rows[0];
|
|
110
|
+
if (run.status !== "failed" && run.status !== "retriable") {
|
|
111
|
+
return c.text(`Cannot retry a run in status ${run.status}`, 409);
|
|
112
|
+
}
|
|
113
|
+
if (!runner) {
|
|
114
|
+
return c.text("Runner not configured", 500);
|
|
115
|
+
}
|
|
116
|
+
try {
|
|
117
|
+
if (run.resumePayload) {
|
|
118
|
+
await runner.resume(id);
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
await runner.start({
|
|
122
|
+
issueId: run.issueId,
|
|
123
|
+
issueTitle: run.issueTitle,
|
|
124
|
+
repoUrl: run.repoUrl,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
catch (err) {
|
|
129
|
+
return c.text(`Retry failed: ${err.message}`, 500);
|
|
130
|
+
}
|
|
131
|
+
const user = c.get("user");
|
|
132
|
+
if (user) {
|
|
133
|
+
void logAuditEvent(db, dashboardRetryRunEvent({
|
|
134
|
+
runId: id,
|
|
135
|
+
issueId: run.issueId,
|
|
136
|
+
previousStatus: run.status,
|
|
137
|
+
actorUserId: user.id,
|
|
138
|
+
actorEmail: user.email,
|
|
139
|
+
}));
|
|
140
|
+
}
|
|
141
|
+
return c.redirect(`${effectiveBasePath}/runs/${id}`, 302);
|
|
69
142
|
});
|
|
70
143
|
return router;
|
|
71
144
|
}
|
package/dist/routes/runs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../src/routes/runs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,
|
|
1
|
+
{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../src/routes/runs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/routes/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/routes/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,eAAe,CAAC;AAQxC,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,SAAK,GAAG,IAAI,CA+C9D"}
|
package/dist/routes/tokens.js
CHANGED
|
@@ -3,13 +3,14 @@ import { sql } from "drizzle-orm";
|
|
|
3
3
|
import { sqlDateGroup, sqlDaysAgoFilter, stageRuns, pipelineRuns } from "@urateam/core";
|
|
4
4
|
import { layout } from "../views/layout.js";
|
|
5
5
|
import { tokensView } from "../views/tokens.js";
|
|
6
|
+
import { requirePermission } from "../middleware/rbac.js";
|
|
6
7
|
export function createTokensRouter(db, basePath = "") {
|
|
7
8
|
const router = new Hono();
|
|
8
9
|
const d = db;
|
|
9
10
|
// Driver-agnostic SQL helpers — no isPostgres() branching needed in application code
|
|
10
11
|
const dateExpr = sqlDateGroup(db, stageRuns.startedAt);
|
|
11
12
|
const thirtyDaysAgo = sqlDaysAgoFilter(db, stageRuns.startedAt, 30);
|
|
12
|
-
router.get("/tokens", async (c) => {
|
|
13
|
+
router.get("/tokens", requirePermission("tokens.view"), async (c) => {
|
|
13
14
|
const daily = await d
|
|
14
15
|
.select({
|
|
15
16
|
date: dateExpr.as("date"),
|
|
@@ -40,7 +41,8 @@ export function createTokensRouter(db, basePath = "") {
|
|
|
40
41
|
.groupBy(stageRuns.stage)
|
|
41
42
|
.orderBy(sql `(COALESCE(SUM(${stageRuns.inputTokens}), 0) + COALESCE(SUM(${stageRuns.outputTokens}), 0)) DESC`);
|
|
42
43
|
const content = tokensView(daily, byPipeline, byStage);
|
|
43
|
-
|
|
44
|
+
const user = c.get("user");
|
|
45
|
+
return c.html(layout("Token Usage", content, basePath, { userEmail: user?.email }));
|
|
44
46
|
});
|
|
45
47
|
return router;
|
|
46
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/routes/tokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/routes/tokens.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/routes/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,EAAE,EAAQ,MAAM,eAAe,CAAC;AAkB9C,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,EAAE,CAAC;IACP,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAmE7D"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { Hono } from "hono";
|
|
2
|
+
import { listUsers, setUserRole, SelfDemoteError, LastAdminError, isFeatureLicensed, } from "@urateam/core";
|
|
3
|
+
import { requirePermission } from "../middleware/rbac.js";
|
|
4
|
+
import { renderUsersPage } from "../views/users.js";
|
|
5
|
+
const VALID_ROLES = ["admin", "operator", "viewer"];
|
|
6
|
+
function parseRole(v) {
|
|
7
|
+
return typeof v === "string" && VALID_ROLES.includes(v)
|
|
8
|
+
? v
|
|
9
|
+
: null;
|
|
10
|
+
}
|
|
11
|
+
export function createUsersRouter(deps) {
|
|
12
|
+
const app = new Hono();
|
|
13
|
+
// Feature gate — when RBAC is unlicensed, /users returns 404
|
|
14
|
+
app.use("/users", async (c, next) => {
|
|
15
|
+
if (!isFeatureLicensed("rbac"))
|
|
16
|
+
return c.notFound();
|
|
17
|
+
await next();
|
|
18
|
+
});
|
|
19
|
+
app.use("/users/*", async (c, next) => {
|
|
20
|
+
if (!isFeatureLicensed("rbac"))
|
|
21
|
+
return c.notFound();
|
|
22
|
+
await next();
|
|
23
|
+
});
|
|
24
|
+
app.get("/users", requirePermission("users.view"), async (c) => {
|
|
25
|
+
const user = c.get("user");
|
|
26
|
+
const users = await listUsers(deps.db);
|
|
27
|
+
return c.html(renderUsersPage({
|
|
28
|
+
users,
|
|
29
|
+
currentUserId: user?.id ?? "",
|
|
30
|
+
basePath: deps.basePath,
|
|
31
|
+
userEmail: user?.email,
|
|
32
|
+
userRole: user?.role,
|
|
33
|
+
}));
|
|
34
|
+
});
|
|
35
|
+
app.post("/users/:id/role", requirePermission("users.manage"), async (c) => {
|
|
36
|
+
const targetId = c.req.param("id");
|
|
37
|
+
const form = await c.req.parseBody();
|
|
38
|
+
const newRole = parseRole(form.role);
|
|
39
|
+
if (!newRole)
|
|
40
|
+
return c.text("Invalid role", 400);
|
|
41
|
+
const user = c.get("user");
|
|
42
|
+
if (!user)
|
|
43
|
+
return c.text("Unauthorized", 401);
|
|
44
|
+
try {
|
|
45
|
+
await setUserRole(deps.db, {
|
|
46
|
+
userId: targetId,
|
|
47
|
+
newRole: newRole,
|
|
48
|
+
actorUserId: user.id,
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
catch (err) {
|
|
52
|
+
if (err instanceof SelfDemoteError) {
|
|
53
|
+
return c.text("Cannot demote yourself", 400);
|
|
54
|
+
}
|
|
55
|
+
if (err instanceof LastAdminError) {
|
|
56
|
+
return c.text("Cannot demote the last remaining admin", 400);
|
|
57
|
+
}
|
|
58
|
+
return c.text(`Role update failed: ${err.message}`, 500);
|
|
59
|
+
}
|
|
60
|
+
return c.redirect(`${deps.basePath}/users`, 302);
|
|
61
|
+
});
|
|
62
|
+
return app;
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=users.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/routes/users.ts"],"names":[],"mappings":"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"}
|
package/dist/server.d.ts
CHANGED
|
@@ -1,13 +1,25 @@
|
|
|
1
1
|
import { Hono } from "hono";
|
|
2
|
-
import type { Db, PipelineConfig, RepoConfig } from "@urateam/core";
|
|
2
|
+
import type { Db, PipelineConfig, RepoConfig, SsoConfig, WorkosClient, CostsConfig } from "@urateam/core";
|
|
3
3
|
export interface DashboardConfig {
|
|
4
4
|
db: Db;
|
|
5
5
|
pipelineConfigs: Record<string, PipelineConfig>;
|
|
6
6
|
repoConfigs: Record<string, RepoConfig>;
|
|
7
|
+
/** Optional costs config for the Cost & ROI dashboard (enterprise). */
|
|
8
|
+
costs?: CostsConfig;
|
|
7
9
|
auth?: {
|
|
8
10
|
username: string;
|
|
9
11
|
password: string;
|
|
10
12
|
};
|
|
13
|
+
/**
|
|
14
|
+
* Optional SSO configuration. When the `sso` feature is licensed AND
|
|
15
|
+
* `sso.enabled === true`, the dashboard mounts the WorkOS auth router
|
|
16
|
+
* and the session-validating SSO middleware in place of basic auth.
|
|
17
|
+
* Callers must also pass `workos` (a `WorkosClient` instance) — typically
|
|
18
|
+
* obtained from `getDefaultWorkosClient(sso.workosApiKey)`. This keeps
|
|
19
|
+
* `createDashboard` synchronous and lets tests inject a stub client.
|
|
20
|
+
*/
|
|
21
|
+
sso?: SsoConfig;
|
|
22
|
+
workos?: WorkosClient;
|
|
11
23
|
/**
|
|
12
24
|
* Root path prefix for all dashboard navigation links (e.g. `"/ateam"`).
|
|
13
25
|
* No trailing slash. Falls back to the `DASHBOARD_BASE_PATH` environment
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAM5B,OAAO,KAAK,EACV,EAAE,EACF,cAAc,EACd,UAAU,EACV,SAAS,EACT,YAAY,EACZ,WAAW,EACZ,MAAM,eAAe,CAAC;AAcvB,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,EAAE,CAAC;IACP,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAChD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACxC,uEAAuE;IACvE,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C;;;;;;;OAOG;IACH,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAMD,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAgM7D"}
|