Merge pull request #1579 from cardstack/cs-7173-add-sorting-by-create…

…d_at-to-cards-grid Add sorting by "created at" to workspace cards
cardstack · Sep 18, 2024 · 68e5b3e · 68e5b3e
2 parents 575d1d1 + b33f46d
commit 68e5b3e
Show file tree

Hide file tree

Showing 20 changed files with 302 additions and 5 deletions.
diff --git a/packages/base/cards-grid.gts b/packages/base/cards-grid.gts
@@ -70,6 +70,15 @@ let availableSortOptions: SortOption[] = [
       },
     ],
   },
+  {
+    displayName: 'Created at',
+    sort: [
+      {
+        by: 'createdAt',
+        direction: 'desc',
+      },
+    ],
+  },
 ];
 
 class Isolated extends Component<typeof CardsGrid> {

diff --git a/packages/host/app/lib/current-run.ts b/packages/host/app/lib/current-run.ts
@@ -294,7 +294,7 @@ export class CurrentRun {
       error.deps = [url.href];
       throw error;
     }
-    let { content, lastModified } = fileRef;
+    let { content, lastModified, created } = fileRef;
     if (hasExecutableExtension(url.href)) {
       await this.indexModule(url, fileRef);
     } else {
@@ -327,6 +327,7 @@ export class CurrentRun {
             path: localPath,
             source: content,
             lastModified,
+            resourceCreatedAt: created,
             resource,
             identityContext,
           });
@@ -377,6 +378,7 @@ export class CurrentRun {
       type: 'module',
       source: ref.content,
       lastModified: ref.lastModified,
+      resourceCreatedAt: ref.created,
       deps: new Set(deps),
     });
     this.stats.modulesIndexed++;
@@ -386,12 +388,14 @@ export class CurrentRun {
     path,
     source,
     lastModified,
+    resourceCreatedAt,
     resource,
     identityContext,
   }: {
     path: LocalPath;
     source: string;
     lastModified: number;
+    resourceCreatedAt: number;
     resource: LooseCardResource;
     identityContext: IdentityContextType;
   }): Promise<void> {
@@ -485,6 +489,7 @@ export class CurrentRun {
           id: instanceURL.href,
           meta: {
             lastModified,
+            resourceCreatedAt,
             realmInfo: this.#realmInfo,
             realmURL: this.realmURL.href,
           },
@@ -538,6 +543,7 @@ export class CurrentRun {
         embeddedHtml,
         fittedHtml,
         lastModified,
+        resourceCreatedAt,
         types: typesMaybeError.types.map(({ refURL }) => refURL),
         displayNames: typesMaybeError.types.map(
           ({ displayName }) => displayName,

diff --git a/...st/config/schema/1726147649121_schema.sql → ...st/config/schema/1726475945119_schema.sql b/...st/config/schema/1726147649121_schema.sql → ...st/config/schema/1726475945119_schema.sql
@@ -22,6 +22,7 @@
    atom_html TEXT,
    fitted_html BLOB,
    display_names BLOB,
+   resource_created_at,
    PRIMARY KEY ( url, realm_version, realm_url, type ) 
 );
 

diff --git a/packages/host/tests/acceptance/code-submode/editor-test.ts b/packages/host/tests/acceptance/code-submode/editor-test.ts
@@ -526,6 +526,7 @@ module('Acceptance | code submode | editor tests', function (hooks) {
       delete json.data.meta.realmInfo;
       delete json.data.meta.realmURL;
       delete json.data.meta.lastModified;
+      delete json.data.meta.resourceCreatedAt;
       assert.strictEqual(
         stringify(json),
         stringify(expected),

diff --git a/packages/host/tests/helpers/adapter.ts b/packages/host/tests/helpers/adapter.ts
@@ -46,6 +46,7 @@ let shimmedModuleIndicator = '// this file is shimmed';
 export class TestRealmAdapter implements RealmAdapter {
   #files: Dir = { kind: 'directory', contents: {} };
   #lastModified: Map<string, number> = new Map();
+  #resourceCreatedAt: Map<string, number> = new Map();
   #paths: RealmPaths;
   #subscriber: ((message: UpdateEventData) => void) | undefined;
   #loader: Loader | undefined; // Will be set in the realm's constructor - needed for openFile for shimming purposes
@@ -65,6 +66,7 @@ export class TestRealmAdapter implements RealmAdapter {
       }
       let url = this.#paths.fileURL(path);
       this.#lastModified.set(url.href, now);
+      this.#resourceCreatedAt.set(url.href, now);
       dir.contents[last] = { kind: 'file', content };
       if (typeof content === 'object') {
         this.#potentialModulesAndInstances.push({ content, url });
@@ -142,6 +144,10 @@ export class TestRealmAdapter implements RealmAdapter {
     return this.#lastModified;
   }
 
+  get resourceCreatedAtMap() {
+    return this.#resourceCreatedAt;
+  }
+
   async lastModified(path: string): Promise<number | undefined> {
     return this.#lastModified.get(this.#paths.fileURL(path).href);
   }
@@ -243,6 +249,7 @@ export class TestRealmAdapter implements RealmAdapter {
       path,
       content: fileRefContent,
       lastModified: this.#lastModified.get(this.#paths.fileURL(path).href)!,
+      created: this.#resourceCreatedAt.get(this.#paths.fileURL(path).href)!,
     };
 
     if (fileRefContent === shimmedModuleIndicator) {
@@ -278,6 +285,9 @@ export class TestRealmAdapter implements RealmAdapter {
     };
     let lastModified = unixTime(Date.now());
     this.#lastModified.set(this.#paths.fileURL(path).href, lastModified);
+    if (type === 'added') {
+      this.#resourceCreatedAt.set(this.#paths.fileURL(path).href, lastModified);
+    }
 
     this.postUpdateEvent({ [type]: path } as
       | { added: string }