From e5b8cde461bab9e2af3d5311e50b3143396f4f3e Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Thu, 25 May 2023 14:18:26 +0500
Subject: [PATCH 01/30] html comment fixed

---
 src/static/riot/datasets/management.tag | 2 +-
 src/static/riot/tasks/management.tag    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 8d3f55713..c892d8a40 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -75,7 +75,7 @@
 
         <!-------------------------------------
                       Pagination
-        ------------------------------------->
+        -------------------------------------->
         <tr>
             <th colspan="7" if="{datasets.length > 0}">
                 <div class="ui right floated pagination menu" if="{datasets.length > 0}">
diff --git a/src/static/riot/tasks/management.tag b/src/static/riot/tasks/management.tag
index 6e8fe4c4d..3f8a0b68c 100644
--- a/src/static/riot/tasks/management.tag
+++ b/src/static/riot/tasks/management.tag
@@ -58,7 +58,7 @@
         <tfoot>
         <!-------------------------------------
                   Pagination
-        ------------------------------------->
+        -------------------------------------->
         <tr if="{tasks.length > 0}">
             <th colspan="7">
                 <div class="ui right floated pagination menu" if="{tasks.length > 0}">

From b46ba69394bdc5908451fcc1b5418b7525e9deee Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Thu, 25 May 2023 14:20:19 +0500
Subject: [PATCH 02/30] repeated competitions in competitions api fixed

---
 src/apps/api/views/competitions.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index b104c69a6..bb7eeec7b 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -62,7 +62,8 @@ def get_queryset(self):
                 qs = Competition.objects.filter(
                     (Q(created_by=self.request.user)) |
                     (Q(collaborators__in=[self.request.user]))
-                )
+                ).distinct()
+
             participating_in = self.request.query_params.get('participating_in', None)
             if participating_in:
                 qs = qs.filter(participants__user=self.request.user, participants__status="approved")

From 1c6e38717d8245530a14b3734d23fd3b516b60a2 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Thu, 25 May 2023 14:37:58 +0500
Subject: [PATCH 03/30] uploading a submission, show asterick with required
 only answers

---
 src/static/riot/competitions/detail/submission_upload.tag | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/static/riot/competitions/detail/submission_upload.tag b/src/static/riot/competitions/detail/submission_upload.tag
index f1405cfb9..af46d230a 100644
--- a/src/static/riot/competitions/detail/submission_upload.tag
+++ b/src/static/riot/competitions/detail/submission_upload.tag
@@ -11,8 +11,8 @@
                     <h2>Metadata or Fact Sheet</h2>
                     <div class="submission-form-question" each="{ question in opts.fact_sheet }">
                         <span if="{ question.type === 'text' }">
-                            <label if="{question.is_required}" class="required-answer" for="{ question.key }">{ question.title }:</label>
-                            <label if="{!question.is_required}" for="{ question.key }">{ question.title }:</label>
+                            <label if="{question.is_required == 'true'}" class="required-answer" for="{ question.key }">{ question.title }:</label>
+                            <label if="{question.is_required == 'false'}" for="{ question.key }">{ question.title }:</label>
                             <input type="text" name="{ question.key }">
                         </span>
                         <span if="{ question.type === 'checkbox' }">

From a1e7923c33138e09bf2997f5c61c15b19a159fc4 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Thu, 25 May 2023 17:30:33 +0500
Subject: [PATCH 04/30] do not show make private/public button to users who are
 not owner of the submission

---
 src/static/riot/datasets/management.tag | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index c892d8a40..1e1bfb384 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -136,7 +136,8 @@
             </div>
         </div>
         <div class="actions">
-            <button class="ui primary icon button" onclick="{toggle_is_public}">
+            <button show="{selected_row.created_by === CODALAB.state.user.username}"
+                class="ui primary icon button" onclick="{toggle_is_public}">
                 <i class="share icon"></i> {selected_row.is_public ? "Make Private" : "Make Public"}
             </button>
             <a href="{URLS.DATASET_DOWNLOAD(selected_row.key)}" class="ui green icon button">
@@ -417,6 +418,8 @@
         }
 
         self.toggle_is_public = () => {
+            console.log(self.selected_row.created_by)
+            console.log(CODALAB.state.user.username)
             let message = self.selected_row.is_public
                 ? 'Are you sure you want to make this dataset private? It will no longer be available to other users.'
                 : 'Are you sure you want to make this dataset public? It will become visible to everyone'

From d6b8f54d5ef43710ee8b3122d05c6906f690fb8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Thu, 25 May 2023 15:16:48 +0200
Subject: [PATCH 05/30] Remove console calls

---
 src/static/riot/datasets/management.tag | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 1e1bfb384..d437771e3 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -418,8 +418,6 @@
         }
 
         self.toggle_is_public = () => {
-            console.log(self.selected_row.created_by)
-            console.log(CODALAB.state.user.username)
             let message = self.selected_row.is_public
                 ? 'Are you sure you want to make this dataset private? It will no longer be available to other users.'
                 : 'Are you sure you want to make this dataset public? It will become visible to everyone'

From e60934b6234ab1ea291fc020934a8bbd40851c3f Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Fri, 26 May 2023 14:40:18 +0500
Subject: [PATCH 06/30] Resources -> Datasets : fiel sizes added in readable
 format

---
 src/static/riot/datasets/management.tag | 39 +++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index d437771e3..ac09406b3 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -1,7 +1,8 @@
 <data-management>
     <!-------------------------------------
              Search and filter bits
-      ------------------------------------->
+      -------------------------------------->
+      
     <div class="ui icon input">
         <input type="text" placeholder="Search..." ref="search" onkeyup="{ filter.bind(this, undefined) }">
         <i class="search icon"></i>
@@ -26,13 +27,14 @@
 
     <!-------------------------------------
                   Data Table
-      ------------------------------------->
+      -------------------------------------->
     <table class="ui {selectable: datasets.length > 0} celled compact table">
         <thead>
         <tr>
             <th>Name</th>
             <th width="175px">Type</th>
-            <th width="125px">Uploaded...</th>
+            <th width="175px">Size</th>
+            <th width="125px">Uploaded</th>
             <th width="60px">In Use</th>
             <th width="60px">Public</th>
             <th width="50px">Delete?</th>
@@ -45,6 +47,7 @@
             onclick="{show_info_modal.bind(this, dataset)}">
             <td>{ dataset.name }</td>
             <td>{ dataset.type }</td>
+            <td>{ format_file_size(dataset.file_size) }</td>
             <td>{ timeSince(Date.parse(dataset.created_when)) } ago</td>
             <td class="center aligned">
                 <i class="checkmark box icon green" show="{ dataset.in_use.length > 0 }"></i>
@@ -284,6 +287,7 @@
             }
             CODALAB.api.get_datasets(filters)
                 .done(function (data) {
+                    console.log(data.results)
                     self.datasets = data.results
                     self.pagination = {
                         "count": data.count,
@@ -443,6 +447,35 @@
             }
         }
 
+        // Function to format file size 
+        self.format_file_size = function(file_size) {
+            
+            // parse file size from string to float
+            try {
+                n = parseFloat(file_size)
+            }
+            catch(err) {
+                // return empty string if parsing fails
+                return ""
+            }   
+
+            // constant units to show with files size
+            // file size is in KB, converting it to MB and GB 
+            const units = ['KB', 'MB', 'GB']
+
+            // loop incrementer for selecting desired unit
+            let i = 0
+
+            // loop over n until it is greater than 1000
+            while(n >= 1000 && ++i){
+                n = n/1000;
+            }
+
+            // restrict file size to 1 decimal number concatinated with unit
+            return(n.toFixed(1) + ' ' + units[i]);
+            
+        }
+
     </script>
 
     <style type="text/stylus">

From baf083c391432248dc89f0551337ca42129611f8 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Fri, 26 May 2023 14:45:51 +0500
Subject: [PATCH 07/30] console log removed

---
 src/static/riot/datasets/management.tag | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index ac09406b3..488045426 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -287,7 +287,6 @@
             }
             CODALAB.api.get_datasets(filters)
                 .done(function (data) {
-                    console.log(data.results)
                     self.datasets = data.results
                     self.pagination = {
                         "count": data.count,

From b90f1a1c51817069521ac2b51c2d22eb8e95ecd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Fri, 26 May 2023 15:35:56 +0200
Subject: [PATCH 08/30] Update management.tag

---
 src/static/riot/datasets/management.tag | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 488045426..d65064693 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -448,7 +448,6 @@
 
         // Function to format file size 
         self.format_file_size = function(file_size) {
-            
             // parse file size from string to float
             try {
                 n = parseFloat(file_size)
@@ -456,23 +455,18 @@
             catch(err) {
                 // return empty string if parsing fails
                 return ""
-            }   
-
+            }
             // constant units to show with files size
             // file size is in KB, converting it to MB and GB 
             const units = ['KB', 'MB', 'GB']
-
             // loop incrementer for selecting desired unit
             let i = 0
-
             // loop over n until it is greater than 1000
             while(n >= 1000 && ++i){
                 n = n/1000;
             }
-
             // restrict file size to 1 decimal number concatinated with unit
             return(n.toFixed(1) + ' ' + units[i]);
-            
         }
 
     </script>

From 3ccbdb114dca29fd8c98be05f7abacf8befdd251 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Fri, 26 May 2023 19:18:35 +0500
Subject: [PATCH 09/30] pagination fixed

---
 src/static/riot/datasets/management.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 488045426..0d93788a0 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -80,7 +80,7 @@
                       Pagination
         -------------------------------------->
         <tr>
-            <th colspan="7" if="{datasets.length > 0}">
+            <th colspan="8" if="{datasets.length > 0}">
                 <div class="ui right floated pagination menu" if="{datasets.length > 0}">
                     <a show="{!!_.get(pagination, 'previous')}" class="icon item" onclick="{previous_page}">
                         <i class="left chevron icon"></i>

From b522bed056ab503fb0868be68f7b8f38d1a4df17 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Sat, 27 May 2023 15:35:10 +0500
Subject: [PATCH 10/30] Show competition name in Resources -> Datasets

---
 src/apps/api/serializers/datasets.py          | 15 +++++++++++
 src/apps/api/views/datasets.py                |  4 +++
 .../migrations/0005_auto_20230527_0837.py     | 25 +++++++++++++++++++
 src/apps/datasets/models.py                   |  4 +++
 .../competitions/detail/submission_upload.tag |  3 ++-
 src/static/riot/datasets/management.tag       | 11 +++++---
 6 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 src/apps/datasets/migrations/0005_auto_20230527_0837.py

diff --git a/src/apps/api/serializers/datasets.py b/src/apps/api/serializers/datasets.py
index 21f0d6f13..0b44b7ec1 100644
--- a/src/apps/api/serializers/datasets.py
+++ b/src/apps/api/serializers/datasets.py
@@ -24,6 +24,8 @@ class Meta:
             'created_by',
             'data_file',
             'was_created_by_competition',
+            'competition',
+            'file_name',
         )
         read_only_fields = (
             'key',
@@ -71,6 +73,7 @@ class Meta:
 
 class DataDetailSerializer(serializers.ModelSerializer):
     created_by = serializers.CharField(source='created_by.username')
+    competition = serializers.SerializerMethodField()
 
     class Meta:
         model = Data
@@ -86,8 +89,20 @@ class Meta:
             'was_created_by_competition',
             'in_use',
             'file_size',
+            'competition',
+            'file_name',
         )
 
+    def get_competition(self, obj):
+
+        # return competition dict with id and title if available
+        if obj.competition:
+            return {
+                "id": obj.competition.id,
+                "title": obj.competition.title,
+            }
+        return None
+
 
 class DataGroupSerializer(serializers.ModelSerializer):
     class Meta:
diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py
index 7bc235171..a9e17ef48 100644
--- a/src/apps/api/views/datasets.py
+++ b/src/apps/api/views/datasets.py
@@ -42,6 +42,10 @@ def get_serializer_class(self):
             return serializers.DataSerializer
 
     def create(self, request, *args, **kwargs):
+
+        # set file name in dict
+        request.data["file_name"] = request.data.get("request_sassy_file_name", "")
+
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         new_dataset = serializer.save()  # request_sassy_file_name is temporarily set via this serializer
diff --git a/src/apps/datasets/migrations/0005_auto_20230527_0837.py b/src/apps/datasets/migrations/0005_auto_20230527_0837.py
new file mode 100644
index 000000000..7fd349ef9
--- /dev/null
+++ b/src/apps/datasets/migrations/0005_auto_20230527_0837.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.2.17 on 2023-05-27 08:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('competitions', '0032_submission_worker_hostname'),
+        ('datasets', '0004_data_deleted'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='data',
+            name='competition',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='submission', to='competitions.Competition'),
+        ),
+        migrations.AddField(
+            model_name='data',
+            name='file_name',
+            field=models.CharField(default='', max_length=64),
+        ),
+    ]
diff --git a/src/apps/datasets/models.py b/src/apps/datasets/models.py
index 9165814e8..ae96b76ef 100644
--- a/src/apps/datasets/models.py
+++ b/src/apps/datasets/models.py
@@ -10,6 +10,7 @@
 from chahub.models import ChaHubSaveMixin
 from utils.data import PathWrapper
 from utils.storage import BundleStorage
+from competitions.models import Competition
 
 
 class Data(ChaHubSaveMixin, models.Model):
@@ -57,6 +58,9 @@ class Data(ChaHubSaveMixin, models.Model):
     # are NOT marked True, since they are not created by unpacking!
     was_created_by_competition = models.BooleanField(default=False)
 
+    competition = models.ForeignKey(Competition, on_delete=models.PROTECT, null=True, related_name='submission')
+    file_name = models.CharField(max_length=64, default="")
+
     def get_download_url(self):
         return reverse('datasets:download', kwargs={'key': self.key})
 
diff --git a/src/static/riot/competitions/detail/submission_upload.tag b/src/static/riot/competitions/detail/submission_upload.tag
index af46d230a..76728a5ee 100644
--- a/src/static/riot/competitions/detail/submission_upload.tag
+++ b/src/static/riot/competitions/detail/submission_upload.tag
@@ -413,7 +413,8 @@
                 task_ids_to_run = [self.selected_tasks[0].id]
             }
             var data_file_metadata = {
-                type: 'submission'
+                type: 'submission',
+                competition: self.opts.competition.id
             }
             var data_file = self.refs.data_file.refs.file_input.files[0]
             self.children = []
diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 9fa7c6dbe..980244f3c 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -31,7 +31,8 @@
     <table class="ui {selectable: datasets.length > 0} celled compact table">
         <thead>
         <tr>
-            <th>Name</th>
+            <th>File Name</th>
+            <th>Competition in</th>
             <th width="175px">Type</th>
             <th width="175px">Size</th>
             <th width="125px">Uploaded</th>
@@ -45,7 +46,9 @@
         <tr each="{ dataset, index in datasets }"
             class="dataset-row"
             onclick="{show_info_modal.bind(this, dataset)}">
-            <td>{ dataset.name }</td>
+            <!--  show file name if exists otherwise show name(for old submissions)  -->
+            <td>{ dataset.file_name || dataset.name }</td>
+            <td>{ dataset.competition.title }</td>
             <td>{ dataset.type }</td>
             <td>{ format_file_size(dataset.file_size) }</td>
             <td>{ timeSince(Date.parse(dataset.created_when)) } ago</td>
@@ -80,7 +83,7 @@
                       Pagination
         -------------------------------------->
         <tr>
-            <th colspan="8" if="{datasets.length > 0}">
+            <th colspan="9" if="{datasets.length > 0}">
                 <div class="ui right floated pagination menu" if="{datasets.length > 0}">
                     <a show="{!!_.get(pagination, 'previous')}" class="icon item" onclick="{previous_page}">
                         <i class="left chevron icon"></i>
@@ -108,6 +111,7 @@
                 <thead>
                 <tr>
                     <th>Key</th>
+                    <th>Competition in</th>
                     <th>Created By</th>
                     <th>Created</th>
                     <th>Type</th>
@@ -117,6 +121,7 @@
                 <tbody>
                 <tr>
                     <td>{selected_row.key}</td>
+                    <td>{selected_row.competition.title}</td>
                     <td>{selected_row.created_by}</td>
                     <td>{pretty_date(selected_row.created_when)}</td>
                     <td>{_.startCase(selected_row.type)}</td>

From ddd656660a1d9dedf3d3324ca9b7af300cd781c5 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Sat, 27 May 2023 16:04:08 +0500
Subject: [PATCH 11/30] filename added in request, test updated

---
 src/apps/api/tests/test_datasets.py | 1 +
 src/apps/api/views/datasets.py      | 3 ---
 src/static/js/ours/client.js        | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/apps/api/tests/test_datasets.py b/src/apps/api/tests/test_datasets.py
index 9ac798553..664178116 100644
--- a/src/apps/api/tests/test_datasets.py
+++ b/src/apps/api/tests/test_datasets.py
@@ -21,6 +21,7 @@ def test_dataset_api_checks_duplicate_names_for_same_user(self):
             'name': 'Test!',
             'type': Data.COMPETITION_BUNDLE,
             'request_sassy_file_name': faker.file_name(),
+            'file_name': faker.file_name(),
         })
 
         assert resp.status_code == 400
diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py
index a9e17ef48..3e2be9eee 100644
--- a/src/apps/api/views/datasets.py
+++ b/src/apps/api/views/datasets.py
@@ -43,9 +43,6 @@ def get_serializer_class(self):
 
     def create(self, request, *args, **kwargs):
 
-        # set file name in dict
-        request.data["file_name"] = request.data.get("request_sassy_file_name", "")
-
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         new_dataset = serializer.save()  # request_sassy_file_name is temporarily set via this serializer
diff --git a/src/static/js/ours/client.js b/src/static/js/ours/client.js
index fd747afd1..5a912ffb4 100644
--- a/src/static/js/ours/client.js
+++ b/src/static/js/ours/client.js
@@ -153,6 +153,7 @@ CODALAB.api = {
     create_dataset: function (metadata, data_file, progress_update_callback) {
         // Pass the requested file name for the SAS url
         metadata.request_sassy_file_name = data_file.name
+        metadata.file_name = data_file.name
 
         // This will be set on successful dataset creation, then used to complete the dataset upload
         var dataset = {}

From 60bf0c9df97d15bc18efaa9d6842321878b41c5b Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Sat, 27 May 2023 16:09:30 +0500
Subject: [PATCH 12/30] Dataset detail tile changed to file name

---
 src/static/riot/datasets/management.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 980244f3c..05f42ab4b 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -102,7 +102,7 @@
 
     <div ref="info_modal" class="ui modal">
         <div class="header">
-            {selected_row.name}
+            {selected_row.file_name || selected_row.name}
         </div>
         <div class="content">
             <h3>Details</h3>

From 8fb185e7d6b30ce8a59ea8bafa8ca9b27d023092 Mon Sep 17 00:00:00 2001
From: didayolo <adrien.pavao@gmail.com>
Date: Sat, 27 May 2023 15:19:22 +0200
Subject: [PATCH 13/30] Use title and url of benchmark in job status page

---
 src/templates/pages/server_status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/templates/pages/server_status.html b/src/templates/pages/server_status.html
index 0ff214291..8e4bc172b 100644
--- a/src/templates/pages/server_status.html
+++ b/src/templates/pages/server_status.html
@@ -24,7 +24,7 @@ <h1>Recent submissions (up to 250 or 2 days old)</h1>
                 {% endif %}
                 {% for submission in submissions %}
                 <tr>
-                    <td>{{ submission.phase.competition }}</td>
+                    <td><a class="link-no-deco" target="_blank" href="./competitions/{{ submission.phase.competition.id }}">{{ submission.phase.competition.title }}</a></td>
                     <td>{{ submission.pk }}</td>
                     <td>{{ submission.owner.username }}</td>
                     <td>{{ submission.worker_hostname }}</td>

From 07a6edd61e245c614af51c7a68458e3dc96a62fe Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Sat, 27 May 2023 18:27:08 +0500
Subject: [PATCH 14/30] competition name is now a clickable link

---
 src/static/riot/datasets/management.tag | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 05f42ab4b..e00b6a507 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -48,7 +48,10 @@
             onclick="{show_info_modal.bind(this, dataset)}">
             <!--  show file name if exists otherwise show name(for old submissions)  -->
             <td>{ dataset.file_name || dataset.name }</td>
-            <td>{ dataset.competition.title }</td>
+            <!--  show compeition name as link if competition is available -->
+            <td if="{dataset.competition}"><a class="link-no-deco" target="_blank" href="../competitions/{ dataset.competition.id }">{ dataset.competition.title }</a></td>
+            <!--  show empty td if competition is not available  -->
+            <td if="{!dataset.competition}"></td>
             <td>{ dataset.type }</td>
             <td>{ format_file_size(dataset.file_size) }</td>
             <td>{ timeSince(Date.parse(dataset.created_when)) } ago</td>

From f1ee2919b6928bb49d7756f7b1d45e22e8df874f Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Sat, 27 May 2023 18:36:08 +0500
Subject: [PATCH 15/30] competition name clickable in dataset detail

---
 src/static/riot/datasets/management.tag | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index e00b6a507..3940c6c69 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -124,7 +124,10 @@
                 <tbody>
                 <tr>
                     <td>{selected_row.key}</td>
-                    <td>{selected_row.competition.title}</td>
+                    <!--  show compeition name as link if competition is available -->
+                    <td if="{selected_row.competition}"><a class="link-no-deco" target="_blank" href="../competitions/{ selected_row.competition.id }">{ selected_row.competition.title }</a></td>
+                    <!--  show empty td if competition is not available  -->
+                    <td if="{!selected_row.competition}"></td>
                     <td>{selected_row.created_by}</td>
                     <td>{pretty_date(selected_row.created_when)}</td>
                     <td>{_.startCase(selected_row.type)}</td>

From 1a656f2e32ac67fa92eda0febecd2772d275fd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Sat, 27 May 2023 16:17:10 +0200
Subject: [PATCH 16/30] Update management.tag

---
 src/static/riot/tasks/management.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/riot/tasks/management.tag b/src/static/riot/tasks/management.tag
index 3f8a0b68c..bc62ca492 100644
--- a/src/static/riot/tasks/management.tag
+++ b/src/static/riot/tasks/management.tag
@@ -156,7 +156,7 @@
         <div class="content">
             <div class="ui pointing menu">
                 <div class="active item modal-item" data-tab="details">Details</div>
-                <div class="item modal-item" data-tab="data">Datasets</div>
+                <div class="item modal-item" data-tab="data">Datasets and programs</div>
             </div>
             <form class="ui form" ref="form">
                 <div class="ui active tab" data-tab="details">

From ab9a0b1d691f4923717b4784be3ce0833fea4c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Sat, 27 May 2023 16:17:25 +0200
Subject: [PATCH 17/30] Update management.tag

---
 src/static/riot/management.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/riot/management.tag b/src/static/riot/management.tag
index ad3b3560c..ab481e475 100644
--- a/src/static/riot/management.tag
+++ b/src/static/riot/management.tag
@@ -2,7 +2,7 @@
     <!--Todo: ultimately decide whether this belongs on tasks:management or dataset:management
             Is currently at both locations-->
     <div class="ui top attached tabular menu">
-        <div class="active item" data-tab="datasets">Datasets</div>
+        <div class="active item" data-tab="datasets">Datasets and programs</div>
         <div class="item" data-tab="tasks">Tasks</div>
         <div class="right menu">
             <div class="item">

From c75e058f41df5e771f617ee663164b4a6e17e712 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Sun, 28 May 2023 15:06:39 +0500
Subject: [PATCH 18/30] separate tab for submissions

---
 .../migrations/0006_auto_20230528_0829.py     |  19 +
 src/static/riot/datasets/management.tag       |  42 +--
 src/static/riot/management.tag                |   8 +-
 .../riot/submissions/resource_submissions.tag | 344 ++++++++++++++++++
 4 files changed, 387 insertions(+), 26 deletions(-)
 create mode 100644 src/apps/datasets/migrations/0006_auto_20230528_0829.py
 create mode 100644 src/static/riot/submissions/resource_submissions.tag

diff --git a/src/apps/datasets/migrations/0006_auto_20230528_0829.py b/src/apps/datasets/migrations/0006_auto_20230528_0829.py
new file mode 100644
index 000000000..8e51ba6c3
--- /dev/null
+++ b/src/apps/datasets/migrations/0006_auto_20230528_0829.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.17 on 2023-05-28 08:29
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datasets', '0005_auto_20230527_0837'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='data',
+            name='competition',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='submission', to='competitions.Competition'),
+        ),
+    ]
diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 3940c6c69..b25bf6032 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -1,7 +1,5 @@
 <data-management>
-    <!-------------------------------------
-             Search and filter bits
-      -------------------------------------->
+    <!-- Search and filter bits -->
       
     <div class="ui icon input">
         <input type="text" placeholder="Search..." ref="search" onkeyup="{ filter.bind(this, undefined) }">
@@ -25,14 +23,11 @@
         Delete Selected Datasets
     </button>
 
-    <!-------------------------------------
-                  Data Table
-      -------------------------------------->
+    <!-- Data Table -->
     <table class="ui {selectable: datasets.length > 0} celled compact table">
         <thead>
         <tr>
             <th>File Name</th>
-            <th>Competition in</th>
             <th width="175px">Type</th>
             <th width="175px">Size</th>
             <th width="125px">Uploaded</th>
@@ -46,12 +41,7 @@
         <tr each="{ dataset, index in datasets }"
             class="dataset-row"
             onclick="{show_info_modal.bind(this, dataset)}">
-            <!--  show file name if exists otherwise show name(for old submissions)  -->
-            <td>{ dataset.file_name || dataset.name }</td>
-            <!--  show compeition name as link if competition is available -->
-            <td if="{dataset.competition}"><a class="link-no-deco" target="_blank" href="../competitions/{ dataset.competition.id }">{ dataset.competition.title }</a></td>
-            <!--  show empty td if competition is not available  -->
-            <td if="{!dataset.competition}"></td>
+            <td>{ dataset.name }</td>
             <td>{ dataset.type }</td>
             <td>{ format_file_size(dataset.file_size) }</td>
             <td>{ timeSince(Date.parse(dataset.created_when)) } ago</td>
@@ -82,11 +72,9 @@
         </tbody>
         <tfoot>
 
-        <!-------------------------------------
-                      Pagination
-        -------------------------------------->
+        <!-- Pagination -->
         <tr>
-            <th colspan="9" if="{datasets.length > 0}">
+            <th colspan="8" if="{datasets.length > 0}">
                 <div class="ui right floated pagination menu" if="{datasets.length > 0}">
                     <a show="{!!_.get(pagination, 'previous')}" class="icon item" onclick="{previous_page}">
                         <i class="left chevron icon"></i>
@@ -105,7 +93,7 @@
 
     <div ref="info_modal" class="ui modal">
         <div class="header">
-            {selected_row.file_name || selected_row.name}
+            {selected_row.name}
         </div>
         <div class="content">
             <h3>Details</h3>
@@ -114,7 +102,6 @@
                 <thead>
                 <tr>
                     <th>Key</th>
-                    <th>Competition in</th>
                     <th>Created By</th>
                     <th>Created</th>
                     <th>Type</th>
@@ -124,10 +111,6 @@
                 <tbody>
                 <tr>
                     <td>{selected_row.key}</td>
-                    <!--  show compeition name as link if competition is available -->
-                    <td if="{selected_row.competition}"><a class="link-no-deco" target="_blank" href="../competitions/{ selected_row.competition.id }">{ selected_row.competition.title }</a></td>
-                    <!--  show empty td if competition is not available  -->
-                    <td if="{!selected_row.competition}"></td>
                     <td>{selected_row.created_by}</td>
                     <td>{pretty_date(selected_row.created_when)}</td>
                     <td>{_.startCase(selected_row.type)}</td>
@@ -223,7 +206,6 @@
             "reference_data",
             "scoring_program",
             "starting_kit",
-            "submission",
         ]
         self.errors = []
         self.datasets = []
@@ -299,6 +281,7 @@
             CODALAB.api.get_datasets(filters)
                 .done(function (data) {
                     self.datasets = data.results
+                    self.datasets = self.filter_out_submissions(self.datasets)
                     self.pagination = {
                         "count": data.count,
                         "next": data.next,
@@ -457,6 +440,17 @@
             }
         }
 
+        // Function to remove submissions from datasets
+        self.filter_out_submissions = function(datasets) {
+            datasets_to_return = []
+            datasets.forEach(dataset => {
+                if (dataset.type != "submission"){
+                    datasets_to_return.push(dataset)
+                }
+            })
+            return datasets_to_return
+        }
+
         // Function to format file size 
         self.format_file_size = function(file_size) {
             // parse file size from string to float
diff --git a/src/static/riot/management.tag b/src/static/riot/management.tag
index ab481e475..904093abf 100644
--- a/src/static/riot/management.tag
+++ b/src/static/riot/management.tag
@@ -2,7 +2,8 @@
     <!--Todo: ultimately decide whether this belongs on tasks:management or dataset:management
             Is currently at both locations-->
     <div class="ui top attached tabular menu">
-        <div class="active item" data-tab="datasets">Datasets and programs</div>
+        <div class="active item" data-tab="submissions">Submissions</div>
+        <div class="item" data-tab="datasets">Datasets and programs</div>
         <div class="item" data-tab="tasks">Tasks</div>
         <div class="right menu">
             <div class="item">
@@ -12,7 +13,10 @@
             </div>
         </div>
     </div>
-    <div class="ui active bottom attached tab segment" data-tab="datasets">
+    <div class="ui active bottom attached tab segment" data-tab="submissions">
+        <submission-management></submission-management>
+    </div>
+    <div class="ui bottom attached tab segment" data-tab="datasets">
         <data-management></data-management>
     </div>
     <div class="ui bottom attached tab segment" data-tab="tasks">
diff --git a/src/static/riot/submissions/resource_submissions.tag b/src/static/riot/submissions/resource_submissions.tag
new file mode 100644
index 000000000..f1b082add
--- /dev/null
+++ b/src/static/riot/submissions/resource_submissions.tag
@@ -0,0 +1,344 @@
+<submission-management>
+
+    <!--  Search -->
+    <div class="ui icon input">
+        <input type="text" placeholder="Search..." ref="search" onkeyup="{ filter.bind(this, undefined) }">
+        <i class="search icon"></i>
+    </div>
+    <button class="ui red right floated labeled icon button {disabled: marked_submissions.length === 0}" onclick="{delete_submissions}">
+        <i class="icon delete"></i>
+        Delete Selected Submissions
+    </button>
+
+    <!-- Data Table -->
+    <table class="ui {selectable: submissions.length > 0} celled compact table">
+        <thead>
+        <tr>
+            <th>File Name</th>
+            <th>Competition in</th>
+            <th width="175px">Size</th>
+            <th width="125px">Uploaded</th>
+            <th width="60px">Public</th>
+            <th width="50px">Delete?</th>
+            <th width="25px"></th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr each="{ submission, index in submissions }"
+            class="submission-row"
+            onclick="{show_info_modal.bind(this, submission)}">
+            <!--  show file name if exists otherwise show name(for old submissions)  -->
+            <td>{ submission.file_name || submission.name }</td>
+            <!--  show compeition name as link if competition is available -->
+            <td if="{submission.competition}"><a class="link-no-deco" target="_blank" href="../competitions/{ submission.competition.id }">{ submission.competition.title }</a></td>
+            <!--  show empty td if competition is not available  -->
+            <td if="{!submission.competition}"></td>
+            <td>{ format_file_size(submission.file_size) }</td>
+            <td>{ timeSince(Date.parse(submission.created_when)) } ago</td>
+            <td class="center aligned">
+                <i class="checkmark box icon green" show="{ submission.is_public }"></i>
+            </td>
+            <td class="center aligned">
+                <button class="ui mini button red icon" onclick="{ delete_submission.bind(this, submission) }">
+                    <i class="icon delete"></i>
+                </button>
+            </td>
+            <td class="center aligned">
+                <div class="ui fitted checkbox">
+                    <input type="checkbox" name="delete_checkbox" onclick="{ mark_submission_for_deletion.bind(this, submission) }">
+                    <label></label>
+                </div>
+            </td>
+        </tr>
+
+        <tr if="{submissions.length === 0}">
+            <td class="center aligned" colspan="6">
+                <em>No Submissions Yet!</em>
+            </td>
+        </tr>
+        </tbody>
+        <tfoot>
+
+        <!-- Pagination -->
+        <tr>
+            <th colspan="8" if="{submissions.length > 0}">
+                <div class="ui right floated pagination menu" if="{submissions.length > 0}">
+                    <a show="{!!_.get(pagination, 'previous')}" class="icon item" onclick="{previous_page}">
+                        <i class="left chevron icon"></i>
+                    </a>
+                    <div class="item">
+                        <label>{page}</label>
+                    </div>
+                    <a show="{!!_.get(pagination, 'next')}" class="icon item" onclick="{next_page}">
+                        <i class="right chevron icon"></i>
+                    </a>
+                </div>
+            </th>
+        </tr>
+        </tfoot>
+    </table>
+
+    <div ref="info_modal" class="ui modal">
+        <div class="header">
+            {selected_row.file_name || selected_row.name}
+        </div>
+        <div class="content">
+            <h3>Details</h3>
+
+            <table class="ui basic table">
+                <thead>
+                <tr>
+                    <th>Key</th>
+                    <th>Competition in</th>
+                    <th>Created By</th>
+                    <th>Created</th>
+                    <th>Type</th>
+                    <th>Public</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td>{selected_row.key}</td>
+                    <!--  show compeition name as link if competition is available -->
+                    <td if="{selected_row.competition}"><a class="link-no-deco" target="_blank" href="../competitions/{ selected_row.competition.id }">{ selected_row.competition.title }</a></td>
+                    <!--  show empty td if competition is not available  -->
+                    <td if="{!selected_row.competition}"></td>
+                    <td>{selected_row.created_by}</td>
+                    <td>{pretty_date(selected_row.created_when)}</td>
+                    <td>{_.startCase(selected_row.type)}</td>
+                    <td>{_.startCase(selected_row.is_public)}</td>
+                </tr>
+                </tbody>
+            </table>
+            <virtual if="{!!selected_row.description}">
+                <div>Description:</div>
+                <div class="ui segment">
+                    {selected_row.description}
+                </div>
+            </virtual>
+        </div>
+        <div class="actions">
+            <button show="{selected_row.created_by === CODALAB.state.user.username}"
+                class="ui primary icon button" onclick="{toggle_is_public}">
+                <i class="share icon"></i> {selected_row.is_public ? "Make Private" : "Make Public"}
+            </button>
+            <a href="{URLS.DATASET_DOWNLOAD(selected_row.key)}" class="ui green icon button">
+                <i class="download icon"></i>Download File
+            </a>
+            <button class="ui cancel button">Close</button>
+        </div>
+    </div>
+
+    <script>
+        var self = this
+        self.mixin(ProgressBarMixin)
+
+        /*---------------------------------------------------------------------
+         Init
+        ---------------------------------------------------------------------*/
+        self.errors = []
+        self.submissions = []
+        self.selected_row = {}
+        self.marked_submissions = []
+
+
+        self.page = 1
+
+        self.one("mount", function () {
+            $(".ui.dropdown", self.root).dropdown()
+            $(".ui.checkbox", self.root).checkbox()
+            self.update_submissions()
+        })
+
+        self.show_info_modal = function (row, e) {
+            // Return here so the info modal doesn't pop up when a checkbox is clicked
+            if (e.target.type === 'checkbox') {
+                return
+            }
+            self.selected_row = row
+            self.update()
+            $(self.refs.info_modal).modal('show')
+        }
+
+
+        /*---------------------------------------------------------------------
+         Methods
+        ---------------------------------------------------------------------*/
+        self.pretty_date = date => luxon.DateTime.fromISO(date).toLocaleString(luxon.DateTime.DATE_FULL)
+
+        self.filter = function (filters) {
+            let type = $(self.refs.type_filter).val()
+            filters = filters || {}
+            _.defaults(filters, {
+                type: type === '-' ? '' : type,
+                search: $(self.refs.search).val(),
+                page: 1,
+            })
+            self.page = filters.page
+            self.update_submissions(filters)
+        }
+
+        self.next_page = function () {
+            if (!!self.pagination.next) {
+                self.page += 1
+                self.filter({page: self.page})
+            } else {
+                alert("No valid page to go to!")
+            }
+        }
+        self.previous_page = function () {
+            if (!!self.pagination.previous) {
+                self.page -= 1
+                self.filter({page: self.page})
+            } else {
+                alert("No valid page to go to!")
+            }
+        }
+
+        self.update_submissions = function (filters) {
+            filters = filters || {}
+            filters.type = "submission"
+            CODALAB.api.get_datasets(filters)
+                .done(function (data) {
+                    self.submissions = data.results
+                    self.pagination = {
+                        "count": data.count,
+                        "next": data.next,
+                        "previous": data.previous
+                    }
+                    self.update()
+                })
+                .fail(function (response) {
+                    toastr.error("Could not load submissions...")
+                })
+        }
+
+        self.delete_submission = function (submission, e) {
+            name = submission.file_name || submission.name
+            if (confirm(`Are you sure you want to delete '${name}'?`)) {
+                CODALAB.api.delete_dataset(submission.id)
+                    .done(function () {
+                        self.update_submissions()
+                        toastr.success("Submission deleted successfully!")
+                    })
+                    .fail(function (response) {
+                        toastr.error(response.responseJSON['error'])
+                    })
+            }
+            event.stopPropagation()
+        }
+
+        self.delete_submissions = function () {
+            if (confirm(`Are you sure you want to delete multiple submissions?`)) {
+                CODALAB.api.delete_datasets(self.marked_submissions)
+                    .done(function () {
+                        self.update_submissions()
+                        toastr.success("Submission deleted successfully!")
+                        self.marked_submissions = []
+                    })
+                    .fail(function (response) {
+                        for (e in response.responseJSON) {
+                            toastr.error(`${e}: '${response.responseJSON[e]}'`)
+                        }
+                    })
+            }
+            event.stopPropagation()
+        }
+
+        self.clear_form = function () {
+            // Clear form
+            $(':input', self.refs.form)
+                .not(':button, :submit, :reset, :hidden')
+                .val('')
+                .removeAttr('checked')
+                .removeAttr('selected');
+
+            $('.dropdown', self.refs.form).dropdown('restore defaults')
+
+            self.errors = {}
+            self.update()
+        }
+
+        self.check_form = function (event) {
+            if (event) {
+                event.preventDefault()
+            }
+
+       
+
+            // Let's do some quick validation
+            self.errors = {}
+            var validate_data = get_form_data(self.refs.form)
+
+            var required_fields = ['name', 'type', 'data_file']
+            required_fields.forEach(field => {
+                if (validate_data[field] === '') {
+                    self.errors[field] = "This field is required"
+                }
+            })
+
+            if (Object.keys(self.errors).length > 0) {
+                // display errors and drop out
+                self.update()
+                return
+            }
+
+            
+        }
+
+        self.toggle_is_public = () => {
+            let message = self.selected_row.is_public
+                ? 'Are you sure you want to make this submission private? It will no longer be available to other users.'
+                : 'Are you sure you want to make this submission public? It will become visible to everyone'
+            if (confirm(message)) {
+                CODALAB.api.update_dataset(self.selected_row.id, {id: self.selected_row.id, is_public: !self.selected_row.is_public})
+                    .done(data => {
+                        toastr.success('Submission updated')
+                        $(self.refs.info_modal).modal('hide')
+                        self.filter()
+                    })
+                    .fail(resp => {
+                        toastr.error(resp.responseJSON['is_public'])
+                    })
+            }
+        }
+
+        self.mark_submission_for_deletion = function(submission, e) {
+            if (e.target.checked) {
+                self.marked_submissions.push(submission.id)
+            }
+            else {
+                self.marked_submissions.splice(self.marked_submissions.indexOf(submission.id), 1)
+            }
+        }
+
+        // Function to format file size 
+        self.format_file_size = function(file_size) {
+            // parse file size from string to float
+            try {
+                n = parseFloat(file_size)
+            }
+            catch(err) {
+                // return empty string if parsing fails
+                return ""
+            }
+            // constant units to show with files size
+            // file size is in KB, converting it to MB and GB 
+            const units = ['KB', 'MB', 'GB']
+            // loop incrementer for selecting desired unit
+            let i = 0
+            // loop over n until it is greater than 1000
+            while(n >= 1000 && ++i){
+                n = n/1000;
+            }
+            // restrict file size to 1 decimal number concatinated with unit
+            return(n.toFixed(1) + ' ' + units[i]);
+        }
+
+    </script>
+
+    <style type="text/stylus">
+        .submission-row:hover
+            cursor pointer
+    </style>
+</submission-management>

From 57fd67560ea6dbaadb931150e46bc7a8f7a68e80 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Sun, 28 May 2023 15:14:36 +0500
Subject: [PATCH 19/30] Add Dataset changed to Add Dataset/Program

---
 src/static/riot/datasets/management.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index b25bf6032..7daac8cf6 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -16,7 +16,7 @@
     </div>
     <button class="ui green right floated labeled icon button" onclick="{show_creation_modal}">
         <i selenium="add-dataset" class="plus icon"></i>
-        Add Dataset
+        Add Dataset/Program
     </button>
     <button class="ui red right floated labeled icon button {disabled: marked_datasets.length === 0}" onclick="{delete_datasets}">
         <i class="icon delete"></i>

From 4d48e498e6637e8fd1c2413b0e0432597ed1b8bb Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Sun, 28 May 2023 15:37:30 +0500
Subject: [PATCH 20/30] Add submission modal added

---
 src/static/riot/datasets/management.tag       |   6 +-
 .../riot/submissions/resource_submissions.tag | 109 +++++++++++++++++-
 2 files changed, 109 insertions(+), 6 deletions(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 7daac8cf6..60ea5095d 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -91,6 +91,7 @@
         </tfoot>
     </table>
 
+    <!--  Dataset Detail Model  -->
     <div ref="info_modal" class="ui modal">
         <div class="header">
             {selected_row.name}
@@ -144,9 +145,9 @@
         </div>
     </div>
 
-
+    <!--  Add Dataset Model  -->
     <div ref="dataset_creation_modal" class="ui modal">
-        <div class="header">Form</div>
+        <div class="header">Add Dataset/Program Form</div>
 
         <div class="content">
             <div class="ui message error" show="{ Object.keys(errors).length > 0 }">
@@ -192,6 +193,7 @@
             <button class="ui basic red cancel button">Cancel</button>
         </div>
     </div>
+
     <script>
         var self = this
         self.mixin(ProgressBarMixin)
diff --git a/src/static/riot/submissions/resource_submissions.tag b/src/static/riot/submissions/resource_submissions.tag
index f1b082add..209567575 100644
--- a/src/static/riot/submissions/resource_submissions.tag
+++ b/src/static/riot/submissions/resource_submissions.tag
@@ -5,6 +5,10 @@
         <input type="text" placeholder="Search..." ref="search" onkeyup="{ filter.bind(this, undefined) }">
         <i class="search icon"></i>
     </div>
+    <button class="ui green right floated labeled icon button" onclick="{show_creation_modal}">
+        <i class="plus icon"></i>
+        Add Submission
+    </button>
     <button class="ui red right floated labeled icon button {disabled: marked_submissions.length === 0}" onclick="{delete_submissions}">
         <i class="icon delete"></i>
         Delete Selected Submissions
@@ -78,6 +82,7 @@
         </tfoot>
     </table>
 
+    <!--  Submission Detail Model  -->
     <div ref="info_modal" class="ui modal">
         <div class="header">
             {selected_row.file_name || selected_row.name}
@@ -129,6 +134,49 @@
         </div>
     </div>
 
+    <!--  Add Submission Model  -->
+    <div ref="submission_creation_modal" class="ui modal">
+        <div class="header">Add Submission Form</div>
+
+        <div class="content">
+            <div class="ui message error" show="{ Object.keys(errors).length > 0 }">
+                <div class="header">
+                    Error(s) creating submission
+                </div>
+                <ul class="list">
+                    <li each="{ error, field in errors }">
+                        <strong>{field}:</strong> {error}
+                    </li>
+                </ul>
+            </div>
+
+            <form class="ui form coda-animated {error: errors}" ref="form">
+                <input-text name="name" ref="name" error="{errors.name}" placeholder="Name"></input-text>
+                <input-text name="description" ref="description" error="{errors.description}"
+                            placeholder="Description"></input-text>
+
+                <input type=hidden name="type" ref="type" value="submission">
+                
+                <input-file name="data_file" ref="data_file" error="{errors.data_file}"
+                            accept=".zip"></input-file>
+            </form>
+
+            <div class="ui indicating progress" ref="progress">
+                <div class="bar">
+                    <div class="progress">{ upload_progress }%</div>
+                </div>
+            </div>
+
+        </div>
+        <div class="actions">
+            <button class="ui blue icon button" onclick="{check_form}">
+                <i class="upload icon"></i>
+                Upload
+            </button>
+            <button class="ui basic red cancel button">Cancel</button>
+        </div>
+    </div>
+
     <script>
         var self = this
         self.mixin(ProgressBarMixin)
@@ -141,6 +189,7 @@
         self.selected_row = {}
         self.marked_submissions = []
 
+        self.upload_progress = undefined
 
         self.page = 1
 
@@ -160,6 +209,10 @@
             $(self.refs.info_modal).modal('show')
         }
 
+        self.show_creation_modal = function () {
+            $(self.refs.submission_creation_modal).modal('show')
+        }
+
 
         /*---------------------------------------------------------------------
          Methods
@@ -253,8 +306,7 @@
                 .removeAttr('checked')
                 .removeAttr('selected');
 
-            $('.dropdown', self.refs.form).dropdown('restore defaults')
-
+            
             self.errors = {}
             self.update()
         }
@@ -264,7 +316,9 @@
                 event.preventDefault()
             }
 
-       
+            // Reset upload progress, in case we're trying to re-upload or had errors -- this is the
+            // best place to do it -- also resets animations
+            self.file_upload_progress_handler(undefined)
 
             // Let's do some quick validation
             self.errors = {}
@@ -283,7 +337,54 @@
                 return
             }
 
-            
+            // Call the progress bar wrapper and do the upload -- we want to check and display errors
+            // first before doing the actual upload
+            self.prepare_upload(self.upload)()
+
+        }
+
+        self.upload = function () {
+            // Have to get the "FormData" to get the file in a special way
+            // jquery likes to work with
+            var metadata = get_form_data(self.refs.form)
+            delete metadata.data_file  // dont send this with metadata
+
+            if (metadata.is_public === 'on') {
+                var public_confirm = confirm("Creating a public submission means this will be sent to Chahub and publicly available on the internet. Are you sure you wish to continue?")
+                if (!public_confirm) {
+                    return
+                }
+            }
+
+            var data_file = self.refs.data_file.refs.file_input.files[0]
+
+            CODALAB.api.create_dataset(metadata, data_file, self.file_upload_progress_handler)
+                .done(function (data) {
+                    toastr.success("Submission successfully uploaded!")
+                    self.update_submissions()
+                    self.clear_form()
+                    $(self.refs.submission_creation_modal).modal('hide')
+                })
+                .fail(function (response) {
+                    if (response) {
+                        try {
+                            var errors = JSON.parse(response.responseText)
+
+                            // Clean up errors to not be arrays but plain text
+                            Object.keys(errors).map(function (key, index) {
+                                errors[key] = errors[key].join('; ')
+                            })
+
+                            self.update({errors: errors})
+                        } catch (e) {
+
+                        }
+                    }
+                    toastr.error("Creation failed, error occurred")
+                })
+                .always(function () {
+                    self.hide_progress_bar()
+                })
         }
 
         self.toggle_is_public = () => {

From 69bf79b3e7338e1c6da1cf44834b17cbcb233caf Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Tue, 30 May 2023 16:15:54 +0500
Subject: [PATCH 21/30] After login redirect to `next` page (#900)

* after login redirect to next page

* trailing white space removed

---------

Co-authored-by: Ihsan Ullah <ihsanullah@Pixel-io.local>
---
 src/apps/profiles/views.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/apps/profiles/views.py b/src/apps/profiles/views.py
index 8abbf94b2..9a19090dd 100644
--- a/src/apps/profiles/views.py
+++ b/src/apps/profiles/views.py
@@ -130,6 +130,10 @@ def sign_up(request):
 
 def log_in(request):
 
+    # Fectch next redirect page after login
+    # default : None
+    next = request.GET.get('next', None)
+
     context = {}
     context['chahub_signup_url'] = "{}/profiles/signup?next={}/social/login/chahub".format(
         settings.SOCIAL_AUTH_CHAHUB_BASE_URL,
@@ -144,7 +148,13 @@ def log_in(request):
             user = authenticate(username=username, password=password)
             if user:
                 login(request, user)
-                return redirect('pages:home')
+
+                # if next is none redirect to home
+                # otherwise redirect to requested page
+                if next is None:
+                    return redirect('pages:home')
+                else:
+                    return redirect(next)
             else:
                 messages.error(request, "Wrong Credentials!")
         else:

From 3955566a18ff9dc915accbadf7af8ae37f32c6f6 Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Tue, 30 May 2023 17:06:23 +0500
Subject: [PATCH 22/30] benchmark title instead of id in datasets detail

---
 src/apps/datasets/models.py             | 2 +-
 src/static/riot/datasets/management.tag | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/apps/datasets/models.py b/src/apps/datasets/models.py
index ae96b76ef..3d97e8b45 100644
--- a/src/apps/datasets/models.py
+++ b/src/apps/datasets/models.py
@@ -88,7 +88,7 @@ def in_use(self):
             Q(phases__tasks__input_data=self) |
             Q(phases__tasks__reference_data=self) |
             Q(phases__tasks__scoring_program=self)
-        ).values_list('pk', flat=True).distinct()
+        ).values('pk', 'title').distinct()
         return competitions_in_use
 
     def __str__(self):
diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 60ea5095d..73fd11f4b 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -127,8 +127,8 @@
             </virtual>
             <div show="{!!_.get(selected_row.in_use, 'length')}"><strong>Used by:</strong>
                 <div class="ui bulleted list">
-                    <div class="item" each="{id in selected_row.in_use}">
-                        <a href="{URLS.COMPETITION_DETAIL(id)}" target="_blank">Benchmark id: {id}</a>
+                    <div class="item" each="{comp in selected_row.in_use}">
+                        <a href="{URLS.COMPETITION_DETAIL(comp.pk)}" target="_blank">{comp.title}</a>
                     </div>
                 </div>
             </div>
@@ -231,6 +231,7 @@
                 return
             }
             self.selected_row = row
+            console.log(row)
             self.update()
             $(self.refs.info_modal).modal('show')
         }

From ac7801a4f118e38794a3f9d7d5ed806297193bdc Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Tue, 30 May 2023 17:49:49 +0500
Subject: [PATCH 23/30] Tasks tab: benchmark is now clickable link

---
 src/apps/api/serializers/tasks.py       |  8 +++++++-
 src/static/riot/datasets/management.tag |  1 -
 src/static/riot/tasks/management.tag    | 10 +++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/apps/api/serializers/tasks.py b/src/apps/api/serializers/tasks.py
index 521c8f64c..deac682cc 100644
--- a/src/apps/api/serializers/tasks.py
+++ b/src/apps/api/serializers/tasks.py
@@ -7,6 +7,7 @@
 from competitions.models import PhaseTaskInstance, Phase
 from datasets.models import Data
 from tasks.models import Task, Solution
+from competitions.models import Competition
 
 
 class SolutionSerializer(WritableNestedModelSerializer):
@@ -138,7 +139,12 @@ class Meta:
         )
 
     def get_competitions(self, instance):
-        return self.context['task_titles'][instance.pk]
+
+        # Fech competitions which hase phases with this task
+        # competitions = Phase.objects.filter(tasks__in=[instance.pk]).values('competition')
+        competitions = Competition.objects.filter(phases__tasks__in=[instance.pk]).values("id", "title").distinct()
+
+        return competitions
 
     def get_shared_with(self, instance):
         return self.context['shared_with'][instance.pk]
diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 73fd11f4b..ad33b4901 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -231,7 +231,6 @@
                 return
             }
             self.selected_row = row
-            console.log(row)
             self.update()
             $(self.refs.info_modal).modal('show')
         }
diff --git a/src/static/riot/tasks/management.tag b/src/static/riot/tasks/management.tag
index bc62ca492..b262d5fd7 100644
--- a/src/static/riot/tasks/management.tag
+++ b/src/static/riot/tasks/management.tag
@@ -30,7 +30,15 @@
         <tbody>
         <tr each="{ task in tasks }" onclick="{show_detail_modal.bind(this, task)}" class="task-row">
             <td>{ task.name }</td>
-            <td class="benchmark-row">{ task.competitions.join(', ') }</td>
+            <td class="benchmark-row">
+                <div show="{task.competitions.length > 0}" class="ui list">
+                    <div class="item" each="{comp in task.competitions}">
+                        <a href="{URLS.COMPETITION_DETAIL(comp.id)}" target="_blank">{comp.title}</a>
+                    </div>
+                </div>
+            
+            
+            </td>
             <td>{ task.shared_with.join(', ') }</td>
             <td>{ timeSince(Date.parse(task.created_when)) } ago</td>
             <td class="center aligned">

From ce98a1f49c9233119a2997721113a668f29f60af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Tue, 30 May 2023 17:04:39 +0200
Subject: [PATCH 24/30] milliseconds -> seconds

---
 src/static/riot/competitions/editor/_phases.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static/riot/competitions/editor/_phases.tag b/src/static/riot/competitions/editor/_phases.tag
index acf1b72a5..532f49500 100644
--- a/src/static/riot/competitions/editor/_phases.tag
+++ b/src/static/riot/competitions/editor/_phases.tag
@@ -112,7 +112,7 @@
                         <div class="three fields">
                             <div class="field">
                                 <label>
-                                    Execution Time Limit <span data-tooltip="In milliseconds, 600ms default if unset"
+                                    Execution Time Limit <span data-tooltip="In seconds, 600s default if unset"
                                                                data-inverted=""
                                                                data-position="bottom center">
                                     <i class="help icon circle"></i></span>

From 0e6f0a993b9e29c1fe6482c2f523e8312591ee9e Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Thu, 1 Jun 2023 12:52:09 +0500
Subject: [PATCH 25/30] add option to show/hide public submissions/datasets

---
 src/apps/api/views/datasets.py                | 29 ++++++++++++++++---
 src/static/riot/datasets/management.tag       | 14 +++++----
 .../riot/submissions/resource_submissions.tag |  7 +++--
 3 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py
index 3e2be9eee..a5202ded6 100644
--- a/src/apps/api/views/datasets.py
+++ b/src/apps/api/views/datasets.py
@@ -20,19 +20,40 @@
 class DataViewSet(ModelViewSet):
     queryset = Data.objects.all()
     filter_backends = (DjangoFilterBackend, SearchFilter)
-    filter_fields = ('type', 'name', 'key', 'was_created_by_competition')
+    filter_fields = ('type', 'name', 'key', 'was_created_by_competition', 'is_public')
     search_fields = ('name', 'description', 'key',)
     pagination_class = BasicPagination
 
     def get_queryset(self):
-        filters = Q(is_public=True) | Q(created_by=self.request.user)
 
-        qs = Data.objects.filter(filters)
+        qs = self.queryset
+
+        if self.request.method == 'GET':
+
+            is_public = self.request.query_params.get('is_public', 'false') == 'true'
+            is_submission = self.request.query_params.get('type', '') == 'submission'
+
+            if is_submission:
+                # filter submissions
+                qs = qs.filter(Q(type=Data.SUBMISSION))
+            else:
+                # filter datasets and programs
+                qs = qs.filter(~Q(type=Data.SUBMISSION))
+
+            # public filter check
+            if is_public:
+                qs = qs.filter(Q(created_by=self.request.user) | Q(is_public=True))
+            else:
+                qs = qs.filter(Q(created_by=self.request.user))
+
+        else:
+            qs = qs.filter(Q(is_public=True) | Q(created_by=self.request.user))
 
         qs = qs.exclude(Q(type=Data.COMPETITION_BUNDLE) | Q(name__isnull=True))
 
         qs = qs.select_related('created_by').order_by('-created_when')
-
+        print(f"\n\n{len(qs)}\n\n")
+        print(qs)
         return qs
 
     def get_serializer_class(self):
diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index ad33b4901..13e233afa 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -14,13 +14,17 @@
         <label>Show Auto Created</label>
         <input type="checkbox" ref="auto_created">
     </div>
+    <div class="ui checkbox inline-div" onclick="{ filter.bind(this, undefined) }">
+        <label>Show Public</label>
+        <input type="checkbox" ref="show_public">
+    </div>
     <button class="ui green right floated labeled icon button" onclick="{show_creation_modal}">
         <i selenium="add-dataset" class="plus icon"></i>
         Add Dataset/Program
     </button>
     <button class="ui red right floated labeled icon button {disabled: marked_datasets.length === 0}" onclick="{delete_datasets}">
         <i class="icon delete"></i>
-        Delete Selected Datasets
+        Delete Selected
     </button>
 
     <!-- Data Table -->
@@ -276,14 +280,12 @@
 
         self.update_datasets = function (filters) {
             filters = filters || {}
-            let show_datasets_created_by_comp = $(self.refs.auto_created).prop('checked')
-            if (!show_datasets_created_by_comp) {
-                filters.was_created_by_competition = false
-            }
+            filters.was_created_by_competition = $(self.refs.auto_created).prop('checked')
+            filters.is_public = $(self.refs.show_public).prop('checked')
             CODALAB.api.get_datasets(filters)
                 .done(function (data) {
                     self.datasets = data.results
-                    self.datasets = self.filter_out_submissions(self.datasets)
+                    //self.datasets = self.filter_out_submissions(self.datasets)
                     self.pagination = {
                         "count": data.count,
                         "next": data.next,
diff --git a/src/static/riot/submissions/resource_submissions.tag b/src/static/riot/submissions/resource_submissions.tag
index 209567575..755c44a48 100644
--- a/src/static/riot/submissions/resource_submissions.tag
+++ b/src/static/riot/submissions/resource_submissions.tag
@@ -5,6 +5,10 @@
         <input type="text" placeholder="Search..." ref="search" onkeyup="{ filter.bind(this, undefined) }">
         <i class="search icon"></i>
     </div>
+    <div class="ui checkbox inline-div" onclick="{ filter.bind(this, undefined) }">
+        <label>Show Public</label>
+        <input type="checkbox" ref="show_public">
+    </div>
     <button class="ui green right floated labeled icon button" onclick="{show_creation_modal}">
         <i class="plus icon"></i>
         Add Submission
@@ -220,10 +224,8 @@
         self.pretty_date = date => luxon.DateTime.fromISO(date).toLocaleString(luxon.DateTime.DATE_FULL)
 
         self.filter = function (filters) {
-            let type = $(self.refs.type_filter).val()
             filters = filters || {}
             _.defaults(filters, {
-                type: type === '-' ? '' : type,
                 search: $(self.refs.search).val(),
                 page: 1,
             })
@@ -250,6 +252,7 @@
 
         self.update_submissions = function (filters) {
             filters = filters || {}
+            filters.is_public = $(self.refs.show_public).prop('checked')
             filters.type = "submission"
             CODALAB.api.get_datasets(filters)
                 .done(function (data) {

From 609e630a7babf46394e8d641b7ace9c23530ab4a Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Thu, 1 Jun 2023 15:35:26 +0500
Subject: [PATCH 26/30] new filters added to show/hide public submissions and
 datasets/programs

---
 src/apps/api/views/datasets.py                | 23 +++++++++++++------
 src/static/riot/datasets/management.tag       |  3 ++-
 .../riot/submissions/resource_submissions.tag |  4 ++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py
index a5202ded6..2ec719dee 100644
--- a/src/apps/api/views/datasets.py
+++ b/src/apps/api/views/datasets.py
@@ -30,14 +30,24 @@ def get_queryset(self):
 
         if self.request.method == 'GET':
 
-            is_public = self.request.query_params.get('is_public', 'false') == 'true'
-            is_submission = self.request.query_params.get('type', '') == 'submission'
+            # new filters
+            # -----------
 
+            # _public = true if want to show public datasets/submissions
+            is_public = self.request.query_params.get('_public', 'false') == 'true'
+
+            # _type = submission if called from submissions tab to filter only submissions
+            is_submission = self.request.query_params.get('_type', '') == 'submission'
+
+            # _type = dataset if called from datasets and programs tab to filter datasets and programs
+            is_dataset = self.request.query_params.get('_type', '') == 'dataset'
+
+            # filter submissions
             if is_submission:
-                # filter submissions
                 qs = qs.filter(Q(type=Data.SUBMISSION))
-            else:
-                # filter datasets and programs
+
+            # filter datasets and programs
+            if is_dataset:
                 qs = qs.filter(~Q(type=Data.SUBMISSION))
 
             # public filter check
@@ -52,8 +62,7 @@ def get_queryset(self):
         qs = qs.exclude(Q(type=Data.COMPETITION_BUNDLE) | Q(name__isnull=True))
 
         qs = qs.select_related('created_by').order_by('-created_when')
-        print(f"\n\n{len(qs)}\n\n")
-        print(qs)
+
         return qs
 
     def get_serializer_class(self):
diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 13e233afa..87186578e 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -281,7 +281,8 @@
         self.update_datasets = function (filters) {
             filters = filters || {}
             filters.was_created_by_competition = $(self.refs.auto_created).prop('checked')
-            filters.is_public = $(self.refs.show_public).prop('checked')
+            filters._public = $(self.refs.show_public).prop('checked')
+            filters._type = "dataset"
             CODALAB.api.get_datasets(filters)
                 .done(function (data) {
                     self.datasets = data.results
diff --git a/src/static/riot/submissions/resource_submissions.tag b/src/static/riot/submissions/resource_submissions.tag
index 755c44a48..81c7e7beb 100644
--- a/src/static/riot/submissions/resource_submissions.tag
+++ b/src/static/riot/submissions/resource_submissions.tag
@@ -252,8 +252,8 @@
 
         self.update_submissions = function (filters) {
             filters = filters || {}
-            filters.is_public = $(self.refs.show_public).prop('checked')
-            filters.type = "submission"
+            filters._public = $(self.refs.show_public).prop('checked')
+            filters._type = "submission"
             CODALAB.api.get_datasets(filters)
                 .done(function (data) {
                     self.submissions = data.results

From 3d90c2a83217dfee85ff2ea48fefab40f902f62a Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsanullah@Pixel-io.local>
Date: Thu, 1 Jun 2023 15:41:17 +0500
Subject: [PATCH 27/30] default filter added

---
 src/apps/api/views/datasets.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/apps/api/views/datasets.py b/src/apps/api/views/datasets.py
index 2ec719dee..c000278da 100644
--- a/src/apps/api/views/datasets.py
+++ b/src/apps/api/views/datasets.py
@@ -26,8 +26,6 @@ class DataViewSet(ModelViewSet):
 
     def get_queryset(self):
 
-        qs = self.queryset
-
         if self.request.method == 'GET':
 
             # new filters
@@ -42,6 +40,9 @@ def get_queryset(self):
             # _type = dataset if called from datasets and programs tab to filter datasets and programs
             is_dataset = self.request.query_params.get('_type', '') == 'dataset'
 
+            # get queryset
+            qs = self.queryset
+
             # filter submissions
             if is_submission:
                 qs = qs.filter(Q(type=Data.SUBMISSION))
@@ -56,7 +57,13 @@ def get_queryset(self):
             else:
                 qs = qs.filter(Q(created_by=self.request.user))
 
+            # if GET is called but provided no filters, fall back to default behaviour
+            if (not is_submission) and (not is_dataset) and (not is_public):
+                qs = self.queryset
+                qs = qs.filter(Q(is_public=True) | Q(created_by=self.request.user))
+
         else:
+            qs = self.queryset
             qs = qs.filter(Q(is_public=True) | Q(created_by=self.request.user))
 
         qs = qs.exclude(Q(type=Data.COMPETITION_BUNDLE) | Q(name__isnull=True))

From 96514bd408b97f0c998556ee4fb5058611f09dda Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Thu, 1 Jun 2023 15:52:38 +0500
Subject: [PATCH 28/30] unused function removed

---
 src/static/riot/datasets/management.tag | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index 87186578e..a493ce9b0 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -286,7 +286,6 @@
             CODALAB.api.get_datasets(filters)
                 .done(function (data) {
                     self.datasets = data.results
-                    //self.datasets = self.filter_out_submissions(self.datasets)
                     self.pagination = {
                         "count": data.count,
                         "next": data.next,
@@ -445,16 +444,6 @@
             }
         }
 
-        // Function to remove submissions from datasets
-        self.filter_out_submissions = function(datasets) {
-            datasets_to_return = []
-            datasets.forEach(dataset => {
-                if (dataset.type != "submission"){
-                    datasets_to_return.push(dataset)
-                }
-            })
-            return datasets_to_return
-        }
 
         // Function to format file size 
         self.format_file_size = function(file_size) {

From a9b9cf4004dd46c4f28fbf86e1944521ea446f3f Mon Sep 17 00:00:00 2001
From: Ihsan Ullah <ihsan2131@gmail.com>
Date: Thu, 1 Jun 2023 16:13:43 +0500
Subject: [PATCH 29/30] delete button is now shown for own submissions and
 datasets/programs only

---
 src/static/riot/datasets/management.tag              | 4 ++--
 src/static/riot/submissions/resource_submissions.tag | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/static/riot/datasets/management.tag b/src/static/riot/datasets/management.tag
index a493ce9b0..3f802592e 100644
--- a/src/static/riot/datasets/management.tag
+++ b/src/static/riot/datasets/management.tag
@@ -56,12 +56,12 @@
                 <i class="checkmark box icon green" show="{ dataset.is_public }"></i>
             </td>
             <td class="center aligned">
-                <button class="ui mini button red icon" onclick="{ delete_dataset.bind(this, dataset) }">
+                <button show="{dataset.created_by === CODALAB.state.user.username}" class="ui mini button red icon" onclick="{ delete_dataset.bind(this, dataset) }">
                     <i class="icon delete"></i>
                 </button>
             </td>
             <td class="center aligned">
-                <div class="ui fitted checkbox">
+                <div show="{dataset.created_by === CODALAB.state.user.username}" class="ui fitted checkbox">
                     <input type="checkbox" name="delete_checkbox" onclick="{ mark_dataset_for_deletion.bind(this, dataset) }">
                     <label></label>
                 </div>
diff --git a/src/static/riot/submissions/resource_submissions.tag b/src/static/riot/submissions/resource_submissions.tag
index 81c7e7beb..719676109 100644
--- a/src/static/riot/submissions/resource_submissions.tag
+++ b/src/static/riot/submissions/resource_submissions.tag
@@ -47,12 +47,12 @@
                 <i class="checkmark box icon green" show="{ submission.is_public }"></i>
             </td>
             <td class="center aligned">
-                <button class="ui mini button red icon" onclick="{ delete_submission.bind(this, submission) }">
+                <button show="{submission.created_by === CODALAB.state.user.username}" class="ui mini button red icon" onclick="{ delete_submission.bind(this, submission) }">
                     <i class="icon delete"></i>
                 </button>
             </td>
             <td class="center aligned">
-                <div class="ui fitted checkbox">
+                <div show="{submission.created_by === CODALAB.state.user.username}" class="ui fitted checkbox">
                     <input type="checkbox" name="delete_checkbox" onclick="{ mark_submission_for_deletion.bind(this, submission) }">
                     <label></label>
                 </div>

From 1ce4c53ccc3e1d12eda3e29d48dc443d554034a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= <adrien.pavao@gmail.com>
Date: Thu, 1 Jun 2023 17:40:57 +0200
Subject: [PATCH 30/30] Save leaderboard during manual creation of benchmark
 (#908)

* Save leaderboard during manual creation of benchmark

* Update competitions.py

* Fix the test: precision should be a number
---
 src/apps/api/views/competitions.py        | 17 +++++++++++++++++
 src/tests/functional/test_competitions.py |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/apps/api/views/competitions.py b/src/apps/api/views/competitions.py
index bb7eeec7b..12a40cf6e 100644
--- a/src/apps/api/views/competitions.py
+++ b/src/apps/api/views/competitions.py
@@ -156,6 +156,23 @@ def create(self, request, *args, **kwargs):
             for index in range(len(phase['tasks'])):
                 phase['tasks'][index] = phase['tasks'][index]['task']
 
+        # TODO - This is Temporary. Need to change Leaderboard to Phase connect to M2M and handle this correctly.
+        # save leaderboard individually, then pass pk to each phase
+        print(f"{request.data['leaderboards']}")
+        data = request.data
+        if 'leaderboards' in data:
+            leaderboard_data = data['leaderboards'][0]
+            if(leaderboard_data['id']):
+                leaderboard_instance = Leaderboard.objects.get(id=leaderboard_data['id'])
+                leaderboard = LeaderboardSerializer(leaderboard_instance, data=data['leaderboards'][0])
+            else:
+                leaderboard = LeaderboardSerializer(data=data['leaderboards'][0])
+            leaderboard.is_valid()
+            leaderboard.save()
+            leaderboard_id = leaderboard["id"].value
+            for phase in data['phases']:
+                phase['leaderboard'] = leaderboard_id
+
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         self.perform_create(serializer)
diff --git a/src/tests/functional/test_competitions.py b/src/tests/functional/test_competitions.py
index 7a1e2cc48..0bd8e3d8b 100644
--- a/src/tests/functional/test_competitions.py
+++ b/src/tests/functional/test_competitions.py
@@ -137,7 +137,7 @@ def test_manual_competition_creation(self):
         self.find('div[selenium="add-column"]').click()
         sleep(LONG_WAIT)
         self.find('input[selenium="column-key"]').send_keys('cOlUmN kEy')
-        self.find('input[selenium="column-precision"]').send_keys('cOlUmN pReCiSiOn')
+        self.find('input[selenium="column-precision"]').send_keys('3')
         self.find('input[selenium="hidden"]').click()
         self.find('div[selenium="save3"]').click()
         sleep(LONG_WAIT)