Skip to content

Commit 359d34f

Browse files
committed
chore: Some improvements
- Fixed settings info - Disable retryOnMount for accounts - Optimized support for older redmine version
1 parent b87f473 commit 359d34f

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

src/components/issues/IssuesList.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons";
2+
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
13
import { Fragment } from "react";
24
import { FormattedMessage } from "react-intl";
35
import useIssuePriorities from "../../hooks/useIssuePriorities";
@@ -7,8 +9,6 @@ import { TAccount, TIssue, TReference } from "../../types/redmine";
79
import { getGroupedIssues, getSortedIssues } from "../../utils/issue";
810
import Issue from "./Issue";
911
import { IssueTimerData } from "./IssueTimer";
10-
import { faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons";
11-
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
1212

1313
type IssueData = IssueTimerData & {
1414
pinned: boolean;
@@ -63,7 +63,7 @@ const IssuesList = ({ account, issues: rawIssues, issuesData: { data: issuesData
6363
issue={issue}
6464
priorityType={issuePriorities.getPriorityType(issue)}
6565
timerData={{ active: data.active, start: data.start, time: data.time }}
66-
assignedToMe={issue.assigned_to?.id === account?.id ?? false}
66+
assignedToMe={account ? account.id === issue.assigned_to?.id : true}
6767
pinned={data.pinned}
6868
remembered={data.remembered}
6969
onStart={() => {

src/hooks/useMyAccount.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const useMyAccount = () => {
99
queryKey: ["myAccount", settings.redmineURL, settings.redmineApiKey],
1010
queryFn: getMyAccount,
1111
staleTime: 1000 * 60 * 60,
12+
retryOnMount: false,
1213
});
1314

1415
return {

src/pages/SettingsPage.tsx

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,22 @@ const SettingsPage = () => {
204204
</>
205205
)}
206206
</Formik>
207-
<div className="mt-3 flex w-full flex-col items-center p-2">
208-
<a href="https://chrome.google.com/webstore/detail/redmine-time-tracking/ldcanhhkffokndenejhafhlkapflgcjg" target="_blank" tabIndex={-1} className="hover:underline">
209-
{chrome.runtime.getManifest().name}
210-
</a>
211-
<p>Version: {chrome.runtime.getManifest().version_name}</p>
212-
</div>
207+
<Info />
213208
{saved && <Toast type="success" message={formatMessage({ id: "settings.settings-saved" })} onClose={() => setSaved(false)} />}
214209
</>
215210
);
216211
};
217212

213+
const Info = () => {
214+
const { name, version, version_name } = chrome.runtime.getManifest();
215+
return (
216+
<div className="mt-3 flex w-full flex-col items-center p-2">
217+
<a href="https://chrome.google.com/webstore/detail/redmine-time-tracking/ldcanhhkffokndenejhafhlkapflgcjg" target="_blank" tabIndex={-1} className="hover:underline">
218+
{name}
219+
</a>
220+
<p>Version: {version_name || version}</p>
221+
</div>
222+
);
223+
};
224+
218225
export default SettingsPage;

0 commit comments

Comments
 (0)