Add support for hiding/unhiding objects #884

dodumosu · 2022-04-26T11:21:12Z

This pull request addresses nditech/apollo-issues#171 by allowing a user to hide or show location sets, participant sets, events and forms.

migrations/versions/14d0310ab80f_add_is_hidden_field.py

apollo/submissions/views_submissions.py

apollo/formsframework/fixtures/38fff911ea3.sql

takinbo · 2024-03-11T15:48:06Z

apollo/formsframework/views_forms.py

+    show_hidden = bool(query_params.get(show_hidden_param))
+
+    if show_hidden:
+        show_toggle_link_label = _('Hide Hidden')


What does "Hide Hidden" mean? The language should probably be clearer than this.

changed to Hide Archived

takinbo · 2024-03-11T15:49:16Z

apollo/formsframework/views_forms.py

+        add_show_url_param = False
+    else:
+        show_toggle_link_label = _(
+            'Show All (%(count)d Hidden)', count=hidden_form_count)


Can you explain the rational for having the number of hidden objects displayed here?

It was to give the user the number of items that weren't being displayed, but it's been removed

takinbo · 2024-03-11T15:51:06Z

apollo/frontend/views_admin.py

+            {'is_hidden': True}, synchronize_session=False)
+        db.session.commit()
+
+    @action('unhide', _('Always Show'), _('Are you sure you want to always show the selected items?'))


Instead of using Hide and Always Show, could we instead use Archive and Unarchive?

This has been changed

apollo/templates/admin/form_list.html

takinbo · 2024-05-01T13:12:27Z

@dodumosu can you update the migration so it's applied after 7cbcd7443117? Given there are no conflicts of course.

this commit adds the ability to toggle hidden status to the admin view

for hidden forms

this commit reorders the migrations. it also fixes issues with event display

for checklist/survey generation

dodumosu · 2024-05-01T17:11:16Z

done

@dodumosu can you update the migration so it's applied after `7cbcd7443117`? Given there are no conflicts of course.

done

takinbo · 2024-05-13T16:16:57Z

Trying to edit any of the events (whether archived or not), yields this error:

@takinbo

this commit fixes an issue noticed by @takinbo. it's caused by flask-admin using the `resource_id` field as the primary key for events, not the `id` field

takinbo · 2024-05-14T03:52:25Z

There are still issues with the PR:

Hiding/Unhiding events does not work - they are still being displayed and I have no way of knowing if the event was hidden
Hiding a participant set does not remove it from available options when creating an event
Hiding a location set does not remove it from available options when creating a participant set
There's no way to archive forms

takinbo · 2024-05-15T19:44:28Z

Archive/Unarchive buttons do not show up when the "All Forms" checkbox is selected.

dodumosu · 2024-05-15T19:47:08Z

They remain hidden until one or more check boxes are selected. Should I change that behaviour?

…

On Wed, 15 May 2024, 20:44 Tim Akinbo, ***@***.***> wrote: Archive/Unarchive buttons do not show up when the "All Forms" checkbox is selected. Screenshot.2024-05-15.at.20.43.46.png (view on web) <https://github.com/nditech/apollo/assets/41004/cf57c6fc-9a82-4fbd-8d09-d6b7337b9661> — Reply to this email directly, view it on GitHub <#884 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAKX5FXAVAJJGXPIZNFUE63ZCO3LDAVCNFSM5ULQG2NKU5DIOJSWCZC7NNSXTN2JONZXKZKDN5WW2ZLOOQ5TEMJRGMZTGMZVGI2A> . You are receiving this because you were mentioned.Message ID: ***@***.***>

takinbo · 2024-05-15T19:57:37Z

After archiving Events, the archived events are still selectable from the Events selection menu dropdown

- hidden events cannot be switched to by admins anymore - the default event processing skips hidden events - role based access to resources excludes hidden ones (events and forms)

takinbo

tACK

dodumosu requested a review from takinbo April 26, 2022 11:21

dodumosu force-pushed the hide-unhide-objects branch from eec04e2 to ab4ebeb Compare August 16, 2023 15:43

dodumosu force-pushed the hide-unhide-objects branch from ab4ebeb to 0e6bdb7 Compare September 1, 2023 16:54

dodumosu force-pushed the hide-unhide-objects branch from 0e6bdb7 to 80fc368 Compare March 11, 2024 15:21

takinbo requested changes Mar 11, 2024

View reviewed changes

dodumosu added 20 commits May 1, 2024 17:53

feat: add is_hidden field to models

9a78a9b

feat: add data migration

8c34353

feat: update list view and template

5487018

this commit adds the ability to toggle hidden status to the admin view

feat: remove hidden forms and events from UI

efd7261

feat: form list hiding (first version)

477649d

fix: ensure toggles work, backend and front end

f0a14ed

feat: make RR and QA dashboards inaccessible

8bc623c

for hidden forms

chore: change logic

921f54e

chore: update fixtures

515ca89

fix: update fixtures

1e38016

fix: update fixtures

ae7c882

chore: remove unused import

b3d03c2

feat: reorder migrations and fix rendering

2ba60c7

this commit reorders the migrations. it also fixes issues with event display

feat: don't show hidden events

ed20655

for checklist/survey generation

fix: specify columns

442926e

feat: explicitly make columns not nullable

0cc4940

chore: update migration so columns are not nullable

c070a27

chore: change labels

55d7572

chore: don't show submissions for archived forms

7e45fc9

chore: reorder migrations

dc3f7f3

dodumosu force-pushed the hide-unhide-objects branch from eb28bdd to dc3f7f3 Compare May 1, 2024 17:10

fix: set the server_default option on archivable models

fc0d837

dodumosu added 3 commits May 13, 2024 17:33

fix: use correct filter method

c004063

fix: workaround for flask-admin

8d4abaf

this commit fixes an issue noticed by @takinbo. it's caused by flask-admin using the `resource_id` field as the primary key for events, not the `id` field

chore: minor refactor

3bb957c

dodumosu added 5 commits May 14, 2024 05:47

fix: override parent method in Event admin class

bc5c973

chore: add hidden icon, remove default checked status on archived forms

d046314

feat: add custom form converter

ad3610f

feat: remove hidden location sets when creating/editing participant sets

09ff82f

chore: refactor

cf2be16

dodumosu added 2 commits May 16, 2024 01:19

fix: archival buttons should respond to toggle all checkbox

470ee6c

feat: various changes

684ecfa

- hidden events cannot be switched to by admins anymore - the default event processing skips hidden events - role based access to resources excludes hidden ones (events and forms)

takinbo approved these changes Jul 24, 2024

View reviewed changes

takinbo merged commit 5d40c39 into nditech:develop Jul 24, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for hiding/unhiding objects #884

Add support for hiding/unhiding objects #884

dodumosu commented Apr 26, 2022

takinbo Mar 11, 2024

dodumosu Apr 23, 2024

takinbo Mar 11, 2024

dodumosu Apr 23, 2024

takinbo Mar 11, 2024

dodumosu Apr 23, 2024

takinbo commented May 1, 2024

dodumosu commented May 1, 2024

takinbo commented May 13, 2024

takinbo commented May 14, 2024

takinbo commented May 15, 2024

dodumosu commented May 15, 2024 via email

takinbo commented May 15, 2024

takinbo left a comment

Add support for hiding/unhiding objects #884

Add support for hiding/unhiding objects #884

Conversation

dodumosu commented Apr 26, 2022

takinbo Mar 11, 2024

Choose a reason for hiding this comment

dodumosu Apr 23, 2024

Choose a reason for hiding this comment

takinbo Mar 11, 2024

Choose a reason for hiding this comment

dodumosu Apr 23, 2024

Choose a reason for hiding this comment

takinbo Mar 11, 2024

Choose a reason for hiding this comment

dodumosu Apr 23, 2024

Choose a reason for hiding this comment

takinbo commented May 1, 2024

dodumosu commented May 1, 2024

takinbo commented May 13, 2024

takinbo commented May 14, 2024

takinbo commented May 15, 2024

dodumosu commented May 15, 2024 via email

takinbo commented May 15, 2024

takinbo left a comment

Choose a reason for hiding this comment