Skip to content

Commit 1f58163

Browse files
committed
show tracking task in well known format
1 parent b448db9 commit 1f58163

3 files changed

Lines changed: 13 additions & 16 deletions

File tree

src/toggl.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,13 @@ export class TogglService {
8080
}
8181

8282
async addTask(tracking) {
83-
const togglTaskName = `${tracking.project}_${tracking.task}`;
8483
const workspaceId = await this.#getWorkspaceId();
8584
const projectId = await this.#getProjectId(workspaceId, tracking.project);
8685

8786
const togglTasks = await this.#gateway.getTasks(workspaceId, projectId);
8887
const togglTask =
89-
togglTasks.find((t) => t.name === togglTaskName) ||
90-
(await this.#gateway.createTask(workspaceId, projectId, togglTaskName));
88+
togglTasks.find((t) => t.name === tracking.task) ||
89+
(await this.#gateway.createTask(workspaceId, projectId, tracking.task));
9190

9291
return togglTask;
9392
}

src/trektor.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,13 @@ TrelloPowerUp.initialize({
1111
];
1212
},
1313
"card-badges": function (t) {
14-
return t.get("card", "shared", "tracking").then((tracking) =>
15-
tracking == null
16-
? []
17-
: [
18-
{
19-
icon: "./tractor-solid.svg",
20-
text: `${tracking.task}@${tracking.project}`,
21-
},
22-
],
23-
);
14+
return t
15+
.get("card", "shared", "tracking")
16+
.then((tracking) =>
17+
tracking == null
18+
? []
19+
: [{ icon: "./tractor-solid.svg", text: `#${tracking.task}` }],
20+
);
2421
},
2522
"card-detail-badges": function (t) {
2623
return t.get("card", "shared", "tracking").then((tracking) =>
@@ -29,7 +26,7 @@ TrelloPowerUp.initialize({
2926
: [
3027
{
3128
title: "Trekking",
32-
text: `${tracking.task}@${tracking.project}`,
29+
text: `#${tracking.task}`,
3330
callback: trelloCallbacks.track,
3431
},
3532
],

src/trello.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ const track = async function (t) {
2626
if (projectLabels.length > 1) {
2727
throw new Error("Card has multiple project labels.");
2828
}
29+
const project = projectLabels[0];
2930

3031
const tracking = {
31-
project: projectLabels[0],
32-
task: `${card.idShort}_${card.shortLink}`,
32+
project,
33+
task: `${project}_${card.idShort}_${card.shortLink}`,
3334
};
3435

3536
await togglService.track(tracking, stripStoryPointsAndTaskToken(card.name));

0 commit comments

Comments
 (0)