big merge in of django-councilmatic views and functionality #392

derekeder · 2023-12-15T22:54:02Z

Switches to the minimal branch of django-councilmatic which only contains models.

This PR brings in the pieces we had in django-councilmatic views, templates and static assets

Also made a few other updates:

removed unused widget templates
fixed a style issue showing a double overflow scrolls for PDF viewer
setting context variables in templates that were being covered by councilmatic_core.views.city_context that was removed
shortened view names
consolidated the councilmatic and chicago directories into just the chicago directory

Issues:

derekeder · 2023-12-18T23:27:04Z

working on getting the search form working again. i believe because we merged our haystack_indexes into one file, the stored index on the live site is no longer valid and is returning this error:

Text fields are not optimised for operations that require per-document field data like aggregations and sorting, so these operations are disabled by default. Please use a keyword field instead. Alternatively, set fielddata=true on [bill_type] in order to load field data by uninverting the inverted index. Note that this can use significant memory.

Scraping some local bills and testing rebuilding the index locally

… viewer

derekeder · 2023-12-19T21:49:57Z

@fgregg ok search issues are resolved. we didn't have to rebuild the index after all. haystack was expecting the SearchIndex to be defined in search_indexes.py so renaming the file resolved it.

This is ready for your review.

derekeder · 2023-12-19T21:50:52Z

chicago/search_indexes.py

-    # faceted = True creates a keyword field instead of a text field for full
-    # text searches. By default, text fields cannot be used for faceting or
-    # sorting in ElasticSearch.
+class BillIndex(indexes.SearchIndex, indexes.Indexable):


merged with django-councilmatic's haystack-indexes.py

derekeder · 2023-12-19T21:51:55Z

chicago/settings.py

@@ -123,14 +123,13 @@
                "django.template.context_processors.request",
                "django.contrib.auth.context_processors.auth",
                "django.contrib.messages.context_processors.messages",
-                "councilmatic_core.views.city_context",


this context allowed for a number of settings variables to be universally available in templates. we are now adding them to each view context as needed

derekeder · 2023-12-19T21:52:15Z

chicago/settings.py

@@ -344,12 +334,6 @@
    "committee-on-zoning-landmarks-and-building-standards": "The Committee on Zoning, Landmarks and Building Standards shall have jurisdiction over all zoning matters and the operation of the Zoning Board of Appeals and the office of the Zoning Administrator; land use policy generally and land use recommendations of the Chicago Plan Commission and the Department of Planning and Development; building code ordinances and matters generally affecting the Department of Buildings; and designation, maintenance and preservation of historical and architectural landmarks. The Committee shall work in cooperation with those public and private organizations similarly engaged in matters affecting landmarks.",  # noqa
 }

-ABOUT_BLURBS = {


setting these in the templates themselves

derekeder · 2023-12-19T21:53:18Z

chicago/templatetags/extras.py

@@ -0,0 +1,209 @@
+from django import template


merged with chicago_extras.py

derekeder · 2023-12-19T21:59:16Z

chicago/static/css/viewer.css

@@ -178,7 +179,7 @@ html {
 }

 body {
-  height: 100%;
+  height: 99%;


this is the only substantive change here - lowering this prevents two overflow scroll bars from showing. all other changes are from eslint

fgregg · 2023-12-20T16:57:33Z

scripts/release.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 set -euo pipefail

-python manage.py migrate --noinput


don't we want these things to happen if there is a database?

maybe i could come up with a better variable, but i want to add a flag just to the review apps and have it skip these steps if present, otherwise do the normal release procedure.

i removed these for now to make sure i don't mess up the live database before i'm confident in the logic

we're now using the presence of a PRODUCTION env variable to determine if we run the management commands or not.

if [ -n "${PRODUCTION}" ]; then

fgregg · 2023-12-20T17:00:44Z

chicago/feeds.py

-class ChicagoBillDetailActionFeed(BillDetailActionFeed):
-    title_template = "feeds/chicago_bill_actions_item_title.html"
+
+class ChicagoCouncilmaticFacetedSearchFeed(Feed):


one thing that might be nice to do is simplify out class names.

This could just be FacetedSearchFeed since there's no other classes out there we need to worry about colliding with.

This is a pervasive change, but it might be nice to go ahead and do now?

fgregg

I clicked around and it looks good to me!

derekeder · 2023-12-20T18:10:04Z

ok lets bring it in!

sentry-io · 2023-12-22T16:58:22Z

Suspect Issues

This pull request was deployed and Sentry observed the following issues:

‼️ AttributeError: 'datetime.date' object has no attribute 'tzinfo' /person/{slug}/rss/ View Issue

_{Did you find this useful? React with a 👍 or 👎}

derekeder added 2 commits December 15, 2023 16:51

big merge in of django-councilmatic views and functionality

e362451

fiddling with haystack_indexes

760ebd8

derekeder added 3 commits December 19, 2023 14:37

moved haystack searchindex to search_indexes.py

46039b8

remove unused widget templates

fd0d688

remove broken upcoming events from bill detail, style updates for pdf…

5ef0798

… viewer

derekeder mentioned this pull request Dec 19, 2023

Remove django councilmatic views #368

Closed

derekeder commented Dec 19, 2023

View reviewed changes

chicago/templatetags/extras.py

@@ -0,0 +1,209 @@

from django import template

Copy link

Member Author

derekeder Dec 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merged with chicago_extras.py

derekeder requested a review from fgregg December 19, 2023 21:56

derekeder commented Dec 19, 2023

View reviewed changes

derekeder requested a deployment to chi-councilm-minimal-y64murymy December 20, 2023 15:49 Abandoned

setup for review app using production database

a6040b6

derekeder temporarily deployed to chi-councilm-minimal-y64murymy December 20, 2023 15:50 Inactive

derekeder temporarily deployed to chi-councilm-minimal-hsfjmr7ln December 20, 2023 15:52 Inactive

logic for NO_DATABASE env var

9d5c63b

derekeder temporarily deployed to chi-councilm-minimal-p5oxtlnhj December 20, 2023 16:44 Inactive

more release debugging, added import shapes command

0c146f5

derekeder temporarily deployed to chi-councilm-minimal-p5oxtlnhj December 20, 2023 16:58 Inactive

fgregg suggested changes Dec 20, 2023

View reviewed changes

fgregg reviewed Dec 20, 2023

View reviewed changes

logic backwards

46b6a16

derekeder temporarily deployed to chi-councilm-minimal-p5oxtlnhj December 20, 2023 17:03 Inactive

using PRODUCTION env variable for release script

0fb4613

derekeder temporarily deployed to chi-councilm-minimal-p5oxtlnhj December 20, 2023 17:45 Inactive

derekeder added 2 commits December 20, 2023 11:57

shorten view names

d0018e8

tell heroku to reference chicago

f1330e8

derekeder temporarily deployed to chi-councilm-minimal-p5oxtlnhj December 20, 2023 17:59 Inactive

fgregg approved these changes Dec 20, 2023

View reviewed changes

derekeder merged commit cb61909 into main Dec 20, 2023
1 check passed

derekeder mentioned this pull request Jan 19, 2024

fix rss for search, removed CITY_VOCAB references #404

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

big merge in of django-councilmatic views and functionality #392

big merge in of django-councilmatic views and functionality #392

derekeder commented Dec 15, 2023 •

edited by fgregg

Loading

derekeder commented Dec 18, 2023

derekeder commented Dec 19, 2023 •

edited

Loading

derekeder Dec 19, 2023

derekeder Dec 19, 2023 •

edited

Loading

derekeder Dec 19, 2023

derekeder Dec 19, 2023

derekeder Dec 19, 2023

fgregg Dec 20, 2023

derekeder Dec 20, 2023

derekeder Dec 20, 2023

fgregg Dec 20, 2023

fgregg left a comment

derekeder commented Dec 20, 2023

sentry-io bot commented Dec 22, 2023

big merge in of django-councilmatic views and functionality #392

big merge in of django-councilmatic views and functionality #392

Conversation

derekeder commented Dec 15, 2023 • edited by fgregg Loading

derekeder commented Dec 18, 2023

derekeder commented Dec 19, 2023 • edited Loading

Choose a reason for hiding this comment

derekeder Dec 19, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fgregg left a comment

Choose a reason for hiding this comment

derekeder commented Dec 20, 2023

sentry-io bot commented Dec 22, 2023

Suspect Issues

derekeder commented Dec 15, 2023 •

edited by fgregg

Loading

derekeder commented Dec 19, 2023 •

edited

Loading

derekeder Dec 19, 2023 •

edited

Loading