Skip to content

Commit

Permalink
chore: Some improvements
Browse files Browse the repository at this point in the history
- Fixed settings info
- Disable retryOnMount for accounts
- Optimized support for older redmine version
  • Loading branch information
CrawlerCode committed Sep 5, 2023
1 parent b87f473 commit 359d34f
Showing 3 changed files with 17 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/components/issues/IssuesList.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { Fragment } from "react";
import { FormattedMessage } from "react-intl";
import useIssuePriorities from "../../hooks/useIssuePriorities";
@@ -7,8 +9,6 @@ import { TAccount, TIssue, TReference } from "../../types/redmine";
import { getGroupedIssues, getSortedIssues } from "../../utils/issue";
import Issue from "./Issue";
import { IssueTimerData } from "./IssueTimer";
import { faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";

type IssueData = IssueTimerData & {
pinned: boolean;
@@ -63,7 +63,7 @@ const IssuesList = ({ account, issues: rawIssues, issuesData: { data: issuesData
issue={issue}
priorityType={issuePriorities.getPriorityType(issue)}
timerData={{ active: data.active, start: data.start, time: data.time }}
assignedToMe={issue.assigned_to?.id === account?.id ?? false}
assignedToMe={account ? account.id === issue.assigned_to?.id : true}
pinned={data.pinned}
remembered={data.remembered}
onStart={() => {
1 change: 1 addition & 0 deletions src/hooks/useMyAccount.ts
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ const useMyAccount = () => {
queryKey: ["myAccount", settings.redmineURL, settings.redmineApiKey],
queryFn: getMyAccount,
staleTime: 1000 * 60 * 60,
retryOnMount: false,
});

return {
19 changes: 13 additions & 6 deletions src/pages/SettingsPage.tsx
Original file line number Diff line number Diff line change
@@ -204,15 +204,22 @@ const SettingsPage = () => {
</>
)}
</Formik>
<div className="mt-3 flex w-full flex-col items-center p-2">
<a href="https://chrome.google.com/webstore/detail/redmine-time-tracking/ldcanhhkffokndenejhafhlkapflgcjg" target="_blank" tabIndex={-1} className="hover:underline">
{chrome.runtime.getManifest().name}
</a>
<p>Version: {chrome.runtime.getManifest().version_name}</p>
</div>
<Info />
{saved && <Toast type="success" message={formatMessage({ id: "settings.settings-saved" })} onClose={() => setSaved(false)} />}
</>
);
};

const Info = () => {
const { name, version, version_name } = chrome.runtime.getManifest();
return (
<div className="mt-3 flex w-full flex-col items-center p-2">
<a href="https://chrome.google.com/webstore/detail/redmine-time-tracking/ldcanhhkffokndenejhafhlkapflgcjg" target="_blank" tabIndex={-1} className="hover:underline">
{name}
</a>
<p>Version: {version_name || version}</p>
</div>
);
};

export default SettingsPage;

0 comments on commit 359d34f

Please sign in to comment.