From 2b42faf2f2a5a2cf43ecb9be6b4649f279391276 Mon Sep 17 00:00:00 2001
From: Saim Momin <mominsaim12@gmail.com>
Date: Tue, 2 Apr 2024 11:07:44 +0200
Subject: [PATCH 1/2] Added 4dn_pairs and 4dn_pairsam datatypes

---
 lib/galaxy/config/sample/datatypes_conf.xml.sample | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample
index 8a5c7e69029a..1921b400aaae 100644
--- a/lib/galaxy/config/sample/datatypes_conf.xml.sample
+++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample
@@ -411,6 +411,8 @@
       <converter file="interval_to_bgzip_converter.xml" target_datatype="bgzip"/>
       <converter file="bed_gff_or_vcf_to_bigwig_converter.xml" target_datatype="bigwig"/>
     </datatype>
+    <datatype extension="4dn_pairs" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true" description="The pairs format is a standard text format for pairs of genomic loci given as 1bp point positions" description_url="https://github.com/4dn-dcic/pairix/blob/master/pairs_format_specification.md#pairs-file"/>
+    <datatype extension="4dn_pairsam" type="galaxy.datatypes.tabular:Tabular" subclass="true" display_in_upload="true" description="A simple tabular format to store the information on ligation junctions detected in sequences from Hi-C experiments." description_url="https://pairsamtools.readthedocs.io/en/latest/pairsam.html"/>
     <datatype extension="pdf" type="galaxy.datatypes.images:Pdf" mimetype="application/pdf" display_in_upload="true"/>
     <datatype extension="pileup" type="galaxy.datatypes.tabular:Pileup" display_in_upload="true">
       <converter file="interval_to_bgzip_converter.xml" target_datatype="bgzip"/>

From 09f77f4d4c28e020705ee39b6985a0cb86de1d35 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Tue, 2 Apr 2024 12:06:05 -0500
Subject: [PATCH 2/2] [24.0] Fix hasOwner function for histories in client

The `hasOwner` function in `api/index.ts` was checking:
```
return "user_id" in history;
```

whereas, it also needed to check:
```
return "user_id" in history && history.user_id !== null;
```

because we assume histories (summaries) initally fetched for the `historyStore` without user_id are owned by the current user, but the key is still present in the backend return.

This was causing a really troublesome bug in the `HistoryScrollList` found in the history selector modal, where we could constantly keep fetching `api/histories/count` since we didn't have the expected no. of histories loaded in the component; because `historiesProxy` (which only contains owned histories) would end up being empty.
---
 client/src/api/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/api/index.ts b/client/src/api/index.ts
index a32e076b84ff..0d17530014d2 100644
--- a/client/src/api/index.ts
+++ b/client/src/api/index.ts
@@ -228,5 +228,5 @@ export function userOwnsHistory(user: User | AnonymousUser | null, history: AnyH
 }
 
 function hasOwner(history: AnyHistory): history is HistorySummaryExtended {
-    return "user_id" in history;
+    return "user_id" in history && history.user_id !== null;
 }