mirror of
https://github.com/tdurieux/anonymous_github.git
synced 2026-08-15 00:10:44 +02:00
fix: dashboard menu clickability + expiration date UX (#753)
* fix: dashboard menu clickability + expiration date UX Dashboard actions menu: - Inactive (expired/removed) rows dimmed via their cells instead of the row, so `opacity` no longer creates a stacking context that trapped the actions dropdown beneath later rows and made its items unclickable. - Add an "Extend 6 months" menu item for expired repos/PRs/gists. Expiration form (anonymize): - Fix the "After , the content will be removed." blank date: guard the helper text and add min/max validation feedback so an invalid pick no longer nulls the model into a broken sentence. - Add a `min` (today) so past dates can no longer be selected, and compute min/max from local date parts (not UTC) to avoid a timezone off-by-one in the native picker. - Default expiration is now 6 months (single source of truth, removing a latent double-offset bug); max stays at 1 year. - Block submitting a missing/out-of-range expiration date. Backend: - New POST /:id/extend endpoint for repos, PRs and gists that pushes the expiration +6 months and re-anonymizes so expired items come back online, mirroring the refresh flow. Shared extendExpirationDate helper. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix: add frontend translation for invalid_status error code The new /extend endpoints throw an "invalid_status" AnonymousError, which the error-code coverage test requires to have a locale entry. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
6a820408a1
commit
5ef10dee9e
@@ -1,7 +1,13 @@
|
||||
import * as express from "express";
|
||||
import { ensureAuthenticated } from "./connection";
|
||||
|
||||
import { getGist, getUser, handleError, isOwnerOrAdmin } from "./route-utils";
|
||||
import {
|
||||
getGist,
|
||||
getUser,
|
||||
handleError,
|
||||
isOwnerOrAdmin,
|
||||
extendExpirationDate,
|
||||
} from "./route-utils";
|
||||
import AnonymousError from "../../core/AnonymousError";
|
||||
import { IAnonymizedGistDocument } from "../../core/model/anonymizedGists/anonymizedGists.types";
|
||||
import Gist from "../../core/Gist";
|
||||
@@ -31,6 +37,45 @@ router.post(
|
||||
}
|
||||
);
|
||||
|
||||
// extend the expiration of a gist (default +6 months) and bring it back online
|
||||
// if it had expired
|
||||
router.post(
|
||||
"/:gistId/extend",
|
||||
async (req: express.Request, res: express.Response) => {
|
||||
try {
|
||||
const gist = await getGist(req, res, { nocheck: true });
|
||||
if (!gist) return;
|
||||
|
||||
if (
|
||||
gist.status == RepositoryStatus.PREPARING ||
|
||||
gist.status == RepositoryStatus.REMOVING ||
|
||||
gist.status == RepositoryStatus.EXPIRING ||
|
||||
gist.status == RepositoryStatus.REMOVED
|
||||
) {
|
||||
throw new AnonymousError("invalid_status", {
|
||||
object: gist,
|
||||
httpStatus: 409,
|
||||
});
|
||||
}
|
||||
|
||||
const user = await getUser(req);
|
||||
isOwnerOrAdmin([gist.owner.id], user);
|
||||
|
||||
const newExpiration = extendExpirationDate(gist.model.options.expirationDate);
|
||||
gist.model.options.expirationDate = newExpiration;
|
||||
await AnonymizedGistModel.updateOne(
|
||||
{ _id: gist.model._id },
|
||||
{ $set: { "options.expirationDate": newExpiration } }
|
||||
).exec();
|
||||
|
||||
await gist.updateIfNeeded({ force: true });
|
||||
res.json({ status: gist.status, expirationDate: newExpiration });
|
||||
} catch (error) {
|
||||
handleError(error, res, req);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
// delete a gist
|
||||
router.delete(
|
||||
"/:gistId/",
|
||||
|
||||
@@ -6,6 +6,7 @@ import {
|
||||
getUser,
|
||||
handleError,
|
||||
isOwnerOrAdmin,
|
||||
extendExpirationDate,
|
||||
} from "./route-utils";
|
||||
import AnonymousError from "../../core/AnonymousError";
|
||||
import { IAnonymizedPullRequestDocument } from "../../core/model/anonymizedPullRequests/anonymizedPullRequests.types";
|
||||
@@ -36,6 +37,47 @@ router.post(
|
||||
}
|
||||
);
|
||||
|
||||
// extend the expiration of a pullRequest (default +6 months) and bring it back
|
||||
// online if it had expired
|
||||
router.post(
|
||||
"/:pullRequestId/extend",
|
||||
async (req: express.Request, res: express.Response) => {
|
||||
try {
|
||||
const pullRequest = await getPullRequest(req, res, { nocheck: true });
|
||||
if (!pullRequest) return;
|
||||
|
||||
if (
|
||||
pullRequest.status == RepositoryStatus.PREPARING ||
|
||||
pullRequest.status == RepositoryStatus.REMOVING ||
|
||||
pullRequest.status == RepositoryStatus.EXPIRING ||
|
||||
pullRequest.status == RepositoryStatus.REMOVED
|
||||
) {
|
||||
throw new AnonymousError("invalid_status", {
|
||||
object: pullRequest,
|
||||
httpStatus: 409,
|
||||
});
|
||||
}
|
||||
|
||||
const user = await getUser(req);
|
||||
isOwnerOrAdmin([pullRequest.owner.id], user);
|
||||
|
||||
const newExpiration = extendExpirationDate(
|
||||
pullRequest.model.options.expirationDate
|
||||
);
|
||||
pullRequest.model.options.expirationDate = newExpiration;
|
||||
await AnonymizedPullRequestModel.updateOne(
|
||||
{ _id: pullRequest.model._id },
|
||||
{ $set: { "options.expirationDate": newExpiration } }
|
||||
).exec();
|
||||
|
||||
await pullRequest.updateIfNeeded({ force: true });
|
||||
res.json({ status: pullRequest.status, expirationDate: newExpiration });
|
||||
} catch (error) {
|
||||
handleError(error, res, req);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
// delete a pullRequest
|
||||
router.delete(
|
||||
"/:pullRequestId/",
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
handleError,
|
||||
isOwnerOrAdmin,
|
||||
isOwnerCoauthorOrAdmin,
|
||||
extendExpirationDate,
|
||||
} from "./route-utils";
|
||||
import { getRepositoryFromGitHub } from "../../core/source/GitHubRepository";
|
||||
import gh = require("parse-github-url");
|
||||
@@ -162,6 +163,49 @@ router.post(
|
||||
}
|
||||
);
|
||||
|
||||
// extend the expiration of a repository (default +6 months) and bring it back
|
||||
// online if it had expired
|
||||
router.post(
|
||||
"/:repoId/extend",
|
||||
async (req: express.Request, res: express.Response) => {
|
||||
try {
|
||||
const repo = await getRepo(req, res, { nocheck: true });
|
||||
if (!repo) return;
|
||||
|
||||
if (
|
||||
repo.status == RepositoryStatus.PREPARING ||
|
||||
repo.status == RepositoryStatus.REMOVING ||
|
||||
repo.status == RepositoryStatus.EXPIRING ||
|
||||
repo.status == RepositoryStatus.REMOVED
|
||||
) {
|
||||
throw new AnonymousError("invalid_status", {
|
||||
object: repo,
|
||||
httpStatus: 409,
|
||||
});
|
||||
}
|
||||
|
||||
const user = await getUser(req);
|
||||
isOwnerCoauthorOrAdmin(repo, user);
|
||||
|
||||
const newExpiration = extendExpirationDate(
|
||||
repo.model.options.expirationDate
|
||||
);
|
||||
repo.model.options.expirationDate = newExpiration;
|
||||
await AnonymizedRepositoryModel.updateOne(
|
||||
{ _id: repo.model._id },
|
||||
{ $set: { "options.expirationDate": newExpiration } }
|
||||
).exec();
|
||||
|
||||
// Re-anonymize so an expired repository comes back online, mirroring the
|
||||
// refresh flow.
|
||||
await repo.updateIfNeeded({ force: true });
|
||||
res.json({ status: repo.status, expirationDate: newExpiration });
|
||||
} catch (error) {
|
||||
handleError(error, res, req);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
// delete a repository
|
||||
router.delete(
|
||||
"/:repoId/",
|
||||
|
||||
@@ -114,6 +114,20 @@ export function isOwnerCoauthorOrAdmin(repo: Repository, user: User) {
|
||||
});
|
||||
}
|
||||
|
||||
// Compute a new expiration date `months` ahead. Anchors on the current
|
||||
// expiration date when it is still in the future, otherwise on now, so an
|
||||
// already-expired item is pushed forward from today rather than from a stale
|
||||
// past date.
|
||||
export function extendExpirationDate(
|
||||
current: Date | null | undefined,
|
||||
months = 6
|
||||
): Date {
|
||||
const now = new Date();
|
||||
const base = current && new Date(current) > now ? new Date(current) : now;
|
||||
base.setMonth(base.getMonth() + months);
|
||||
return base;
|
||||
}
|
||||
|
||||
// Pull the first project-relevant frame ("file:line:col") out of a stack so
|
||||
// background-job errors (no req.originalUrl) still get a debug pointer in the
|
||||
// `url` slot. Skips node internals and node_modules.
|
||||
|
||||
Reference in New Issue
Block a user