assets without objects

frontend/src/app/appLayoutUtils.ts

@@ -1,4 +1,4 @@
-import { createAssetView } from '../asset_manager';
+import { createAssetView, resolveAssetExpiresAt } from '../asset_manager';
 
 export const ASSET_PRESIGN_TTL_MS = 240 * 1000; // backend issues 5 min tokens; refresh slightly early
 export const DEFAULT_FOLDER_NAME = 'Documents';
@@ -45,34 +45,17 @@ const isAssetEquivalent = (lhs, rhs) => {
   const rhsView = createAssetView(rhs);
   const lhsPrimaryMetadata = lhsView.getPrimaryMetadata() || lhs?.metadata;
   const rhsPrimaryMetadata = rhsView.getPrimaryMetadata() || rhs?.metadata;
-  const lhsCardinality = lhsView.getCardinality() || lhs?.cardinality || null;
-  const rhsCardinality = rhsView.getCardinality() || rhs?.cardinality || null;
-  const lhsObjects = lhsView.getObjects();
-  const rhsObjects = rhsView.getObjects();
-  const objectsComparable =
-    lhsObjects.length === rhsObjects.length
-    && lhsObjects.every((entry, index) => {
-      const other = rhsObjects[index];
-      if (!other) return false;
-      if (entry.ordinal !== other.ordinal) return false;
-      if (entry.url && other.url && entry.url === other.url) {
-        return true;
-      }
-      if (!entry.url && !other.url) {
-        return JSON.stringify(entry.metadata || null) === JSON.stringify(other.metadata || null);
-      }
-      return entry.url === other.url;
-    });
+  const lhsExpiresAt = resolveAssetExpiresAt(lhs);
+  const rhsExpiresAt = resolveAssetExpiresAt(rhs);
   return (
     lhs.id === rhs.id
     && lhs.url === rhs.url
+    && lhsExpiresAt === rhsExpiresAt
     && lhsPrimaryMetadata?.width === rhsPrimaryMetadata?.width
     && lhsPrimaryMetadata?.height === rhsPrimaryMetadata?.height
     && lhs.mime_type === rhs.mime_type
     && lhs.asset_type === rhs.asset_type
     && lhs.updated_at === rhs.updated_at
-    && lhsCardinality === rhsCardinality
-    && objectsComparable
   );
 };