From 6a3b46a1d0d4a058d15b11d2f0b1a54ea7b39ca2 Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Thu, 12 Oct 2023 14:56:26 -0700 Subject: [PATCH 1/9] Simplify edit view --- .../snippets/object_header_tabs.html | 2 +- app/admin_ui/urls.py | 4 +- app/admin_ui/views/v2.py | 58 +++++-------------- 3 files changed, 17 insertions(+), 47 deletions(-) diff --git a/app/admin_ui/templates/snippets/object_header_tabs.html b/app/admin_ui/templates/snippets/object_header_tabs.html index c7d351451..20429bee1 100644 --- a/app/admin_ui/templates/snippets/object_header_tabs.html +++ b/app/admin_ui/templates/snippets/object_header_tabs.html @@ -15,7 +15,7 @@
  • Edits {% if draft_status == 'Published' and url_name == 'create-update' %} diff --git a/app/admin_ui/urls.py b/app/admin_ui/urls.py index daf98948a..e87a43535 100644 --- a/app/admin_ui/urls.py +++ b/app/admin_ui/urls.py @@ -68,9 +68,9 @@ v2.CanonicalRecordPublished.as_view(), name="canonical-published-detail", ), - # Update for latest published draft. + # View latest draft for canonical record. path( - 'v2///edit/', + 'v2///edit', v2.CanonicalDraftEdit.as_view(), name="canonical-draft-edit", ), diff --git a/app/admin_ui/views/v2.py b/app/admin_ui/views/v2.py index b23f1478c..04c0290e4 100644 --- a/app/admin_ui/views/v2.py +++ b/app/admin_ui/views/v2.py @@ -40,13 +40,12 @@ # TODO add login requirement def redirect_helper(request, canonical_uuid, draft_uuid, model): try: - draft = Change.objects.get(uuid=canonical_uuid) has_progress_draft = ( Change.objects.exclude(status=Change.Statuses.PUBLISHED) - .filter(Q(uuid=draft.uuid) | Q(model_instance_uuid=draft.uuid)) + .filter(Q(uuid=canonical_uuid) | Q(model_instance_uuid=canonical_uuid)) .exists() ) - if draft.status == Change.Statuses.PUBLISHED and not has_progress_draft: + if not has_progress_draft: return redirect( reverse( "canonical-published-detail", @@ -57,16 +56,17 @@ def redirect_helper(request, canonical_uuid, draft_uuid, model): }, ) ) - # TODO return redirect to edit view - # return HttpResponse("Todo return redirect") return redirect( reverse( "canonical-draft-edit", - kwargs={"canonical_uuid": canonical_uuid, "model": model, "draft_uuid": draft_uuid}, + kwargs={ + "canonical_uuid": canonical_uuid, + "model": model, + }, ) ) except Change.DoesNotExist: - raise Http404("Canonial UI does not exist") + raise Http404("Canonical UI does not exist") # Lists all the canonical records for a given model type @@ -216,6 +216,7 @@ class CanonicalDraftEdit(NotificationSidebar, mixins.ChangeModelFormMixin, Updat prefix = "change" template_name = "api_app/canonical/change_update.html" pk_url_kwarg = 'canonical_uuid' + queryset = Change.objects.all().exclude(status=Change.Statuses.PUBLISHED) def get_queryset(self): return Change.objects.all() @@ -252,40 +253,13 @@ def get(self, request, *args, **kwargs): def get_object(self, queryset=None): if not queryset: - queryset = self.get_queryset() - self.canonical_change = queryset.get(uuid=self.kwargs["canonical_uuid"]) - # if the canonical record is not published, return the record itself - if self.canonical_change.status != Change.Statuses.PUBLISHED: - return self.canonical_change - - # if canonical record is published, return the record where the model_instance_uuid equals our canonical_uuid - - # TODO include url to make this check - # if there is no update in progress return most recently published object - if ( - not Change.objects.exclude(status=Change.Statuses.PUBLISHED) - .filter( - model_instance_uuid=self.canonical_change.uuid, - content_type=self.canonical_change.content_type, - action=Change.Actions.UPDATE, - ) - .exists() - ): - return ( - Change.objects.filter( - status=Change.Statuses.PUBLISHED, - model_instance_uuid=self.kwargs["canonical_uuid"], - ) - .order_by("updated_at") - .last() - ) + queryset = self.queryset - # try: - # TODO: include uuid in url - return Change.objects.exclude(status=Change.Statuses.PUBLISHED).get( - model_instance_uuid=self.canonical_change.uuid, - content_type=self.canonical_change.content_type, - action=Change.Actions.UPDATE, + canonical_uuid = self.kwargs["canonical_uuid"] + return ( + queryset.filter(Q(uuid=canonical_uuid) | Q(model_instance_uuid=canonical_uuid)) + .order_by('status') + .first() ) def get_success_url(self, **kwargs): @@ -314,7 +288,6 @@ def get_context_data(self, **kwargs): "ancestors": context["object"].get_ancestors().select_related("content_type"), "descendents": context["object"].get_descendents().select_related("content_type"), "comparison_form": self._get_comparison_form(context['model_form']), - "canonical_object": self.canonical_change, "canonical_uuid": self.kwargs[self.pk_url_kwarg], "draft_uuid": self.object.pk, } @@ -416,7 +389,6 @@ def get_success_url(self): kwargs={ "canonical_uuid": self.object.pk, "model": self._model_name, - "draft_uuid": self.object.pk, }, ) @@ -480,8 +452,6 @@ def get_success_url(self): kwargs={ "model": self._model_name, "canonical_uuid": self.kwargs["canonical_uuid"], - # TODO: Check if this is really the right draft_UUID - "draft_uuid": self.object.pk, }, ) From 1a6aff6a9e0fcf41c0b4bd419b28cc85bc1cceb8 Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Thu, 12 Oct 2023 15:09:16 -0700 Subject: [PATCH 2/9] Handle case of no in progress records --- app/admin_ui/views/v2.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/admin_ui/views/v2.py b/app/admin_ui/views/v2.py index 04c0290e4..276fd14b1 100644 --- a/app/admin_ui/views/v2.py +++ b/app/admin_ui/views/v2.py @@ -256,12 +256,17 @@ def get_object(self, queryset=None): queryset = self.queryset canonical_uuid = self.kwargs["canonical_uuid"] - return ( + obj = ( queryset.filter(Q(uuid=canonical_uuid) | Q(model_instance_uuid=canonical_uuid)) .order_by('status') .first() ) + if not obj: + raise Http404(f'No in progress draft with Canonical UUID {canonical_uuid!r}') + + return obj + def get_success_url(self, **kwargs): url = reverse( "canonical-redirect", From 67575daa9b53127fa6d449873f6d627baf5fc9a8 Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Thu, 12 Oct 2023 16:19:41 -0700 Subject: [PATCH 3/9] Aggressively prune draft_uuid --- app/admin_ui/tables/tables.py | 20 +++++++------------ .../snippets/object_header_tabs.html | 2 +- app/admin_ui/templatetags/template_extras.py | 1 - app/admin_ui/urls.py | 4 ++-- app/admin_ui/views/change.py | 1 - app/admin_ui/views/v2.py | 7 +------ 6 files changed, 11 insertions(+), 24 deletions(-) diff --git a/app/admin_ui/tables/tables.py b/app/admin_ui/tables/tables.py index e1db09b40..a121571e1 100644 --- a/app/admin_ui/tables/tables.py +++ b/app/admin_ui/tables/tables.py @@ -505,8 +505,6 @@ def render_short_name(self, value, record): 'canonical-redirect', kwargs={ "canonical_uuid": record.uuid, - # this property is coming from an annotation on the inital query - "draft_uuid": record.draft_uuid, "model": camel_to_snake(record.model_name), }, ), @@ -526,7 +524,13 @@ class CampaignChangeListTable(LimitedTableBase): verbose_name="Short Name", accessor="latest_update__short_name", update_accessor="content_object.short_name", - linkify=("change-update", [tables.A("uuid")]), + linkify=( + "canonical-redirect", + { + "canonical_uuid": tables.A('uuid'), + "model": 'campaign', + }, + ), ) funding_agency = ConditionalValueColumn( verbose_name="Funding Agency", @@ -548,8 +552,6 @@ def render_short_name(self, value, record): 'canonical-redirect', kwargs={ "canonical_uuid": record.uuid, - # this property is coming from an annotation on the inital query - "draft_uuid": record.draft_uuid, "model": camel_to_snake(record.model_name), }, ), @@ -578,8 +580,6 @@ def render_short_name(self, value, record): 'canonical-redirect', kwargs={ "canonical_uuid": record.uuid, - # this property is coming from an annotation on the inital query - "draft_uuid": record.draft_uuid, "model": camel_to_snake(record.model_name), }, ), @@ -600,8 +600,6 @@ def render_short_name(self, value, record): 'canonical-redirect', kwargs={ "canonical_uuid": record.uuid, - # this property is coming from an annotation on the inital query - "draft_uuid": record.draft_uuid, "model": camel_to_snake(record.model_name), }, ), @@ -633,8 +631,6 @@ def render_short_name(self, value, record): 'canonical-redirect', kwargs={ "canonical_uuid": record.model_instance_uuid or record.uuid, - # TODO this change object has not property draft uuid - "draft_uuid": record.uuid, "model": camel_to_snake(record.model_name), }, ), @@ -909,8 +905,6 @@ def render_short_name(self, value, record): 'canonical-redirect', kwargs={ "canonical_uuid": record.uuid, - # this property is coming from an annotation on the inital query - "draft_uuid": record.draft_uuid, "model": camel_to_snake(record.model_name), }, ), diff --git a/app/admin_ui/templates/snippets/object_header_tabs.html b/app/admin_ui/templates/snippets/object_header_tabs.html index 20429bee1..5b418a49e 100644 --- a/app/admin_ui/templates/snippets/object_header_tabs.html +++ b/app/admin_ui/templates/snippets/object_header_tabs.html @@ -7,7 +7,7 @@
  • Published diff --git a/app/admin_ui/templatetags/template_extras.py b/app/admin_ui/templatetags/template_extras.py index 81e4d5064..676123d7c 100644 --- a/app/admin_ui/templatetags/template_extras.py +++ b/app/admin_ui/templatetags/template_extras.py @@ -94,7 +94,6 @@ def object_header_tabs(context, change: Change, canonical_change: Optional[Chang "draft_status": draft_status, "draft_status_class": draft_status_class, "canonical_uuid": canonical_uuid, - "draft_uuid": change.uuid, "has_progress_draft": has_progress_draft, "has_published_draft": has_published_draft, "request": context.get("request"), diff --git a/app/admin_ui/urls.py b/app/admin_ui/urls.py index e87a43535..aba89fabe 100644 --- a/app/admin_ui/urls.py +++ b/app/admin_ui/urls.py @@ -58,13 +58,13 @@ path('v2/', v2.CanonicalRecordList.as_view(), name="canonical-list"), # Helper route to redirect user to appropriate view without prior knowledge of record's status (ie if it's been published). If published, return redirect to `//published`. Otherwise, redirect to `//edit`. path( - 'v2///', + 'v2//', v2.redirect_helper, name="canonical-redirect", ), # Read-only view the published record for this concept. Render `400` response if record is not yet published. path( - 'v2///published/', + 'v2///published', v2.CanonicalRecordPublished.as_view(), name="canonical-published-detail", ), diff --git a/app/admin_ui/views/change.py b/app/admin_ui/views/change.py index 9f0b3768f..7572f5c88 100644 --- a/app/admin_ui/views/change.py +++ b/app/admin_ui/views/change.py @@ -90,7 +90,6 @@ def get_queryset(self): Change.objects.of_type(*self.models) .filter(action=Change.Actions.CREATE) .annotate( - draft_uuid=Subquery(related_drafts.values("uuid")[:1]), latest_status=Subquery(related_drafts.values("status")[:1]), latest_action=Subquery(related_drafts.values("action")[:1]), latest_updated_at=Subquery(related_drafts.values("updated_at")[:1]), diff --git a/app/admin_ui/views/v2.py b/app/admin_ui/views/v2.py index 276fd14b1..13f8c9e6c 100644 --- a/app/admin_ui/views/v2.py +++ b/app/admin_ui/views/v2.py @@ -38,7 +38,7 @@ # TODO add login requirement -def redirect_helper(request, canonical_uuid, draft_uuid, model): +def redirect_helper(request, canonical_uuid, model): try: has_progress_draft = ( Change.objects.exclude(status=Change.Statuses.PUBLISHED) @@ -52,7 +52,6 @@ def redirect_helper(request, canonical_uuid, draft_uuid, model): kwargs={ "canonical_uuid": canonical_uuid, "model": model, - "draft_uuid": draft_uuid, }, ) ) @@ -103,7 +102,6 @@ def get_queryset(self): ) ) .annotate( - draft_uuid=Subquery(related_drafts.values("uuid")[:1]), latest_status=Subquery(related_drafts.values("status")[:1]), latest_action=Subquery(related_drafts.values("action")[:1]), latest_updated_at=Subquery(related_drafts.values("updated_at")[:1]), @@ -272,7 +270,6 @@ def get_success_url(self, **kwargs): "canonical-redirect", kwargs={ "canonical_uuid": self.kwargs[self.pk_url_kwarg], - "draft_uuid": self.object.pk, "model": self.kwargs["model"], }, ) @@ -294,7 +291,6 @@ def get_context_data(self, **kwargs): "descendents": context["object"].get_descendents().select_related("content_type"), "comparison_form": self._get_comparison_form(context['model_form']), "canonical_uuid": self.kwargs[self.pk_url_kwarg], - "draft_uuid": self.object.pk, } def _get_comparison_form(self, model_form): @@ -448,7 +444,6 @@ def get_context_data(self, **kwargs): Change.objects.get(uuid=self.kwargs[self.pk_url_kwarg]).model_name.lower() ), "display_name": Change.objects.get(uuid=self.kwargs[self.pk_url_kwarg]).model_name, - "draft_uuid": self.object.pk, } def get_success_url(self): From c8bb72c8b03bbcd9798dc349c8b22fb6f21d26a7 Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Fri, 13 Oct 2023 13:48:54 -0700 Subject: [PATCH 4/9] Add/use queryset convenience methods --- app/admin_ui/views/v2.py | 87 ++++++++++++++-------------------------- app/api_app/models.py | 8 +++- 2 files changed, 37 insertions(+), 58 deletions(-) diff --git a/app/admin_ui/views/v2.py b/app/admin_ui/views/v2.py index 13f8c9e6c..1ac59e91e 100644 --- a/app/admin_ui/views/v2.py +++ b/app/admin_ui/views/v2.py @@ -12,7 +12,7 @@ from django.urls import reverse from django.contrib.contenttypes.models import ContentType from django.views.generic.edit import UpdateView -from django.db.models import Q, OuterRef, Subquery +from django.db.models import OuterRef, Subquery from django.views.generic.edit import CreateView from admin_ui.config import MODEL_CONFIG_MAP @@ -39,23 +39,8 @@ # TODO add login requirement def redirect_helper(request, canonical_uuid, model): - try: - has_progress_draft = ( - Change.objects.exclude(status=Change.Statuses.PUBLISHED) - .filter(Q(uuid=canonical_uuid) | Q(model_instance_uuid=canonical_uuid)) - .exists() - ) - if not has_progress_draft: - return redirect( - reverse( - "canonical-published-detail", - kwargs={ - "canonical_uuid": canonical_uuid, - "model": model, - }, - ) - ) - return redirect( + return ( + redirect( reverse( "canonical-draft-edit", kwargs={ @@ -64,8 +49,17 @@ def redirect_helper(request, canonical_uuid, model): }, ) ) - except Change.DoesNotExist: - raise Http404("Canonical UI does not exist") + if Change.objects.related_in_progress_drafts(uuid=canonical_uuid).exists() + else redirect( + reverse( + "canonical-published-detail", + kwargs={ + "canonical_uuid": canonical_uuid, + "model": model, + }, + ) + ) + ) # Lists all the canonical records for a given model type @@ -86,9 +80,9 @@ def get_queryset(self): However, we want to display the most recent related draft in the table. """ # find the most recent drafts for each canonical CREATED draft - related_drafts = Change.objects.filter( - Q(model_instance_uuid=OuterRef("uuid")) | Q(uuid=OuterRef("uuid")) - ).order_by("status", "-updated_at") + related_drafts = Change.objects.related_drafts(OuterRef("uuid")).order_by( + "status", "-updated_at" + ) latest_published_draft = Change.objects.filter( status=Change.Statuses.PUBLISHED, @@ -134,10 +128,7 @@ class ChangeHistoryList(mixins.DynamicModelMixin, tables.SingleTableView): template_name = "api_app/canonical/change_history.html" def get_queryset(self): - return Change.objects.filter( - Q(model_instance_uuid=self.kwargs[self.pk_url_kwarg]) - | Q(uuid=self.kwargs[self.pk_url_kwarg]) - ) + return Change.objects.related_drafts(self.kwargs[self.pk_url_kwarg]) def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -192,14 +183,9 @@ def get_context_data(self, **kwargs): Change.objects.get(uuid=self.kwargs[self.pk_url_kwarg]).model_name.lower() ), "display_name": Change.objects.get(uuid=self.kwargs[self.pk_url_kwarg]).model_name, - "has_progress_draft": ( - Change.objects.exclude(status=Change.Statuses.PUBLISHED) - .filter( - Q(uuid=self.kwargs[self.pk_url_kwarg]) - | Q(model_instance_uuid=self.kwargs[self.pk_url_kwarg]) - ) - .exists() - ), + "has_progress_draft": Change.objects.related_in_progress_drafts( + self.kwargs[self.pk_url_kwarg] + ).exists(), } @@ -221,22 +207,15 @@ def get_queryset(self): def get(self, request, *args, **kwargs): self.object = self.get_object() - has_progress_draft = ( - Change.objects.exclude(status=Change.Statuses.PUBLISHED) - .filter( - model_instance_uuid=self.canonical_change.uuid, - content_type=self.canonical_change.content_type, - action=Change.Actions.UPDATE, - ) - .exists() + in_progress_drafts = Change.objects.related_in_progress_drafts( + self.kwargs["canonical_uuid"] ) - has_published_draft = Change.objects.filter( - Q(uuid=self.canonical_change.uuid) | Q(model_instance_uuid=self.canonical_change.uuid), - status=Change.Statuses.PUBLISHED, - ).exists() + published_drafts = Change.objects.related_drafts(self.kwargs["canonical_uuid"]).filter( + status=Change.Statuses.PUBLISHED + ) - if not has_progress_draft and has_published_draft: + if not in_progress_drafts.exists() and published_drafts.exists(): return redirect( reverse( "canonical-published-detail", @@ -254,16 +233,10 @@ def get_object(self, queryset=None): queryset = self.queryset canonical_uuid = self.kwargs["canonical_uuid"] - obj = ( - queryset.filter(Q(uuid=canonical_uuid) | Q(model_instance_uuid=canonical_uuid)) - .order_by('status') - .first() - ) - - if not obj: - raise Http404(f'No in progress draft with Canonical UUID {canonical_uuid!r}') - return obj + if obj := queryset.related_drafts(canonical_uuid).order_by('status').first(): + return obj + raise Http404(f'No in progress draft with Canonical UUID {canonical_uuid!r}') def get_success_url(self, **kwargs): url = reverse( diff --git a/app/api_app/models.py b/app/api_app/models.py index 719d02c83..bcb492c00 100644 --- a/app/api_app/models.py +++ b/app/api_app/models.py @@ -6,7 +6,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType from django.db import models -from django.db.models import expressions, functions, Subquery +from django.db.models import expressions, functions, Subquery, Q from django.db.models.fields.json import KeyTextTransform from django.db.models.signals import post_save from django.dispatch import receiver @@ -117,6 +117,12 @@ def get_action_display_past_tense(self): class ChangeQuerySet(models.QuerySet): + def related_drafts(self, uuid: str): + return self.filter(Q(uuid=uuid) | Q(model_instance_uuid=uuid)) + + def related_in_progress_drafts(self, uuid: str): + return self.related_drafts(uuid=uuid).exclude(status=Change.Statuses.PUBLISHED) + def of_type(self, *models): """ Limit changes to only those targeted to provided models From 82b26efd673370c782d369c3e4c3d55abbd5f673 Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Fri, 13 Oct 2023 14:29:16 -0700 Subject: [PATCH 5/9] Cleanup --- app/admin_ui/views/v2.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/app/admin_ui/views/v2.py b/app/admin_ui/views/v2.py index 1ac59e91e..e2ca93793 100644 --- a/app/admin_ui/views/v2.py +++ b/app/admin_ui/views/v2.py @@ -3,10 +3,7 @@ from django.contrib.auth.decorators import login_required from django.utils.decorators import method_decorator from django.views.generic.detail import DetailView -from django_filters.views import FilterView -from django_tables2.views import SingleTableMixin from django.forms import modelform_factory -import django_tables2 as tables from django.http import Http404, HttpResponseBadRequest from django.shortcuts import redirect from django.urls import reverse @@ -14,8 +11,10 @@ from django.views.generic.edit import UpdateView from django.db.models import OuterRef, Subquery from django.views.generic.edit import CreateView -from admin_ui.config import MODEL_CONFIG_MAP +from django_filters.views import FilterView +from django_tables2 import SingleTableView, SingleTableMixin +from admin_ui.config import MODEL_CONFIG_MAP from admin_ui.views.published import ModelObjectView from api_app.models import Change @@ -37,8 +36,12 @@ from ..tables import DraftHistoryTable -# TODO add login requirement +@login_required def redirect_helper(request, canonical_uuid, model): + """ + Redirect to the latest draft edit if non-publishd edit exist. Otherwise, send to + published detail view. + """ return ( redirect( reverse( @@ -121,7 +124,7 @@ def get_context_data(self, **kwargs): @method_decorator(login_required, name="dispatch") -class ChangeHistoryList(mixins.DynamicModelMixin, tables.SingleTableView): +class ChangeHistoryList(mixins.DynamicModelMixin, SingleTableView): model = Change table_class = DraftHistoryTable pk_url_kwarg = 'canonical_uuid' @@ -166,13 +169,21 @@ def get_context_data(self, **kwargs): @method_decorator(login_required, name="dispatch") class CanonicalRecordPublished(ModelObjectView): + """ + Render a read-only form displaying the latest published draft. + """ + model = Change pk_url_kwarg = 'canonical_uuid' template_name = "api_app/canonical/published_detail.html" fields = ["content_type", "model_instance_uuid", "action", "update"] def get_model_form_content_type(self) -> ContentType: - return Change.objects.get(uuid=self.kwargs[self.pk_url_kwarg]).content_type + return ( + Change.objects.prefetch_related('content_type') + .get(uuid=self.kwargs[self.pk_url_kwarg]) + .content_type + ) def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -191,7 +202,10 @@ def get_context_data(self, **kwargs): @method_decorator(login_required, name="dispatch") class CanonicalDraftEdit(NotificationSidebar, mixins.ChangeModelFormMixin, UpdateView): - """This view is in charge of editing existing drafts. + """ + This view is in charge of editing the latest in-progress drafts. If no in-progress + drafts are available, a 404 is returned. + If the draft has a related published record, a diff view is returned to the user. Otherwise a single form view is returned. """ From 3ef3828070674b68f328e64b911ef439e9354900 Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Fri, 13 Oct 2023 15:20:43 -0700 Subject: [PATCH 6/9] Bugfix: return user to redirect view after transitions --- app/admin_ui/views/change.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/admin_ui/views/change.py b/app/admin_ui/views/change.py index 7572f5c88..cf728f72b 100644 --- a/app/admin_ui/views/change.py +++ b/app/admin_ui/views/change.py @@ -479,19 +479,25 @@ def form_valid(self, form): mark_safe(f"Unable to transition draft. {format_validation_error(err)}"), ) else: - obj = self.get_object() messages.success( self.request, ( - f"Transitioned \"{obj.model_name}: {obj.update.get('short_name', obj.uuid)}\" " - f"to \"{obj.get_status_display()}\"." + f"Transitioned {form.change.model_name}:" + + f" {form.change.update.get('short_name', form.change.uuid)!r}" + + f" to {form.change.get_status_display()!r}." ), ) return super().form_valid(form) def get_success_url(self): - return self.request.META.get("HTTP_REFERER") or super().get_success_url() + return reverse( + "canonical-redirect", + kwargs={ + "canonical_uuid": self.kwargs[self.pk_url_kwarg], + "model": self.get_form().change.content_type.model, + }, + ) def format_validation_error(err: ValidationError) -> str: From f71f693bd1a933b06aba8007b9475ae86bb0cac4 Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Mon, 16 Oct 2023 09:25:19 -0700 Subject: [PATCH 7/9] Rename column to better explain purpose (#587) --- app/admin_ui/tables/published.py | 54 +++---- app/admin_ui/tables/tables.py | 242 +++++++++++++++---------------- 2 files changed, 148 insertions(+), 148 deletions(-) diff --git a/app/admin_ui/tables/published.py b/app/admin_ui/tables/published.py index 6e5dc6a07..f658e98ac 100644 --- a/app/admin_ui/tables/published.py +++ b/app/admin_ui/tables/published.py @@ -29,7 +29,7 @@ WebsiteType, ) -from .tables import ConditionalValueColumn, ShortNamefromUUIDColumn +from .tables import BackupValueColumn, ShortNamefromUUIDColumn class LimitedTableBase(tables.Table): @@ -46,7 +46,7 @@ class Meta: class IOPPublishedTable(tables.Table): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('IOP'))), verbose_name="Short Name", accessor="short_name", @@ -67,7 +67,7 @@ class Meta(LimitedTableBase.Meta): class SignificantEventPublishedTable(tables.Table): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('SignificantEvent')), @@ -120,7 +120,7 @@ class Meta(LimitedTableBase.Meta): class DOIPublishedTable(tables.Table): - concept_id = ConditionalValueColumn( + concept_id = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('DOI'))), verbose_name="Concept ID", accessor="concept_id", @@ -148,7 +148,7 @@ class Meta(LimitedTableBase.Meta): class DeploymentPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Deployment'))), verbose_name="Short Name", accessor="short_name", @@ -167,7 +167,7 @@ class Meta(LimitedTableBase.Meta): class PlatformTypePublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('PlatformType')), @@ -184,7 +184,7 @@ class Meta(LimitedTableBase.Meta): class MeasurementTypePublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('MeasurementType')), @@ -201,7 +201,7 @@ class Meta(LimitedTableBase.Meta): class MeasurementStylePublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('MeasurementStyle')), @@ -218,7 +218,7 @@ class Meta(LimitedTableBase.Meta): class HomeBasePublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('HomeBase'))), verbose_name="Short Name", accessor="short_name", @@ -232,7 +232,7 @@ class Meta(LimitedTableBase.Meta): class FocusAreaPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('FocusArea'))), verbose_name="Short Name", accessor="short_name", @@ -246,7 +246,7 @@ class Meta(LimitedTableBase.Meta): class SeasonPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Season'))), verbose_name="Short Name", accessor="short_name", @@ -260,7 +260,7 @@ class Meta(LimitedTableBase.Meta): class RepositoryPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Repository'))), verbose_name="Short Name", accessor="short_name", @@ -274,7 +274,7 @@ class Meta(LimitedTableBase.Meta): class MeasurementRegionPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('MeasurementRegion')), @@ -292,7 +292,7 @@ class Meta(LimitedTableBase.Meta): class GeographicalRegionPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('GeographicalRegion')), @@ -310,7 +310,7 @@ class Meta(LimitedTableBase.Meta): class GeophysicalConceptPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('GeophysicalConcept')), @@ -328,7 +328,7 @@ class Meta(LimitedTableBase.Meta): class PartnerOrgPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('PartnerOrg'))), verbose_name="Short Name", accessor="short_name", @@ -342,7 +342,7 @@ class Meta(LimitedTableBase.Meta): class WebsiteTypePublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('WebsiteType')), @@ -359,7 +359,7 @@ class Meta(LimitedTableBase.Meta): class CampaignPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Campaign'))), verbose_name="Short Name", accessor="short_name", @@ -373,7 +373,7 @@ class Meta(LimitedTableBase.Meta): class PlatformPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Platform'))), verbose_name="Short Name", accessor="short_name", @@ -387,7 +387,7 @@ class Meta(LimitedTableBase.Meta): class InstrumentPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Instrument'))), verbose_name="Short Name", accessor="short_name", @@ -401,7 +401,7 @@ class Meta(LimitedTableBase.Meta): class WebsitePublishedTable(tables.Table): - title = ConditionalValueColumn( + title = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Website'))), verbose_name="Title", accessor="title", @@ -416,7 +416,7 @@ class Meta(LimitedTableBase.Meta): class AliasPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Alias'))), verbose_name="Short Name", accessor="short_name", @@ -431,7 +431,7 @@ class Meta(LimitedTableBase.Meta): class GcmdProjectPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('GcmdProject')), @@ -448,7 +448,7 @@ class Meta(LimitedTableBase.Meta): class GcmdInstrumentPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('GcmdInstrument')), @@ -479,7 +479,7 @@ class Meta(LimitedTableBase.Meta): class GcmdPlatformPublishedTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('GcmdPlatform')), @@ -496,7 +496,7 @@ class Meta(LimitedTableBase.Meta): class GcmdPhenomenonPublishedTable(tables.Table): - variable_3 = ConditionalValueColumn( + variable_3 = BackupValueColumn( linkify=( "published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('GcmdPhenomenon')), @@ -517,7 +517,7 @@ class Meta(LimitedTableBase.Meta): class ImagePublishedTable(tables.Table): - title = ConditionalValueColumn( + title = BackupValueColumn( linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Image'))), verbose_name="Title", accessor="title", diff --git a/app/admin_ui/tables/tables.py b/app/admin_ui/tables/tables.py index a121571e1..4eaa9b94a 100644 --- a/app/admin_ui/tables/tables.py +++ b/app/admin_ui/tables/tables.py @@ -18,10 +18,10 @@ from api_app.models import ApprovalLog -class ConditionalValueColumn(tables.Column): - def __init__(self, update_accessor=None, **kwargs): +class BackupValueColumn(tables.Column): + def __init__(self, backup_accessor=None, **kwargs): super().__init__(**kwargs, empty_values=()) - self.update_accessor = update_accessor + self.backup_accessor = backup_accessor def _get_processed_value(self, value): if value.__class__.__name__ == "ManyRelatedManager": @@ -46,10 +46,10 @@ def get_backup_value(self, **kwargs): # This is being called from published tables as well. Which doesn't come with a record with action attribute if ( not value - and self.update_accessor + and self.backup_accessor and getattr(record, "action", None) != Change.Actions.CREATE ): - accessor = A(self.update_accessor) + accessor = A(self.backup_accessor) value = self._get_processed_value(accessor.resolve(record)) return value @@ -69,7 +69,7 @@ def render(self, **kwargs): return value or "---" -class ShortNamefromUUIDColumn(ConditionalValueColumn): +class ShortNamefromUUIDColumn(BackupValueColumn): def __init__(self, model=None, **kwargs): super().__init__(**kwargs) self.model = model @@ -187,16 +187,16 @@ def render_status(self, value, record): class LimitedTableBase(DraftTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="Short Name", accessor="update__short_name", - update_accessor="content_object.short_name", + backup_accessor="content_object.short_name", linkify=("change-update", [tables.A("uuid")]), ) - long_name = ConditionalValueColumn( + long_name = BackupValueColumn( verbose_name="Long Name", accessor="latest_update__long_name", - update_accessor="content_object.long_name", + backup_accessor="content_object.long_name", ) initial_fields = ("short_name", "long_name") @@ -207,27 +207,27 @@ class Meta(DraftTableBase.Meta): class IOPChangeListTable(DraftTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="Short Name", accessor="update__short_name", - update_accessor="content_object.short_name", + backup_accessor="content_object.short_name", linkify=("change-update", [tables.A("uuid")]), ) deployment = ShortNamefromUUIDColumn( verbose_name="Deployment", model=Deployment, accessor="update__deployment", - update_accessor="content_object.deployment", + backup_accessor="content_object.deployment", ) - start_date = ConditionalValueColumn( + start_date = BackupValueColumn( verbose_name="Start Date", accessor="update__start_date", - update_accessor="content_object.start_date", + backup_accessor="content_object.start_date", ) - end_date = ConditionalValueColumn( + end_date = BackupValueColumn( verbose_name="End Date", accessor="update__end_date", - update_accessor="content_object.end_date", + backup_accessor="content_object.end_date", ) class Meta(DraftTableBase.Meta): @@ -242,27 +242,27 @@ class Meta(DraftTableBase.Meta): class SignificantEventChangeListTable(DraftTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="Short Name", accessor="update__short_name", - update_accessor="content_object.short_name", + backup_accessor="content_object.short_name", linkify=("change-update", [tables.A("uuid")]), ) deployment = ShortNamefromUUIDColumn( verbose_name="Deployment", model=Deployment, accessor="update__deployment", - update_accessor="content_object.deployment", + backup_accessor="content_object.deployment", ) - start_date = ConditionalValueColumn( + start_date = BackupValueColumn( verbose_name="Start Date", accessor="update__start_date", - update_accessor="content_object.start_date", + backup_accessor="content_object.start_date", ) - end_date = ConditionalValueColumn( + end_date = BackupValueColumn( verbose_name="End Date", accessor="update__end_date", - update_accessor="content_object.end_date", + backup_accessor="content_object.end_date", ) class Meta(DraftTableBase.Meta): @@ -283,20 +283,20 @@ class CollectionPeriodChangeListTable(DraftTableBase): model=Deployment, verbose_name="Deployment", accessor="update__deployment", - update_accessor="content_object.deployment", + backup_accessor="content_object.deployment", ) platform = ShortNamefromUUIDColumn( verbose_name="Platform", model=Platform, accessor="update__platform", - update_accessor="content_object.platform", + backup_accessor="content_object.platform", ) instruments = ShortNamefromUUIDColumn( verbose_name="Instruments", model=Instrument, accessor="update__instruments", - update_accessor="content_object.instruments", + backup_accessor="content_object.instruments", ) class Meta(DraftTableBase.Meta): @@ -306,34 +306,34 @@ class Meta(DraftTableBase.Meta): class DOIChangeListTable(DraftTableBase): - concept_id = ConditionalValueColumn( + concept_id = BackupValueColumn( verbose_name="Concept ID", accessor="update__concept_id", - update_accessor="content_object.concept_id", + backup_accessor="content_object.concept_id", linkify=("change-update", [tables.A("uuid")]), ) - long_name = ConditionalValueColumn( + long_name = BackupValueColumn( verbose_name="Long Name", accessor="update__long_name", - update_accessor="content_object.long_name", + backup_accessor="content_object.long_name", ) campaigns = ShortNamefromUUIDColumn( verbose_name="Campaigns", model=Campaign, accessor="update__campaigns", - update_accessor="content_object.campaigns", + backup_accessor="content_object.campaigns", ) platforms = ShortNamefromUUIDColumn( verbose_name="Platforms", model=Platform, accessor="update__platforms", - update_accessor="content_object.platforms", + backup_accessor="content_object.platforms", ) instruments = ShortNamefromUUIDColumn( verbose_name="Instruments", model=Instrument, accessor="update__instruments", - update_accessor="content_object.instruments", + backup_accessor="content_object.instruments", ) class Meta(DraftTableBase.Meta): @@ -353,17 +353,17 @@ class DeploymentChangeListTable(LimitedTableBase): verbose_name="Campaign", model=Campaign, accessor="update__campaign", - update_accessor="content_object.campaign", + backup_accessor="content_object.campaign", ) - start_date = ConditionalValueColumn( + start_date = BackupValueColumn( verbose_name="Start Date", accessor="update__start_date", - update_accessor="content_object.start_date", + backup_accessor="content_object.start_date", ) - end_date = ConditionalValueColumn( + end_date = BackupValueColumn( verbose_name="End Date", accessor="update__end_date", - update_accessor="content_object.end_date", + backup_accessor="content_object.end_date", ) class Meta(LimitedTableBase.Meta): @@ -377,8 +377,8 @@ class Meta(LimitedTableBase.Meta): class PlatformTypeChangeListTable(LimitedTableBase): - parent = ConditionalValueColumn( - verbose_name="Parent", accessor="update__parent", update_accessor="content_object.parent" + parent = BackupValueColumn( + verbose_name="Parent", accessor="update__parent", backup_accessor="content_object.parent" ) class Meta(LimitedTableBase.Meta): @@ -388,8 +388,8 @@ class Meta(LimitedTableBase.Meta): class MeasurementTypeChangeListTable(LimitedTableBase): - parent = ConditionalValueColumn( - verbose_name="Parent", accessor="update__parent", update_accessor="content_object.parent" + parent = BackupValueColumn( + verbose_name="Parent", accessor="update__parent", backup_accessor="content_object.parent" ) class Meta(LimitedTableBase.Meta): @@ -399,8 +399,8 @@ class Meta(LimitedTableBase.Meta): class MeasurementStyleChangeListTable(LimitedTableBase): - parent = ConditionalValueColumn( - verbose_name="Parent", accessor="update__parent", update_accessor="content_object.parent" + parent = BackupValueColumn( + verbose_name="Parent", accessor="update__parent", backup_accessor="content_object.parent" ) class Meta(LimitedTableBase.Meta): @@ -410,10 +410,10 @@ class Meta(LimitedTableBase.Meta): class HomeBaseChangeListTable(LimitedTableBase): - location = ConditionalValueColumn( + location = BackupValueColumn( verbose_name="Location", accessor="update__location", - update_accessor="content_object.location", + backup_accessor="content_object.location", ) class Meta(LimitedTableBase.Meta): @@ -423,8 +423,8 @@ class Meta(LimitedTableBase.Meta): class FocusAreaChangeListTable(LimitedTableBase): - url = ConditionalValueColumn( - verbose_name="Url", accessor="update__url", update_accessor="content_object.url" + url = BackupValueColumn( + verbose_name="Url", accessor="update__url", backup_accessor="content_object.url" ) class Meta(LimitedTableBase.Meta): @@ -441,10 +441,10 @@ class Meta(LimitedTableBase.Meta): class RepositoryChangeListTable(LimitedTableBase): - gcmd_uuid = ConditionalValueColumn( + gcmd_uuid = BackupValueColumn( verbose_name="GCMD UUID", accessor="update__gcmd_uuid", - update_accessor="content_object.gcmd_uuid", + backup_accessor="content_object.gcmd_uuid", ) class Meta(LimitedTableBase.Meta): @@ -456,8 +456,8 @@ class Meta(LimitedTableBase.Meta): class MeasurementRegionChangeListTable(LimitedTableBase): - example = ConditionalValueColumn( - verbose_name="Example", accessor="update__example", update_accessor="content_object.example" + example = BackupValueColumn( + verbose_name="Example", accessor="update__example", backup_accessor="content_object.example" ) class Meta(LimitedTableBase.Meta): @@ -467,8 +467,8 @@ class Meta(LimitedTableBase.Meta): class GeographicalRegionChangeListTable(LimitedTableBase): - example = ConditionalValueColumn( - verbose_name="Example", accessor="update__example", update_accessor="content_object.example" + example = BackupValueColumn( + verbose_name="Example", accessor="update__example", backup_accessor="content_object.example" ) class Meta(LimitedTableBase.Meta): @@ -478,8 +478,8 @@ class Meta(LimitedTableBase.Meta): class GeophysicalConceptChangeListTable(LimitedTableBase): - example = ConditionalValueColumn( - verbose_name="Example", accessor="update__example", update_accessor="content_object.example" + example = BackupValueColumn( + verbose_name="Example", accessor="update__example", backup_accessor="content_object.example" ) class Meta(LimitedTableBase.Meta): @@ -489,8 +489,8 @@ class Meta(LimitedTableBase.Meta): class PartnerOrgChangeListTable(LimitedTableBase): - website = ConditionalValueColumn( - verbose_name="Website", accessor="update__website", update_accessor="content_object.website" + website = BackupValueColumn( + verbose_name="Website", accessor="update__website", backup_accessor="content_object.website" ) class Meta(LimitedTableBase.Meta): @@ -520,7 +520,7 @@ class Meta(LimitedTableBase.Meta): class CampaignChangeListTable(LimitedTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="Short Name", accessor="latest_update__short_name", update_accessor="content_object.short_name", @@ -532,10 +532,10 @@ class CampaignChangeListTable(LimitedTableBase): }, ), ) - funding_agency = ConditionalValueColumn( + funding_agency = BackupValueColumn( verbose_name="Funding Agency", accessor="latest_update__funding_agency", - update_accessor="content_object.funding_agency", + backup_accessor="content_object.funding_agency", ) class Meta(LimitedTableBase.Meta): @@ -560,10 +560,10 @@ def render_short_name(self, value, record): class PlatformChangeListTable(LimitedTableBase): - platform_type = ConditionalValueColumn( + platform_type = BackupValueColumn( verbose_name="Platform Type", accessor="platform_type_name", - update_accessor="content_object.platform_type", + backup_accessor="content_object.platform_type", ) class Meta(LimitedTableBase.Meta): @@ -609,10 +609,10 @@ def render_short_name(self, value, record): # TODO: does this actually need to link to the campaign detail page? class ChangeSummaryTable(DraftTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="Short Name", accessor="update__short_name", - update_accessor="content_object.short_name", + backup_accessor="content_object.short_name", linkify=("change-update", [tables.A("uuid")]), ) content_type__model = tables.Column( @@ -644,20 +644,20 @@ class Meta: class WebsiteChangeListTable(DraftTableBase): - title = ConditionalValueColumn( + title = BackupValueColumn( verbose_name="Title", accessor="update__title", - update_accessor="content_object.title", + backup_accessor="content_object.title", linkify=("change-update", [tables.A("uuid")]), ) - url = ConditionalValueColumn( - verbose_name="URL", accessor="update__url", update_accessor="content_object.url" + url = BackupValueColumn( + verbose_name="URL", accessor="update__url", backup_accessor="content_object.url" ) website_type = ShortNamefromUUIDColumn( verbose_name="Website Type", model=WebsiteType, accessor="update__website_type", - update_accessor="content_object.website_type", + backup_accessor="content_object.website_type", ) class Meta(DraftTableBase.Meta): @@ -667,17 +667,17 @@ class Meta(DraftTableBase.Meta): class AliasChangeListTable(DraftTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="Short Name", accessor="update__short_name", - update_accessor="content_object.short_name", + backup_accessor="content_object.short_name", linkify=("change-update", [tables.A("uuid")]), ) # TODO replace model_type which short_name of related object - model_type = ConditionalValueColumn( + model_type = BackupValueColumn( verbose_name="Item Type", accessor="update__model_name", - update_accessor="content_object.model_name", + backup_accessor="content_object.model_name", ) class Meta(DraftTableBase.Meta): @@ -687,19 +687,19 @@ class Meta(DraftTableBase.Meta): class GcmdProjectChangeListTable(DraftTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="Short Name", accessor="update__short_name", - update_accessor="content_object.short_name", + backup_accessor="content_object.short_name", linkify=("change-update", [tables.A("uuid")]), ) - long_name = ConditionalValueColumn( + long_name = BackupValueColumn( verbose_name="Long Name", accessor="update__long_name", - update_accessor="content_object.long_name", + backup_accessor="content_object.long_name", ) - bucket = ConditionalValueColumn( - verbose_name="Bucket", accessor="update__bucket", update_accessor="content_object.bucket" + bucket = BackupValueColumn( + verbose_name="Bucket", accessor="update__bucket", backup_accessor="content_object.bucket" ) class Meta(DraftTableBase.Meta): @@ -709,36 +709,36 @@ class Meta(DraftTableBase.Meta): class GcmdInstrumentChangeListTable(DraftTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="Short Name", accessor="update__short_name", - update_accessor="content_object.short_name", + backup_accessor="content_object.short_name", linkify=("change-update", [tables.A("uuid")]), ) - long_name = ConditionalValueColumn( + long_name = BackupValueColumn( verbose_name="Long Name", accessor="update__long_name", - update_accessor="content_object.long_name", + backup_accessor="content_object.long_name", ) - instrument_category = ConditionalValueColumn( + instrument_category = BackupValueColumn( verbose_name="Instrument Category", accessor="update__instrument_category", - update_accessor="content_object.instrument_category", + backup_accessor="content_object.instrument_category", ) - instrument_class = ConditionalValueColumn( + instrument_class = BackupValueColumn( verbose_name="Instrument Class", accessor="update__instrument_class", - update_accessor="content_object.instrument_class", + backup_accessor="content_object.instrument_class", ) - instrument_type = ConditionalValueColumn( + instrument_type = BackupValueColumn( verbose_name="Instrument Type", accessor="update__instrument_type", - update_accessor="content_object.instrument_type", + backup_accessor="content_object.instrument_type", ) - instrument_subtype = ConditionalValueColumn( + instrument_subtype = BackupValueColumn( verbose_name="Instrument Subtype", accessor="update__instrument_subtype", - update_accessor="content_object.instrument_subtype", + backup_accessor="content_object.instrument_subtype", ) class Meta(DraftTableBase.Meta): @@ -755,21 +755,21 @@ class Meta(DraftTableBase.Meta): class GcmdPlatformChangeListTable(DraftTableBase): - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="Short Name", accessor="update__short_name", - update_accessor="content_object.short_name", + backup_accessor="content_object.short_name", linkify=("change-update", [tables.A("uuid")]), ) - long_name = ConditionalValueColumn( + long_name = BackupValueColumn( verbose_name="Long Name", accessor="update__long_name", - update_accessor="content_object.long_name", + backup_accessor="content_object.long_name", ) - category = ConditionalValueColumn( + category = BackupValueColumn( verbose_name="Category", accessor="update__category", - update_accessor="content_object.category", + backup_accessor="content_object.category", ) class Meta(DraftTableBase.Meta): @@ -779,32 +779,32 @@ class Meta(DraftTableBase.Meta): class GcmdPhenomenonChangeListTable(DraftTableBase): - variable_3 = ConditionalValueColumn( + variable_3 = BackupValueColumn( verbose_name="Variable 3", accessor="update__variable_3", - update_accessor="content_object.variable_3", + backup_accessor="content_object.variable_3", linkify=("change-update", [tables.A("uuid")]), ) - variable_2 = ConditionalValueColumn( + variable_2 = BackupValueColumn( verbose_name="Variable 2", accessor="update__variable_2", - update_accessor="content_object.variable_2", + backup_accessor="content_object.variable_2", ) - variable_1 = ConditionalValueColumn( + variable_1 = BackupValueColumn( verbose_name="Variable 1", accessor="update__variable_1", - update_accessor="content_object.variable_1", + backup_accessor="content_object.variable_1", ) - term = ConditionalValueColumn( - verbose_name="Term", accessor="update__term", update_accessor="content_object.term" + term = BackupValueColumn( + verbose_name="Term", accessor="update__term", backup_accessor="content_object.term" ) - topic = ConditionalValueColumn( - verbose_name="Topic", accessor="update__topic", update_accessor="content_object.topic" + topic = BackupValueColumn( + verbose_name="Topic", accessor="update__topic", backup_accessor="content_object.topic" ) - category = ConditionalValueColumn( + category = BackupValueColumn( verbose_name="Category", accessor="update__category", - update_accessor="content_object.category", + backup_accessor="content_object.category", ) class Meta(DraftTableBase.Meta): @@ -836,26 +836,26 @@ class GcmdSyncListTable(DraftTableBase): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - short_name = ConditionalValueColumn( + short_name = BackupValueColumn( verbose_name="GCMD Keyword", accessor="short_name", - update_accessor="content_object.short_name", + backup_accessor="content_object.short_name", linkify=("change-gcmd", [tables.A("uuid")]), ) - category = ConditionalValueColumn( + category = BackupValueColumn( verbose_name="Category", accessor="content_type__model", - update_accessor="content_type__model", + backup_accessor="content_type__model", ) - draft_action = ConditionalValueColumn( + draft_action = BackupValueColumn( verbose_name="Type of Change", accessor="action", - update_accessor="action", + backup_accessor="action", ) - status = ConditionalValueColumn( + status = BackupValueColumn( verbose_name="Status", accessor="status", - update_accessor="status", + backup_accessor="status", ) affected_records = AffectedRecordValueColumn( verbose_name="Affected Records", @@ -886,10 +886,10 @@ class Meta(DraftTableBase.Meta): class ImageChangeListTable(DraftTableBase): - title = ConditionalValueColumn( + title = BackupValueColumn( verbose_name="Title", accessor="update__title", - update_accessor="content_object.title", + backup_accessor="content_object.title", linkify=("change-update", [tables.A("uuid")]), ) From efe9f247b98562dfaf266fdb74959d8571d85edb Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Mon, 16 Oct 2023 09:36:58 -0700 Subject: [PATCH 8/9] Fix links to published-details (#585) * Fix links to published-details * Rename column to better explain purpose (#587) --- app/admin_ui/tables/published.py | 104 ++++++++++++------ .../templates/api_app/change_gcmd.html | 2 +- .../templates/api_app/change_update.html | 2 +- app/admin_ui/widgets.py | 2 +- 4 files changed, 76 insertions(+), 34 deletions(-) diff --git a/app/admin_ui/tables/published.py b/app/admin_ui/tables/published.py index f658e98ac..dbb68f9c9 100644 --- a/app/admin_ui/tables/published.py +++ b/app/admin_ui/tables/published.py @@ -47,7 +47,10 @@ class Meta: class IOPPublishedTable(tables.Table): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('IOP'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('IOP')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -70,7 +73,7 @@ class SignificantEventPublishedTable(tables.Table): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('SignificantEvent')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('SignificantEvent')), ), verbose_name="Short Name", accessor="short_name", @@ -94,7 +97,7 @@ class CollectionPeriodPublishedTable(tables.Table): deployment = ShortNamefromUUIDColumn( linkify=( "published-detail", - dict(pk=tables.A('uuid'), model=camel_to_snake('CollectionPeriod')), + dict(canonical_uuid=tables.A('uuid'), model=camel_to_snake('CollectionPeriod')), ), model=Deployment, verbose_name="Deployment", @@ -121,7 +124,10 @@ class Meta(LimitedTableBase.Meta): class DOIPublishedTable(tables.Table): concept_id = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('DOI'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('DOI')), + ), verbose_name="Concept ID", accessor="concept_id", ) @@ -149,7 +155,10 @@ class Meta(LimitedTableBase.Meta): class DeploymentPublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Deployment'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('Deployment')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -170,7 +179,7 @@ class PlatformTypePublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('PlatformType')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('PlatformType')), ), verbose_name="Short Name", accessor="short_name", @@ -187,7 +196,7 @@ class MeasurementTypePublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('MeasurementType')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('MeasurementType')), ), verbose_name="Short Name", accessor="short_name", @@ -204,7 +213,7 @@ class MeasurementStylePublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('MeasurementStyle')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('MeasurementStyle')), ), verbose_name="Short Name", accessor="short_name", @@ -219,7 +228,10 @@ class Meta(LimitedTableBase.Meta): class HomeBasePublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('HomeBase'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('HomeBase')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -233,7 +245,10 @@ class Meta(LimitedTableBase.Meta): class FocusAreaPublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('FocusArea'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('FocusArea')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -247,7 +262,10 @@ class Meta(LimitedTableBase.Meta): class SeasonPublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Season'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('Season')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -261,7 +279,10 @@ class Meta(LimitedTableBase.Meta): class RepositoryPublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Repository'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('Repository')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -277,16 +298,18 @@ class MeasurementRegionPublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('MeasurementRegion')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('MeasurementRegion')), ), verbose_name="Short Name", accessor="short_name", ) example = tables.Column(verbose_name="Example", accessor="example") - example = tables.Column(verbose_name="Example", accessor="example") class Meta(LimitedTableBase.Meta): - fields = LimitedTableBase.initial_fields + ("example",) + fields = ( + *LimitedTableBase.initial_fields, + "example", + ) sequence = fields model = MeasurementRegion @@ -295,13 +318,12 @@ class GeographicalRegionPublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('GeographicalRegion')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('GeographicalRegion')), ), verbose_name="Short Name", accessor="short_name", ) example = tables.Column(verbose_name="Example", accessor="example") - example = tables.Column(verbose_name="Example", accessor="example") class Meta(LimitedTableBase.Meta): fields = LimitedTableBase.initial_fields + ("example",) @@ -313,13 +335,12 @@ class GeophysicalConceptPublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('GeophysicalConcept')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('GeophysicalConcept')), ), verbose_name="Short Name", accessor="short_name", ) example = tables.Column(verbose_name="Example", accessor="example") - example = tables.Column(verbose_name="Example", accessor="example") class Meta(LimitedTableBase.Meta): fields = LimitedTableBase.initial_fields + ("example",) @@ -329,7 +350,10 @@ class Meta(LimitedTableBase.Meta): class PartnerOrgPublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('PartnerOrg'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('PartnerOrg')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -345,7 +369,7 @@ class WebsiteTypePublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('WebsiteType')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('WebsiteType')), ), verbose_name="Short Name", accessor="short_name", @@ -360,7 +384,10 @@ class Meta(LimitedTableBase.Meta): class CampaignPublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Campaign'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('Campaign')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -374,7 +401,10 @@ class Meta(LimitedTableBase.Meta): class PlatformPublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Platform'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('Platform')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -388,7 +418,10 @@ class Meta(LimitedTableBase.Meta): class InstrumentPublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Instrument'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('Instrument')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -402,7 +435,10 @@ class Meta(LimitedTableBase.Meta): class WebsitePublishedTable(tables.Table): title = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Website'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('Website')), + ), verbose_name="Title", accessor="title", ) @@ -417,7 +453,10 @@ class Meta(LimitedTableBase.Meta): class AliasPublishedTable(LimitedTableBase): short_name = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Alias'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('Alias')), + ), verbose_name="Short Name", accessor="short_name", ) @@ -434,7 +473,7 @@ class GcmdProjectPublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('GcmdProject')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('GcmdProject')), ), verbose_name="Short Name", accessor="short_name", @@ -451,7 +490,7 @@ class GcmdInstrumentPublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('GcmdInstrument')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('GcmdInstrument')), ), verbose_name="Short Name", accessor="short_name", @@ -482,7 +521,7 @@ class GcmdPlatformPublishedTable(LimitedTableBase): short_name = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('GcmdPlatform')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('GcmdPlatform')), ), verbose_name="Short Name", accessor="short_name", @@ -499,7 +538,7 @@ class GcmdPhenomenonPublishedTable(tables.Table): variable_3 = BackupValueColumn( linkify=( "published-detail", - dict(pk=tables.A("uuid"), model=camel_to_snake('GcmdPhenomenon')), + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('GcmdPhenomenon')), ), verbose_name="Variable 3", accessor="variable_3", @@ -518,7 +557,10 @@ class Meta(LimitedTableBase.Meta): class ImagePublishedTable(tables.Table): title = BackupValueColumn( - linkify=("published-detail", dict(pk=tables.A("uuid"), model=camel_to_snake('Image'))), + linkify=( + "published-detail", + dict(canonical_uuid=tables.A("uuid"), model=camel_to_snake('Image')), + ), verbose_name="Title", accessor="title", ) diff --git a/app/admin_ui/templates/api_app/change_gcmd.html b/app/admin_ui/templates/api_app/change_gcmd.html index 73cbb7799..3b338dc1e 100644 --- a/app/admin_ui/templates/api_app/change_gcmd.html +++ b/app/admin_ui/templates/api_app/change_gcmd.html @@ -60,7 +60,7 @@

    Activity

    {% for record in affected_records %} - {{record.row.short_name}} + {{record.row.short_name}} {{record.category}} {{record.status}} diff --git a/app/admin_ui/templates/api_app/change_update.html b/app/admin_ui/templates/api_app/change_update.html index 21869074c..ffd2bdd07 100644 --- a/app/admin_ui/templates/api_app/change_update.html +++ b/app/admin_ui/templates/api_app/change_update.html @@ -11,7 +11,7 @@
    View published version diff --git a/app/admin_ui/widgets.py b/app/admin_ui/widgets.py index d93c7dec2..47e01b259 100644 --- a/app/admin_ui/widgets.py +++ b/app/admin_ui/widgets.py @@ -122,7 +122,7 @@ def render(self, name, value, *args, **kwargs): published_url = reverse( "published-detail", kwargs={ - "pk": published.pk, + "canonical_uuid": published.pk, "model": camel_to_snake(self.model._meta.object_name), }, ) From 4ccf2db0e1d4ff41c9f7cb1e5d257aea231e28ca Mon Sep 17 00:00:00 2001 From: Anthony Lukach Date: Mon, 16 Oct 2023 09:53:25 -0700 Subject: [PATCH 9/9] Render draft action rather than approval log action (#582) * Render draft action rather than approval log action * Simplify --- app/admin_ui/tables/tables.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/admin_ui/tables/tables.py b/app/admin_ui/tables/tables.py index 4eaa9b94a..e84f78b06 100644 --- a/app/admin_ui/tables/tables.py +++ b/app/admin_ui/tables/tables.py @@ -914,13 +914,14 @@ def render_short_name(self, value, record): # This table renders a list of historical drafts class DraftHistoryTable(tables.Table): - draft_action = tables.Column(empty_values=()) + draft_action = tables.Column(accessor=tables.A('action')) submitted_by = tables.Column(empty_values=()) reviewed_by = tables.Column(empty_values=()) published_by = tables.Column(empty_values=()) published_date = tables.Column(empty_values=()) uuid = tables.Column( + verbose_name="UUID", linkify=( lambda record: reverse( "historical-detail", @@ -939,12 +940,6 @@ class Meta: fields = ("uuid", "submitted_by") orderable = False - def render_draft_action(self, record): - if approval := record.approvallog_set.first(): - return approval.get_action_display() - else: - return "-" - def render_submitted_by(self, record): if approval := record.approvallog_set.filter(action=ApprovalLog.Actions.PUBLISH).first(): return approval.user.username