Allow work tracker instance to be created (#1910)

tintinthong · web-flow · commit 5d343b8a8d56 · 2024-12-18T16:26:01.000+08:00
* link project for new work tracker

* do not throw error rather return undefined if no project id is found

* remove unnecessary logs

* change to padding-left

* add catalog entry for work tracker

* fix lint

* add default for work tracker

* fix work tracker after getCards
diff --git a/packages/base/card-api.gts b/packages/base/card-api.gts
@@ -2970,7 +2970,6 @@ export function getFields(
           return [];
         }
       }
-
       return [[maybeFieldName, maybeField]];
     });
     fields = { ...fields, ...Object.fromEntries(currentFields) };
diff --git a/packages/experiments-realm/CatalogEntry/work-tracker.json b/packages/experiments-realm/CatalogEntry/work-tracker.json
@@ -0,0 +1,20 @@
+{
+  "data": {
+    "type": "card",
+    "attributes": {
+      "title": "Work Tracker",
+      "description": "Catalog entry for Work Tracker App card",
+      "isField": false,
+      "ref": {
+        "module": "../work-tracker",
+        "name": "WorkTracker"
+      }
+    },
+    "meta": {
+      "adoptsFrom": {
+        "module": "https://cardstack.com/base/catalog-entry",
+        "name": "CatalogEntry"
+      }
+    }
+  }
+}
diff --git a/packages/experiments-realm/Project/51ca069b-1c55-4648-8654-bd82bf162f9d.json b/packages/experiments-realm/Project/51ca069b-1c55-4648-8654-bd82bf162f9d.json
@@ -13,4 +13,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/experiments-realm/Task/8ca45d40-adcb-437f-83ee-07ffd973cd17.json b/packages/experiments-realm/Task/8ca45d40-adcb-437f-83ee-07ffd973cd17.json
@@ -2,25 +2,25 @@
   "data": {
     "type": "card",
     "attributes": {
-      "taskName": "Resolve bug where overlay only appears on certain cards",
-      "taskDetail": null,
+      "priority": {
+        "index": null,
+        "label": null
+      },
       "status": {
+        "completed": false,
         "index": 3,
         "label": "In Progress"
       },
-      "priority": {
-        "index": null,
-        "label": null
+      "taskName": "Resolve bug where overlay only appears on certain cards",
+      "dateRange": {
+        "start": null,
+        "end": null
       },
+      "taskDetail": null,
       "description": null,
       "thumbnailURL": null
     },
     "relationships": {
-      "assignee": {
-        "links": {
-          "self": null
-        }
-      },
       "project": {
         "links": {
           "self": "../Project/51ca069b-1c55-4648-8654-bd82bf162f9d"
@@ -30,6 +30,21 @@
         "links": {
           "self": "../Team/cc574556-4253-44b8-ba80-0cfb844b4908"
         }
+      },
+      "children": {
+        "links": {
+          "self": null
+        }
+      },
+      "assignee": {
+        "links": {
+          "self": null
+        }
+      },
+      "tags": {
+        "links": {
+          "self": null
+        }
       }
     },
     "meta": {
@@ -39,4 +54,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/experiments-realm/Task/9b0425f9-ac54-44a4-8cfb-1774442490ea.json b/packages/experiments-realm/Task/9b0425f9-ac54-44a4-8cfb-1774442490ea.json
@@ -0,0 +1,57 @@
+{
+  "data": {
+    "type": "card",
+    "attributes": {
+      "priority": {
+        "index": 3,
+        "label": "High"
+      },
+      "status": {
+        "completed": false,
+        "index": 0,
+        "label": "Not Started"
+      },
+      "taskName": "Cleanup all the dbs",
+      "dateRange": {
+        "start": null,
+        "end": null
+      },
+      "taskDetail": null,
+      "description": null,
+      "thumbnailURL": null
+    },
+    "relationships": {
+      "project": {
+        "links": {
+          "self": "../Project/9b43240d-8c9c-42bc-a4d1-f9c626661562"
+        }
+      },
+      "team": {
+        "links": {
+          "self": null
+        }
+      },
+      "children": {
+        "links": {
+          "self": null
+        }
+      },
+      "assignee": {
+        "links": {
+          "self": null
+        }
+      },
+      "tags": {
+        "links": {
+          "self": null
+        }
+      }
+    },
+    "meta": {
+      "adoptsFrom": {
+        "module": "../productivity/task",
+        "name": "Task"
+      }
+    }
+  }
+}
diff --git a/packages/experiments-realm/Task/bb4323d6-1ea4-40d0-a039-85d13e55d4a6.json b/packages/experiments-realm/Task/bb4323d6-1ea4-40d0-a039-85d13e55d4a6.json
@@ -2,29 +2,25 @@
   "data": {
     "type": "card",
     "attributes": {
-      "taskName": "Create Tag List",
-      "taskDetail": null,
-      "status": {
-        "index": 1,
-        "label": "Next Sprint"
-      },
       "priority": {
         "index": null,
         "label": null
       },
+      "status": {
+        "completed": false,
+        "index": 1,
+        "label": "Next Sprint"
+      },
+      "taskName": "Create Tag List",
       "dateRange": {
         "start": null,
         "end": null
       },
+      "taskDetail": null,
       "description": null,
       "thumbnailURL": null
     },
     "relationships": {
-      "assignee": {
-        "links": {
-          "self": "../TeamMember/03e293b9-e4c1-4592-b8d1-e6f963829086"
-        }
-      },
       "project": {
         "links": {
           "self": "../Project/9b43240d-8c9c-42bc-a4d1-f9c626661562"
@@ -40,6 +36,11 @@
           "self": null
         }
       },
+      "assignee": {
+        "links": {
+          "self": "../TeamMember/03e293b9-e4c1-4592-b8d1-e6f963829086"
+        }
+      },
       "tags": {
         "links": {
           "self": null
diff --git a/packages/experiments-realm/Task/c734e2c7-71d9-446e-a2c1-e6e930fcee55.json b/packages/experiments-realm/Task/c734e2c7-71d9-446e-a2c1-e6e930fcee55.json
@@ -2,32 +2,28 @@
   "data": {
     "type": "card",
     "attributes": {
-      "taskName": "Add functionality where + opens create card modal with correct status",
-      "taskDetail": null,
-      "status": {
-        "index": null,
-        "label": "In Progress"
-      },
       "priority": {
         "index": 0,
         "label": "Low"
       },
+      "status": {
+        "completed": false,
+        "index": null,
+        "label": "In Progress"
+      },
+      "taskName": "Add functionality where + opens create card modal with correct status",
       "dateRange": {
         "start": null,
         "end": null
       },
+      "taskDetail": null,
       "description": null,
       "thumbnailURL": null
     },
     "relationships": {
-      "assignee": {
-        "links": {
-          "self": "../TeamMember/4c9614cd-ecda-42cf-bc18-37903019a7be"
-        }
-      },
       "project": {
         "links": {
-          "self": null
+          "self": "../Project/9b43240d-8c9c-42bc-a4d1-f9c626661562"
         }
       },
       "team": {
@@ -40,6 +36,11 @@
           "self": null
         }
       },
+      "assignee": {
+        "links": {
+          "self": "../TeamMember/4c9614cd-ecda-42cf-bc18-37903019a7be"
+        }
+      },
       "tags": {
         "links": {
           "self": null
diff --git a/packages/experiments-realm/WorkTracker/6bacffa6-952f-4c49-b0e3-ad0e5bf4f899.json b/packages/experiments-realm/WorkTracker/6bacffa6-952f-4c49-b0e3-ad0e5bf4f899.json
@@ -0,0 +1,31 @@
+{
+  "data": {
+    "type": "card",
+    "attributes": {
+      "tabs": [],
+      "headerIcon": {
+        "altText": null,
+        "size": "actual",
+        "height": null,
+        "width": null,
+        "base64": null
+      },
+      "moduleId": null,
+      "description": null,
+      "thumbnailURL": null
+    },
+    "relationships": {
+      "project": {
+        "links": {
+          "self": "../Project/9b43240d-8c9c-42bc-a4d1-f9c626661562"
+        }
+      }
+    },
+    "meta": {
+      "adoptsFrom": {
+        "module": "../work-tracker",
+        "name": "WorkTracker"
+      }
+    }
+  }
+}
diff --git a/packages/experiments-realm/WorkTracker/89209d31-328a-4c18-9758-53eb3c38d4f0.json b/packages/experiments-realm/WorkTracker/89209d31-328a-4c18-9758-53eb3c38d4f0.json
@@ -14,11 +14,18 @@
       "description": null,
       "thumbnailURL": null
     },
+    "relationships": {
+      "project": {
+        "links": {
+          "self": "../Project/51ca069b-1c55-4648-8654-bd82bf162f9d"
+        }
+      }
+    },
     "meta": {
       "adoptsFrom": {
         "module": "../work-tracker",
         "name": "WorkTracker"
       }
     }
   }
-}
+}
diff --git a/packages/experiments-realm/productivity/task-cards-resource.gts b/packages/experiments-realm/productivity/task-cards-resource.gts
@@ -11,7 +11,7 @@ import { Resource } from 'ember-resources';
 
 interface Args {
   named: {
-    query: Query;
+    query: Query | undefined;
     realm: string;
   };
 }
@@ -95,15 +95,18 @@ class TaskCollection extends Resource<Args> {
   }
 
   modify(_positional: never[], named: Args['named']) {
-    if (this.query === undefined || this.queryHasChanged(named.query)) {
+    if (
+      named.query &&
+      (this.query === undefined || this.queryHasChanged(named.query))
+    ) {
       this.run.perform(named.query, named.realm);
     }
   }
 }
 
 export default function getTaskCardsResource(
   parent: object,
-  query: () => Query,
+  query: () => Query | undefined,
   realm: () => string,
 ) {
   return TaskCollection.from(parent, () => ({
diff --git a/packages/experiments-realm/productivity/task.gts b/packages/experiments-realm/productivity/task.gts
@@ -508,8 +508,8 @@ export class Task extends TaskBase {
   static displayName = 'Task';
   static icon = CheckboxIcon;
   @field priority = contains(BaseTaskPriority);
-  @field project = linksTo(Project);
-  @field team = linksTo(Team);
+  @field project = linksTo(() => Project);
+  @field team = linksTo(() => Team);
   @field children = linksToMany(() => Task);
   @field status = contains(TaskStatusField);
 
diff --git a/packages/experiments-realm/work-tracker.gts b/packages/experiments-realm/work-tracker.gts

Original file line number	Diff line number	Diff line change
`@@ -2970,7 +2970,6 @@ export function getFields(`
`2970`	`2970`	`return [];`
`2971`	`2971`	`}`
`2972`	`2972`	`}`
`2973`		`-`
`2974`	`2973`	`return [[maybeFieldName, maybeField]];`
`2975`	`2974`	`});`
`2976`	`2975`	`fields = { ...fields, ...Object.fromEntries(currentFields) };`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`
`16`		`-}`
	`16`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import { Resource } from 'ember-resources';`
`11`	`11`
`12`	`12`	`interface Args {`
`13`	`13`	`named: {`
`14`		`- query: Query;`
	`14`	`+ query: Query \| undefined;`
`15`	`15`	`realm: string;`
`16`	`16`	`};`
`17`	`17`	`}`
`@@ -95,15 +95,18 @@ class TaskCollection extends Resource<Args> {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`modify(_positional: never[], named: Args['named']) {`
`98`		`- if (this.query === undefined \|\| this.queryHasChanged(named.query)) {`
	`98`	`+ if (`
	`99`	`+ named.query &&`
	`100`	`+ (this.query === undefined \|\| this.queryHasChanged(named.query))`
	`101`	`+ ) {`
`99`	`102`	`this.run.perform(named.query, named.realm);`
`100`	`103`	`}`
`101`	`104`	`}`
`102`	`105`	`}`
`103`	`106`
`104`	`107`	`export default function getTaskCardsResource(`
`105`	`108`	`parent: object,`
`106`		`- query: () => Query,`
	`109`	`+ query: () => Query \| undefined,`
`107`	`110`	`realm: () => string,`
`108`	`111`	`) {`
`109`	`112`	`return TaskCollection.from(parent, () => ({`