Skip to content

Commit 1bc317f

Browse files
committed
frontend/projects: fixing erroneous display of selected filter hashtag
1 parent d0147bc commit 1bc317f

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

src/packages/frontend/projects/project-list-desc.tsx

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,25 @@
33
* License: AGPLv3 s.t. "Commons Clause" – see LICENSE.md for details
44
*/
55

6-
import { Icon, Gap } from "../components";
7-
import { plural } from "@cocalc/util/misc";
86
import { Button } from "antd";
9-
import { Alert, ButtonGroup, ButtonToolbar } from "../antd-bootstrap";
10-
import { webapp_client } from "../webapp-client";
11-
import { alert_message } from "../alerts";
7+
8+
import { ResetProjectsConfirmation } from "@cocalc/frontend/account/upgrades/reset-projects";
9+
import { alert_message } from "@cocalc/frontend/alerts";
10+
import {
11+
Alert,
12+
ButtonGroup,
13+
ButtonToolbar,
14+
} from "@cocalc/frontend/antd-bootstrap";
1215
import {
1316
React,
1417
useActions,
1518
useMemo,
16-
useTypedRedux,
1719
useState,
18-
} from "../app-framework";
19-
import { ResetProjectsConfirmation } from "../account/upgrades/reset-projects";
20+
useTypedRedux,
21+
} from "@cocalc/frontend/app-framework";
22+
import { Gap, Icon } from "@cocalc/frontend/components";
23+
import { webapp_client } from "@cocalc/frontend/webapp-client";
24+
import { plural } from "@cocalc/util/misc";
2025

2126
interface Props {
2227
visible_projects: string[];
@@ -31,11 +36,9 @@ export const ProjectsListingDescription: React.FC<Props> = ({
3136
const hidden = useTypedRedux("projects", "hidden");
3237
const search: string | undefined = useTypedRedux("projects", "search");
3338
const selected_hashtags = useTypedRedux("projects", "selected_hashtags");
34-
const selected_hashtags_for_filter: {
35-
[tag: string]: boolean;
36-
} = useMemo(() => {
39+
const selected_hashtags_for_filter: string[] = useMemo(() => {
3740
const filter = `${!!hidden}-${!!deleted}`;
38-
return selected_hashtags?.get(filter)?.toJS() ?? {};
41+
return selected_hashtags?.get(filter)?.toJS() ?? [];
3942
}, [selected_hashtags, deleted, hidden]);
4043

4144
const [show_alert, set_show_alert] = useState<
@@ -130,7 +133,7 @@ export const ProjectsListingDescription: React.FC<Props> = ({
130133
let query = (search ?? "").toLowerCase();
131134
const hashtags_string = (() => {
132135
const result: string[] = [];
133-
for (const name in selected_hashtags_for_filter) {
136+
for (const name of selected_hashtags_for_filter) {
134137
result.push(name);
135138
}
136139
return result;
@@ -261,7 +264,7 @@ export const ProjectsListingDescription: React.FC<Props> = ({
261264
return visible_projects.filter(
262265
(project_id) =>
263266
project_map?.getIn([project_id, "users", account_id, "group"]) !==
264-
"owner"
267+
"owner",
265268
);
266269
}
267270

@@ -316,15 +319,15 @@ export const ProjectsListingDescription: React.FC<Props> = ({
316319
visible_projects.length
317320
} ${plural(
318321
visible_projects.length,
319-
"project"
322+
"project",
320323
)} listed here (you own the other ${plural(other, "one")}).`;
321324
} else {
322325
if (v.length === 1) {
323326
desc = "You are a collaborator on the one project listed here.";
324327
} else {
325328
desc = `You are a collaborator on ALL of the ${v.length} ${plural(
326329
v.length,
327-
"project"
330+
"project",
328331
)} listed here.`;
329332
}
330333
}

0 commit comments

Comments
 (0)