Skip to content

Commit e289399

Browse files
committed
fix: Bug fixes
- Fixed truncated project label - Fixed issues query loading state - Bump version to 1.4.1
1 parent 9ead458 commit e289399

File tree

5 files changed

+28
-22
lines changed

5 files changed

+28
-22
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "redmine-time-tracking",
33
"description": "Redmine Time Tracking",
4-
"version": "1.4.0",
4+
"version": "1.4.1",
55
"author": {
66
"name": "CrawlerCode",
77
"email": "[email protected]"

public/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 3,
33
"name": "Redmine Time Tracking",
4-
"version": "1.4.0",
4+
"version": "1.4.1",
55
"description": "Start-stop timer for Redmine",
66
"icons": {
77
"16": "logo16.png",

src/components/issues/Issue.tsx

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,33 @@ const Issue = ({ issue, data: { active, time, start, remember }, assignedToMe, o
140140
onCancel={() => setEditTime(undefined)}
141141
/>
142142
)) || (
143-
<span className={clsx("text-lg", timer > 0 ? "text-yellow-500" : "text-gray-700 dark:text-gray-500", active && "font-semibold")} onDoubleClick={() => setEditTime(timer)} data-tooltip-id="tooltip-edit-timer">
144-
{formatTime(timer)}
145-
</span>
143+
<>
144+
<Tooltip id="tooltip-edit-timer" place="top" delayShow={700} content="Double-click to edit" className="italic" />
145+
<span className={clsx("text-lg", timer > 0 ? "text-yellow-500" : "text-gray-700 dark:text-gray-500", active && "font-semibold")} onDoubleClick={() => setEditTime(timer)} data-tooltip-id="tooltip-edit-timer">
146+
{formatTime(timer)}
147+
</span>
148+
</>
146149
)}
147-
<Tooltip id="tooltip-edit-timer" place="top" delayShow={700} content="Double-click to edit" className="italic" />
148150
{!active ? (
149-
<FontAwesomeIcon icon={faPlay} size="2x" className="text-green-500 cursor-pointer focus:outline-none" onClick={onStart} data-tooltip-id="tooltip-start-timer" tabIndex={-1} />
151+
<>
152+
<Tooltip id="tooltip-start-timer" place="left" delayShow={700} content="Click to start timer" className="italic" />
153+
<FontAwesomeIcon icon={faPlay} size="2x" className="text-green-500 cursor-pointer focus:outline-none" onClick={onStart} data-tooltip-id="tooltip-start-timer" tabIndex={-1} />
154+
</>
150155
) : (
151-
<FontAwesomeIcon icon={faPause} size="2x" className="text-red-500 cursor-pointer focus:outline-none" onClick={() => onPause(timer)} data-tooltip-id="tooltip-pause-timer" tabIndex={-1} />
156+
<>
157+
<Tooltip id="tooltip-pause-timer" place="left" delayShow={700} content="Click to pause timer" className="italic" />
158+
<FontAwesomeIcon icon={faPause} size="2x" className="text-red-500 cursor-pointer focus:outline-none" onClick={() => onPause(timer)} data-tooltip-id="tooltip-pause-timer" tabIndex={-1} />
159+
</>
152160
)}
161+
<Tooltip id="tooltip-stop-timer" place="top" delayShow={700} content="Click to stop timer" className="italic" />
153162
<FontAwesomeIcon icon={faStop} size="2x" className="text-red-500 cursor-pointer focus:outline-none" onClick={onStop} data-tooltip-id="tooltip-stop-timer" tabIndex={-1} />
163+
<Tooltip id={`tooltip-done-timer-${issue.id}`} place="bottom" delayShow={700} className="z-10 italic opacity-100">
164+
Click to transfer{" "}
165+
<span className={clsx("text-xs", timer > 0 ? "text-yellow-500" : "text-gray-700 dark:text-gray-500", active && "font-semibold")}>
166+
{formatTime(settings.options.roundTimeNearestQuarterHour ? roundTimeNearestQuarterHour(timer) : timer)}
167+
</span>{" "}
168+
to Redmine issue
169+
</Tooltip>
154170
<FontAwesomeIcon
155171
icon={faCheck}
156172
size="2x"
@@ -159,22 +175,12 @@ const Issue = ({ issue, data: { active, time, start, remember }, assignedToMe, o
159175
data-tooltip-id={`tooltip-done-timer-${issue.id}`}
160176
tabIndex={-1}
161177
/>
162-
<Tooltip id="tooltip-start-timer" place="left" delayShow={700} content="Click to start timer" className="italic" />
163-
<Tooltip id="tooltip-pause-timer" place="left" delayShow={700} content="Click to pause timer" className="italic" />
164-
<Tooltip id="tooltip-stop-timer" place="top" delayShow={700} content="Click to stop timer" className="italic" />
165-
<Tooltip id={`tooltip-done-timer-${issue.id}`} place="bottom" delayShow={700} className="z-10 italic opacity-100">
166-
Click to transfer{" "}
167-
<span className={clsx("text-xs", timer > 0 ? "text-yellow-500" : "text-gray-700 dark:text-gray-500", active && "font-semibold")}>
168-
{formatTime(settings.options.roundTimeNearestQuarterHour ? roundTimeNearestQuarterHour(timer) : timer)}
169-
</span>{" "}
170-
to Redmine issue
171-
</Tooltip>
172178
</div>
173179
</div>
174180
{!assignedToMe && (
175181
<>
176182
<Tooltip id="tooltip-not-assigned-to-me" place="left" delayShow={700} content="Issue is not assigned to you" className="italic" />
177-
<FontAwesomeIcon icon={faCircleUser} className="absolute top-2 right-2 text-gray-300 dark:text-gray-600" data-tooltip-id="tooltip-not-assigned-to-me" />
183+
<FontAwesomeIcon icon={faCircleUser} className="absolute top-2 right-2 text-gray-300 dark:text-gray-600" data-tooltip-id="tooltip-not-assigned-to-me" tabIndex={-1} />
178184
</>
179185
)}
180186
</div>

src/components/issues/IssuesList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ const IssuesList = ({ account, issues, issuesData: { data: issuesData, setData:
4646
<>
4747
{groupedIssues.map(({ project, issues: groupIssues }) => (
4848
<>
49-
<a href={`${settings.redmineURL}/projects/${project.id}`} target="_blank" className="w-fit" tabIndex={-1}>
50-
<h5 className="text-xs text-slate-500 dark:text-slate-300 truncate w-fit">{project.name}</h5>
49+
<a href={`${settings.redmineURL}/projects/${project.id}`} target="_blank" tabIndex={-1}>
50+
<h5 className="text-xs text-slate-500 dark:text-slate-300 truncate">{project.name}</h5>
5151
</a>
5252
{groupIssues.map((issue) => {
5353
const data: IssueData = issuesData?.[issue.id] ?? {

src/hooks/useMyIssues.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const useMyIssues = (additionalIssuesIds: number[], search: string) => {
6262
account: myAccountQuery.data,
6363
data: issues,
6464
extendedSearch: extendedSearchIssues,
65-
isLoading: issuesQuery.isLoading,
65+
isLoading: issuesQuery.isInitialLoading || additionalIssuesQuery.isInitialLoading,
6666
isError: issuesQuery.isError,
6767
};
6868
};

0 commit comments

Comments
 (0)