fix: Fix issues ordering if "pin tracked issues" enabled (#16)

Author: CrawlerCode

package.json

@@ -1,7 +1,7 @@
 {
   "name": "redmine-time-tracking",
   "description": "Redmine Time Tracking",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "author": {
     "name": "CrawlerCode",
     "email": "[email protected]"
@@ -12,7 +12,7 @@
   },
   "type": "module",
   "scripts": {
-    "dev": "tsc && vite build --watch",
+    "dev": "node scripts/updateVersion.js && tsc && vite build --watch",
     "build": "node scripts/updateVersion.js && tsc && vite build",
     "pack": "node scripts/pack.js",
     "release": "gh release create v%npm_package_version% release/redmine-time-tracking-v%npm_package_version%.zip --notes-file release_notes.md --generate-notes",

public/manifest.json

@@ -1,6 +1,6 @@
 {
     "manifest_version": 3,
-    "version": "1.16.0",
+    "version": "1.16.1",
     "name": "__MSG_extName__",
     "description": "__MSG_extDesc__",
     "default_locale": "en",

src/components/issues/IssuesList.tsx

@@ -36,8 +36,9 @@ const IssuesList = ({ account, issues: rawIssues, issuePriorities, projectVersio
 
   return (
     <>
-      {groupedIssues.map(({ project, versions, groups }) => (
-        <Fragment key={project.id}>
+      {groupedIssues.map(({ type, project, versions, groups }) => (
+        <Fragment key={type}>
+          {project && (
           <div
             className={clsx("flex justify-between gap-x-2", {
               "sticky top-0 z-[5] -mx-2 -my-1 bg-white px-2 py-1 shadow shadow-white dark:bg-gray-800 dark:shadow-gray-800": settings.style.stickyScroll,
@@ -52,6 +53,7 @@ const IssuesList = ({ account, issues: rawIssues, issuePriorities, projectVersio
               </button>
             )}
           </div>
+          )}
           {groups.map(({ type, version, issues }) => (
             <Fragment key={`${type}-${version?.id}`}>
               {settings.style.groupIssuesByVersion && versions.length > 0 && ["version", "no-version"].includes(type) && (

src/utils/issue.ts

@@ -2,7 +2,7 @@ import { IssuesData } from "../components/issues/IssuesList";
 import { Settings } from "../provider/SettingsProvider";
 import { TIssue, TIssuesPriority, TReference, TVersion } from "../types/redmine";
 
-type GroupType = "active" | "paused" | "pinned" | "version" | "no-version";
+type GroupType = "pinned" | "version" | "no-version";
 
 type IssueGroup = {
   type: GroupType;
@@ -11,7 +11,8 @@ type IssueGroup = {
 };
 
 type GroupedIssues = {
-  project: TReference;
+  type: string;
+  project?: TReference;
   versions: TVersion[];
   groups: {
     type: GroupType;
@@ -21,14 +22,11 @@ type GroupedIssues = {
 }[];
 
 type GroupedIssuesHelper = Record<
-  number,
+  number | string,
   {
+    type: string;
     // The project reference
-    project: TReference;
-    // Pinned issues
-    activeIssues: TIssue[];
-    // Pinned issues
-    pausedIssues: TIssue[];
+    project?: TReference;
     // Pinned issues
     pinnedIssues: TIssue[];
     // All versions of project
@@ -76,30 +74,49 @@ export const getSortedIssues = (issues: TIssue[], issuePriorities: TIssuesPriori
  */
 export const getGroupedIssues = (issues: TIssue[], projectVersions: Record<number, TVersion[]>, issuesData: IssuesData, settings: Settings): GroupedIssues => {
   const grouped = issues.reduce((result: GroupedIssuesHelper, issue) => {
-    if (!(issue.project.id in result)) {
-      result[issue.project.id] = {
-        project: issue.project,
-        pinnedIssues: [],
-        activeIssues: [],
-        pausedIssues: [],
-        versions: {},
-        issues: [],
-        sort: Object.keys(result).length,
-      };
-    }
-
     if (settings.style.pinTrackedIssues) {
       if (issuesData[issue.id]?.active) {
-        result[issue.project.id].activeIssues.push(issue);
+        if (!("active" in result)) {
+          result["active"] = {
+            type: "active",
+            pinnedIssues: [],
+            versions: {},
+            issues: [],
+            sort: -2,
+          };
+        }
+
+        result["active"].issues.push(issue);
         return result;
       }
 
       if (issuesData[issue.id]?.time) {
-        result[issue.project.id].pausedIssues.push(issue);
+        if (!("paused" in result)) {
+          result["paused"] = {
+            type: "paused",
+            pinnedIssues: [],
+            versions: {},
+            issues: [],
+            sort: -1,
+          };
+        }
+
+        result["paused"].issues.push(issue);
         return result;
       }
     }
 
+    if (!(issue.project.id in result)) {
+      result[issue.project.id] = {
+        type: issue.project.id.toString(),
+        project: issue.project,
+        pinnedIssues: [],
+        versions: {},
+        issues: [],
+        sort: Object.keys(result).length,
+      };
+    }
+
     if (issuesData[issue.id]?.pinned) {
       result[issue.project.id].pinnedIssues.push(issue);
       return result;
@@ -132,26 +149,11 @@ export const getGroupedIssues = (issues: TIssue[], projectVersions: Record<numbe
 
   return Object.values(grouped)
     .sort((a, b) => a.sort - b.sort)
-    .map(({ project, activeIssues, pausedIssues, pinnedIssues, versions, issues }) => ({
+    .map(({ type, project, pinnedIssues, versions, issues }) => ({
+      type,
       project: project,
-      versions: projectVersions[project.id] ?? [],
+      versions: (project ? projectVersions[project.id] : undefined) ?? [],
       groups: [
-        ...(activeIssues.length > 0
-          ? [
-              {
-                type: "active",
-                issues: activeIssues,
-              } satisfies IssueGroup,
-            ]
-          : []),
-        ...(pausedIssues.length > 0
-          ? [
-              {
-                type: "paused",
-                issues: pausedIssues,
-              } satisfies IssueGroup,
-            ]
-          : []),
         ...(pinnedIssues.length > 0
           ? [
               {