diff --git a/.vscode/launch.json b/.vscode/launch.json index 4c564d73..ddfe6996 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -11,7 +11,13 @@ "request": "launch", "reAttach": true, "url": "http://localhost:8080", - "webRoot": "${workspaceFolder}" + "webRoot": "${workspaceFolder}", + "pathMappings": [ + { + "url": "webpack://tgstation-server-control-panel/src/components/views/Instance", + "path": "${workspaceFolder}/src/components/views/Instance" + } + ] }, { "type": "chrome", diff --git a/src/components/views/Instance/Edit/Repository.tsx b/src/components/views/Instance/Edit/Repository.tsx index dfd310af..9179b1d8 100644 --- a/src/components/views/Instance/Edit/Repository.tsx +++ b/src/components/views/Instance/Edit/Repository.tsx @@ -117,6 +117,7 @@ export default function Repository(): JSX.Element { .then(prs => { if (prs.code === StatusCode.ERROR) { addError(errorState, prs.error); + setPRs(PRs ?? []); } else { setPRs(prs.payload); if (resetDesiredState) reloadDesiredState(repositoryInfo, true); @@ -127,6 +128,7 @@ export default function Repository(): JSX.Element { errorState, new InternalError(ErrorCode.APP_FAIL, { jsError: e as Error }) ); + setPRs(PRs ?? []); }); } } diff --git a/src/translations/locales/en.json b/src/translations/locales/en.json index 98421b04..95fa8740 100644 --- a/src/translations/locales/en.json +++ b/src/translations/locales/en.json @@ -33,8 +33,8 @@ "navbar.logout": "Logout", "app.job.started": "Started: ", "app.job.startedby": "Started By: ", - "app.job.stopped": "Stopped: ", - "app.job.stoppedby": "Stopped By: ", + "app.job.stopped": "Cancelled: ", + "app.job.stoppedby": "Cancelled By: ", "error.http.access_denied.desc": "Access to this resource is denied", "error.unhandled_response.desc": "The application received an unexpected response", "error.unhandled_global_response.desc": "The application received an unexpected global response", @@ -262,7 +262,7 @@ "view.instance.repo.pending.title": "Pending Changes", "view.instance.repo.pending.none": "No pending changes", "view.instance.repo.pending.reapply": "Retestmerge #{number} ({title}) at commit {commit}", - "view.instance.repo.pending.reset": "Reset repository to tracked reference", + "view.instance.repo.pending.reset": "Reset repository to tracked remote reference", "view.instance.repo.pending.reset.nobranch": "Recheckout commit {commit}", "view.instance.repo.pending.update": "Merge changes from origin", "view.instance.repo.pending.added": "Testmerge #{number} ({title}) at commit {commit}", @@ -272,7 +272,7 @@ "view.instance.repo.pending.renamed": "Change the comment on #{number}", "view.instance.repo.update": "Update repository from origin", "view.instance.repo.update.desc": "This option will add new changes from the remote repository to the local", - "view.instance.repo.reset": "Reset repository to origin", + "view.instance.repo.reset": "Reset repository to origin first", "view.instance.repo.reset.desc": "This option will reset the repository to the tracked origin, updating the repository and clearing any test merged PRs", "view.instance.repo.manual": "Manual PR Entry", "view.instance.repo.manual.desc": "Use this box to manually test merge a PR by entering its number and clicking add pr", @@ -372,8 +372,6 @@ "config.showjson.desc": "Most pages will display the underlying json data if enabled.", "config.manualpr": "Show manual PR entry on repository page", "config.manualpr.desc": "Controls whether or not an input box is displayed to manually testmerge a pr based on its PR number. This option is ignored and the manual PR entry box is always displayed when using a repository hosted on GitLab.", - "config.manualreset": "Show force reset switch on repository page", - "config.manualreset.desc": "Controls whether or not an input box is displayed to force a repository reset. This option is ignored and the manual PR entry box is always displayed when using a repository hosted on GitLab.", "loading.loading": "Loading...", "loading.login": "Logging in...", "loading.page": "Loading page: ",