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 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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>