2021-03-11 05:43:45 +01:00
|
|
|
import $ from "jquery";
|
|
|
|
|
2021-02-10 16:51:34 +01:00
|
|
|
import render_widgets_todo_widget from "../templates/widgets/todo_widget.hbs";
|
|
|
|
import render_widgets_todo_widget_tasks from "../templates/widgets/todo_widget_tasks.hbs";
|
2020-08-01 03:43:15 +02:00
|
|
|
|
2021-03-16 23:38:59 +01:00
|
|
|
import * as blueslip from "./blueslip";
|
2021-04-13 06:51:54 +02:00
|
|
|
import {$t} from "./i18n";
|
2021-06-12 11:55:42 +02:00
|
|
|
import * as util from "./util";
|
2021-03-16 23:38:59 +01:00
|
|
|
|
2021-02-10 16:51:34 +01:00
|
|
|
export class TaskData {
|
2020-07-23 03:45:19 +02:00
|
|
|
task_map = new Map();
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
get_new_index() {
|
2020-04-08 20:03:44 +02:00
|
|
|
let idx = 0;
|
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
for (const item of this.task_map.values()) {
|
2020-04-08 20:03:44 +02:00
|
|
|
idx = Math.max(idx, item.idx);
|
|
|
|
}
|
|
|
|
|
|
|
|
return idx + 1;
|
|
|
|
}
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
get_widget_data() {
|
|
|
|
const all_tasks = Array.from(this.task_map.values());
|
2021-06-12 11:55:42 +02:00
|
|
|
all_tasks.sort((a, b) => util.strcmp(a.task, b.task));
|
2020-04-08 19:38:13 +02:00
|
|
|
|
2020-04-08 13:04:47 +02:00
|
|
|
const pending_tasks = [];
|
|
|
|
const completed_tasks = [];
|
|
|
|
|
|
|
|
for (const item of all_tasks) {
|
|
|
|
if (item.completed) {
|
|
|
|
completed_tasks.push(item);
|
|
|
|
} else {
|
|
|
|
pending_tasks.push(item);
|
|
|
|
}
|
|
|
|
}
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const widget_data = {
|
2020-07-20 22:18:43 +02:00
|
|
|
pending_tasks,
|
|
|
|
completed_tasks,
|
2018-07-02 19:57:01 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
return widget_data;
|
2020-07-23 03:45:19 +02:00
|
|
|
}
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
name_in_use(name) {
|
|
|
|
for (const item of this.task_map.values()) {
|
2020-04-08 14:12:59 +02:00
|
|
|
if (item.task === name) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2020-04-08 19:41:28 +02:00
|
|
|
|
2020-04-08 14:12:59 +02:00
|
|
|
return false;
|
2020-07-23 03:45:19 +02:00
|
|
|
}
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
handle = {
|
2018-07-02 19:57:01 +02:00
|
|
|
new_task: {
|
2020-07-23 03:45:19 +02:00
|
|
|
outbound: (task, desc) => {
|
2019-11-02 00:06:25 +01:00
|
|
|
const event = {
|
2020-07-15 01:29:15 +02:00
|
|
|
type: "new_task",
|
2020-07-23 03:45:19 +02:00
|
|
|
key: this.get_new_index(),
|
2020-07-20 22:18:43 +02:00
|
|
|
task,
|
|
|
|
desc,
|
2018-07-02 19:57:01 +02:00
|
|
|
completed: false,
|
|
|
|
};
|
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
if (!this.name_in_use(task)) {
|
2018-07-02 19:57:01 +02:00
|
|
|
return event;
|
|
|
|
}
|
2020-09-24 07:50:36 +02:00
|
|
|
return undefined;
|
2018-07-02 19:57:01 +02:00
|
|
|
},
|
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
inbound: (sender_id, data) => {
|
2021-06-13 14:52:08 +02:00
|
|
|
// All messages readers may add tasks.
|
2020-04-08 20:03:44 +02:00
|
|
|
// for legacy reasons, the inbound idx is
|
|
|
|
// called key in the event
|
2019-11-02 00:06:25 +01:00
|
|
|
const idx = data.key;
|
2020-03-14 15:27:56 +01:00
|
|
|
const key = idx + "," + sender_id;
|
2019-11-02 00:06:25 +01:00
|
|
|
const task = data.task;
|
2020-02-22 11:50:24 +01:00
|
|
|
const desc = data.desc;
|
2019-11-02 00:06:25 +01:00
|
|
|
const completed = data.completed;
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const task_data = {
|
2020-07-20 22:18:43 +02:00
|
|
|
task,
|
|
|
|
desc,
|
|
|
|
idx,
|
|
|
|
key,
|
|
|
|
completed,
|
2018-07-02 19:57:01 +02:00
|
|
|
};
|
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
if (!this.name_in_use(task)) {
|
|
|
|
this.task_map.set(key, task_data);
|
2018-07-02 19:57:01 +02:00
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
strike: {
|
2020-07-23 03:45:19 +02:00
|
|
|
outbound: (key) => {
|
2019-11-02 00:06:25 +01:00
|
|
|
const event = {
|
2020-07-15 01:29:15 +02:00
|
|
|
type: "strike",
|
2020-07-20 22:18:43 +02:00
|
|
|
key,
|
2018-07-02 19:57:01 +02:00
|
|
|
};
|
|
|
|
|
2018-09-08 19:34:48 +02:00
|
|
|
return event;
|
2018-07-02 19:57:01 +02:00
|
|
|
},
|
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
inbound: (sender_id, data) => {
|
2021-06-13 14:52:08 +02:00
|
|
|
// All message readers may strike/unstrike todo tasks.
|
2019-11-02 00:06:25 +01:00
|
|
|
const key = data.key;
|
2020-07-23 03:45:19 +02:00
|
|
|
const item = this.task_map.get(key);
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2020-04-08 14:12:59 +02:00
|
|
|
if (item === undefined) {
|
2020-07-15 01:29:15 +02:00
|
|
|
blueslip.warn("Do we have legacy data? unknown key for tasks: " + key);
|
2018-07-02 19:57:01 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-04-08 14:12:59 +02:00
|
|
|
item.completed = !item.completed;
|
2018-07-02 19:57:01 +02:00
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
handle_event(sender_id, data) {
|
2019-11-02 00:06:25 +01:00
|
|
|
const type = data.type;
|
2020-07-23 03:45:19 +02:00
|
|
|
if (this.handle[type]) {
|
|
|
|
this.handle[type].inbound(sender_id, data);
|
2018-07-02 19:57:01 +02:00
|
|
|
}
|
2020-07-23 03:45:19 +02:00
|
|
|
}
|
|
|
|
}
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2021-02-10 16:51:34 +01:00
|
|
|
export function activate(opts) {
|
2019-11-02 00:06:25 +01:00
|
|
|
const elem = opts.elem;
|
|
|
|
const callback = opts.callback;
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2020-07-23 03:45:19 +02:00
|
|
|
const task_data = new TaskData();
|
2018-07-02 19:57:01 +02:00
|
|
|
|
|
|
|
function render() {
|
2019-11-02 00:06:25 +01:00
|
|
|
const html = render_widgets_todo_widget();
|
2018-07-02 19:57:01 +02:00
|
|
|
elem.html(html);
|
|
|
|
|
2020-07-15 01:29:15 +02:00
|
|
|
elem.find("button.add-task").on("click", (e) => {
|
2018-07-02 19:57:01 +02:00
|
|
|
e.stopPropagation();
|
2020-07-15 01:29:15 +02:00
|
|
|
elem.find(".widget-error").text("");
|
2019-11-02 00:06:25 +01:00
|
|
|
const task = elem.find("input.add-task").val().trim();
|
2020-02-22 11:50:24 +01:00
|
|
|
const desc = elem.find("input.add-desc").val().trim();
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2020-07-15 01:29:15 +02:00
|
|
|
if (task === "") {
|
2018-07-02 19:57:01 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-07-20 21:24:26 +02:00
|
|
|
elem.find(".add-task").val("").trigger("focus");
|
|
|
|
elem.find(".add-desc").val("").trigger("focus");
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2020-04-08 19:41:28 +02:00
|
|
|
const task_exists = task_data.name_in_use(task);
|
2018-07-02 19:57:01 +02:00
|
|
|
if (task_exists) {
|
2021-04-13 06:51:54 +02:00
|
|
|
elem.find(".widget-error").text($t({defaultMessage: "Task already exists"}));
|
2018-07-02 19:57:01 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-02-22 11:50:24 +01:00
|
|
|
const data = task_data.handle.new_task.outbound(task, desc);
|
2018-07-02 19:57:01 +02:00
|
|
|
callback(data);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
function render_results() {
|
2019-11-02 00:06:25 +01:00
|
|
|
const widget_data = task_data.get_widget_data();
|
|
|
|
const html = render_widgets_todo_widget_tasks(widget_data);
|
2020-07-15 01:29:15 +02:00
|
|
|
elem.find("ul.todo-widget").html(html);
|
|
|
|
elem.find(".widget-error").text("");
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2020-07-15 01:29:15 +02:00
|
|
|
elem.find("button.task").on("click", (e) => {
|
2018-07-02 19:57:01 +02:00
|
|
|
e.stopPropagation();
|
2020-07-15 01:29:15 +02:00
|
|
|
const key = $(e.target).attr("data-key");
|
2018-07-02 19:57:01 +02:00
|
|
|
|
2019-11-02 00:06:25 +01:00
|
|
|
const data = task_data.handle.strike.outbound(key);
|
2018-07-02 19:57:01 +02:00
|
|
|
callback(data);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
elem.handle_events = function (events) {
|
js: Automatically convert _.each to for…of.
This commit was automatically generated by the following script,
followed by lint --fix and a few small manual lint-related cleanups.
import * as babelParser from "recast/parsers/babel";
import * as recast from "recast";
import * as tsParser from "recast/parsers/typescript";
import { builders as b, namedTypes as n } from "ast-types";
import { Context } from "ast-types/lib/path-visitor";
import K from "ast-types/gen/kinds";
import { NodePath } from "ast-types/lib/node-path";
import assert from "assert";
import fs from "fs";
import path from "path";
import process from "process";
const checkExpression = (node: n.Node): node is K.ExpressionKind =>
n.Expression.check(node);
const checkStatement = (node: n.Node): node is K.StatementKind =>
n.Statement.check(node);
for (const file of process.argv.slice(2)) {
console.log("Parsing", file);
const ast = recast.parse(fs.readFileSync(file, { encoding: "utf8" }), {
parser: path.extname(file) === ".ts" ? tsParser : babelParser,
});
let changed = false;
let inLoop = false;
let replaceReturn = false;
const visitLoop = (...args: string[]) =>
function(this: Context, path: NodePath) {
for (const arg of args) {
this.visit(path.get(arg));
}
const old = { inLoop };
inLoop = true;
this.visit(path.get("body"));
inLoop = old.inLoop;
return false;
};
recast.visit(ast, {
visitDoWhileStatement: visitLoop("test"),
visitExpressionStatement(path) {
const { expression, comments } = path.node;
let valueOnly;
if (
n.CallExpression.check(expression) &&
n.MemberExpression.check(expression.callee) &&
!expression.callee.computed &&
n.Identifier.check(expression.callee.object) &&
expression.callee.object.name === "_" &&
n.Identifier.check(expression.callee.property) &&
["each", "forEach"].includes(expression.callee.property.name) &&
[2, 3].includes(expression.arguments.length) &&
checkExpression(expression.arguments[0]) &&
(n.FunctionExpression.check(expression.arguments[1]) ||
n.ArrowFunctionExpression.check(expression.arguments[1])) &&
[1, 2].includes(expression.arguments[1].params.length) &&
n.Identifier.check(expression.arguments[1].params[0]) &&
((valueOnly = expression.arguments[1].params[1] === undefined) ||
n.Identifier.check(expression.arguments[1].params[1])) &&
(expression.arguments[2] === undefined ||
n.ThisExpression.check(expression.arguments[2]))
) {
const old = { inLoop, replaceReturn };
inLoop = false;
replaceReturn = true;
this.visit(
path
.get("expression")
.get("arguments")
.get(1)
.get("body")
);
inLoop = old.inLoop;
replaceReturn = old.replaceReturn;
const [right, { body, params }] = expression.arguments;
const loop = b.forOfStatement(
b.variableDeclaration("let", [
b.variableDeclarator(
valueOnly ? params[0] : b.arrayPattern([params[1], params[0]])
),
]),
valueOnly
? right
: b.callExpression(
b.memberExpression(right, b.identifier("entries")),
[]
),
checkStatement(body) ? body : b.expressionStatement(body)
);
loop.comments = comments;
path.replace(loop);
changed = true;
}
this.traverse(path);
},
visitForStatement: visitLoop("init", "test", "update"),
visitForInStatement: visitLoop("left", "right"),
visitForOfStatement: visitLoop("left", "right"),
visitFunction(path) {
this.visit(path.get("params"));
const old = { replaceReturn };
replaceReturn = false;
this.visit(path.get("body"));
replaceReturn = old.replaceReturn;
return false;
},
visitReturnStatement(path) {
if (replaceReturn) {
assert(!inLoop); // could use labeled continue if this ever fires
const { argument, comments } = path.node;
if (argument === null) {
const s = b.continueStatement();
s.comments = comments;
path.replace(s);
} else {
const s = b.expressionStatement(argument);
s.comments = comments;
path.replace(s, b.continueStatement());
}
return false;
}
this.traverse(path);
},
visitWhileStatement: visitLoop("test"),
});
if (changed) {
console.log("Writing", file);
fs.writeFileSync(file, recast.print(ast).code, { encoding: "utf8" });
}
}
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-02-06 06:19:47 +01:00
|
|
|
for (const event of events) {
|
2018-07-02 19:57:01 +02:00
|
|
|
task_data.handle_event(event.sender_id, event.data);
|
js: Automatically convert _.each to for…of.
This commit was automatically generated by the following script,
followed by lint --fix and a few small manual lint-related cleanups.
import * as babelParser from "recast/parsers/babel";
import * as recast from "recast";
import * as tsParser from "recast/parsers/typescript";
import { builders as b, namedTypes as n } from "ast-types";
import { Context } from "ast-types/lib/path-visitor";
import K from "ast-types/gen/kinds";
import { NodePath } from "ast-types/lib/node-path";
import assert from "assert";
import fs from "fs";
import path from "path";
import process from "process";
const checkExpression = (node: n.Node): node is K.ExpressionKind =>
n.Expression.check(node);
const checkStatement = (node: n.Node): node is K.StatementKind =>
n.Statement.check(node);
for (const file of process.argv.slice(2)) {
console.log("Parsing", file);
const ast = recast.parse(fs.readFileSync(file, { encoding: "utf8" }), {
parser: path.extname(file) === ".ts" ? tsParser : babelParser,
});
let changed = false;
let inLoop = false;
let replaceReturn = false;
const visitLoop = (...args: string[]) =>
function(this: Context, path: NodePath) {
for (const arg of args) {
this.visit(path.get(arg));
}
const old = { inLoop };
inLoop = true;
this.visit(path.get("body"));
inLoop = old.inLoop;
return false;
};
recast.visit(ast, {
visitDoWhileStatement: visitLoop("test"),
visitExpressionStatement(path) {
const { expression, comments } = path.node;
let valueOnly;
if (
n.CallExpression.check(expression) &&
n.MemberExpression.check(expression.callee) &&
!expression.callee.computed &&
n.Identifier.check(expression.callee.object) &&
expression.callee.object.name === "_" &&
n.Identifier.check(expression.callee.property) &&
["each", "forEach"].includes(expression.callee.property.name) &&
[2, 3].includes(expression.arguments.length) &&
checkExpression(expression.arguments[0]) &&
(n.FunctionExpression.check(expression.arguments[1]) ||
n.ArrowFunctionExpression.check(expression.arguments[1])) &&
[1, 2].includes(expression.arguments[1].params.length) &&
n.Identifier.check(expression.arguments[1].params[0]) &&
((valueOnly = expression.arguments[1].params[1] === undefined) ||
n.Identifier.check(expression.arguments[1].params[1])) &&
(expression.arguments[2] === undefined ||
n.ThisExpression.check(expression.arguments[2]))
) {
const old = { inLoop, replaceReturn };
inLoop = false;
replaceReturn = true;
this.visit(
path
.get("expression")
.get("arguments")
.get(1)
.get("body")
);
inLoop = old.inLoop;
replaceReturn = old.replaceReturn;
const [right, { body, params }] = expression.arguments;
const loop = b.forOfStatement(
b.variableDeclaration("let", [
b.variableDeclarator(
valueOnly ? params[0] : b.arrayPattern([params[1], params[0]])
),
]),
valueOnly
? right
: b.callExpression(
b.memberExpression(right, b.identifier("entries")),
[]
),
checkStatement(body) ? body : b.expressionStatement(body)
);
loop.comments = comments;
path.replace(loop);
changed = true;
}
this.traverse(path);
},
visitForStatement: visitLoop("init", "test", "update"),
visitForInStatement: visitLoop("left", "right"),
visitForOfStatement: visitLoop("left", "right"),
visitFunction(path) {
this.visit(path.get("params"));
const old = { replaceReturn };
replaceReturn = false;
this.visit(path.get("body"));
replaceReturn = old.replaceReturn;
return false;
},
visitReturnStatement(path) {
if (replaceReturn) {
assert(!inLoop); // could use labeled continue if this ever fires
const { argument, comments } = path.node;
if (argument === null) {
const s = b.continueStatement();
s.comments = comments;
path.replace(s);
} else {
const s = b.expressionStatement(argument);
s.comments = comments;
path.replace(s, b.continueStatement());
}
return false;
}
this.traverse(path);
},
visitWhileStatement: visitLoop("test"),
});
if (changed) {
console.log("Writing", file);
fs.writeFileSync(file, recast.print(ast).code, { encoding: "utf8" });
}
}
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
2020-02-06 06:19:47 +01:00
|
|
|
}
|
|
|
|
|
2018-07-02 19:57:01 +02:00
|
|
|
render_results();
|
|
|
|
};
|
|
|
|
|
|
|
|
render();
|
|
|
|
render_results();
|
2021-02-10 16:51:34 +01:00
|
|
|
}
|