Skip to content

[FIX] issue #30 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomaspaulb merged 1 commit into from
Apr 7, 2026
Merged

[FIX] issue #30 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions dist/chrome/js/components/popup-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,8 @@ class PopupApp extends Component {
this.toggleAutoDownload = this.toggleAutoDownload.bind(this);
this.toggleUseExistingSession = this.toggleUseExistingSession.bind(this);
this.togglePassword = this.togglePassword.bind(this);
this.updateLimitPreference = this.updateLimitPreference.bind(this);
this.updateShowAllPreference = this.updateShowAllPreference.bind(this);

onMounted(() => {
const bootLoader = document.getElementById('boot-loader');
Expand Down Expand Up @@ -543,31 +545,36 @@ class PopupApp extends Component {

/**
* Issues filtered by current UI settings.
*/
*/
get filteredIssues() {
const limit = this.state.limitTo ? Number(this.state.limitTo) : null;
const query = (this.state.searchQuery || '').trim();
let issues = [...this.state.issues];

issues.sort((a, b) => {
if (a.id === this.state.activeTimerId) return -1;
if (b.id === this.state.activeTimerId) return 1;

const priorityDelta = Number(b.priority || 0) - Number(a.priority || 0);
if (priorityDelta !== 0) return priorityDelta;

const stageDelta = Number(a.stage_sequence ?? 9999) - Number(b.stage_sequence ?? 9999);
if (stageDelta !== 0) return stageDelta;

return a.id - b.id;
if (a.id === this.state.activeTimerId) return -1;
if (b.id === this.state.activeTimerId) return 1;
const priorityDelta = Number(b.priority || 0) - Number(a.priority || 0);
if (priorityDelta !== 0) return priorityDelta;
const stageDelta = Number(a.stage_sequence ?? 9999) - Number(b.stage_sequence ?? 9999);
if (stageDelta !== 0) return stageDelta;
return a.id - b.id;
});

if (!this.state.allIssues && this.state.user?.id) {
issues = issues.filter(
(issue) => issue.id === this.state.activeTimerId || issue.user_id?.[0] === this.state.user.id
);
const matchesSearch = (issue) => matchesIssue(issue, query);

if (this.state.allIssues) {
issues = issues.filter(matchesSearch);
} else if (this.state.user?.id) {
issues = issues.filter(
(issue) =>
issue.id === this.state.activeTimerId ||
(issue.user_id?.[0] === this.state.user.id && matchesSearch(issue))
);
} else {
issues = issues.filter(matchesSearch);
}

issues = issues.filter((issue) => matchesIssue(issue, this.state.searchQuery));
return limit ? issues.slice(0, limit) : issues;
}

Expand Down
39 changes: 23 additions & 16 deletions dist/firefox/js/components/popup-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,8 @@ class PopupApp extends Component {
this.toggleAutoDownload = this.toggleAutoDownload.bind(this);
this.toggleUseExistingSession = this.toggleUseExistingSession.bind(this);
this.togglePassword = this.togglePassword.bind(this);
this.updateLimitPreference = this.updateLimitPreference.bind(this);
this.updateShowAllPreference = this.updateShowAllPreference.bind(this);

onMounted(() => {
const bootLoader = document.getElementById('boot-loader');
Expand Down Expand Up @@ -543,31 +545,36 @@ class PopupApp extends Component {

/**
* Issues filtered by current UI settings.
*/
*/
get filteredIssues() {
const limit = this.state.limitTo ? Number(this.state.limitTo) : null;
const query = (this.state.searchQuery || '').trim();
let issues = [...this.state.issues];

issues.sort((a, b) => {
if (a.id === this.state.activeTimerId) return -1;
if (b.id === this.state.activeTimerId) return 1;

const priorityDelta = Number(b.priority || 0) - Number(a.priority || 0);
if (priorityDelta !== 0) return priorityDelta;

const stageDelta = Number(a.stage_sequence ?? 9999) - Number(b.stage_sequence ?? 9999);
if (stageDelta !== 0) return stageDelta;

return a.id - b.id;
if (a.id === this.state.activeTimerId) return -1;
if (b.id === this.state.activeTimerId) return 1;
const priorityDelta = Number(b.priority || 0) - Number(a.priority || 0);
if (priorityDelta !== 0) return priorityDelta;
const stageDelta = Number(a.stage_sequence ?? 9999) - Number(b.stage_sequence ?? 9999);
if (stageDelta !== 0) return stageDelta;
return a.id - b.id;
});

if (!this.state.allIssues && this.state.user?.id) {
issues = issues.filter(
(issue) => issue.id === this.state.activeTimerId || issue.user_id?.[0] === this.state.user.id
);
const matchesSearch = (issue) => matchesIssue(issue, query);

if (this.state.allIssues) {
issues = issues.filter(matchesSearch);
} else if (this.state.user?.id) {
issues = issues.filter(
(issue) =>
issue.id === this.state.activeTimerId ||
(issue.user_id?.[0] === this.state.user.id && matchesSearch(issue))
);
} else {
issues = issues.filter(matchesSearch);
}

issues = issues.filter((issue) => matchesIssue(issue, this.state.searchQuery));
return limit ? issues.slice(0, limit) : issues;
}

Expand Down
Loading