Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix initiative page static ransack filter links #11329

Merged
merged 1 commit into from Aug 8, 2023

Conversation

ahukkanen
Copy link
Contributor

馃帺 What? Why?

After backporting #11182, I noticed a couple of places where we still have incorrect filter parameters after the ransack change.

This does not need to be backported because the templates have changed and the related templates were already fixed by the backport PR #11248.

馃搶 Related Issues

Link your PR to an issue

Testing

  • Make sure at least one initiative type has areas enabled
  • Make sure you have open initiatives with areas
  • Go to the initiative page (which has an area)
  • Test that the area filter link in the sidebar works
  • Test that the type filter in the sidebar works

@ahukkanen ahukkanen added module: initiatives type: fix PRs that implement a fix for a bug no-backport Pull Requests that should not be backported labels Jul 24, 2023
@ahukkanen ahukkanen requested a review from a team July 26, 2023 09:19
@alecslupu alecslupu self-assigned this Aug 7, 2023
Copy link
Contributor

@alecslupu alecslupu left a comment

Choose a reason for hiding this comment

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

LGTM

@alecslupu alecslupu merged commit f86a57a into develop Aug 8, 2023
34 checks passed
@alecslupu alecslupu deleted the fix/initiatives-ransack-filters branch August 8, 2023 09:00
alecslupu added a commit to tremend-cofe/decidim that referenced this pull request Aug 10, 2023
* Redesign: rename tests (decidim#11184)

* Remove skip_unless_redesing_enabled calls in tests

* Remove redesign_helpers for tests

* Unskip and adapt REDESIGN_PENDING examples

* Remove deprecated examples

* Allow to configure the default header level of attributes titles in diff cell

* Ensure accessibility of h in collaborative draft show

* Recover accessibility tests in proposals

* Remove comments

* Unskip and adapt test

* Fix expected text of link in test

* Remove check for removed follow actions in participatory text index

* Unskip tests

* Unskip and adapt to vote proposal tests

* Remove deprecated methods

* Remove deprecations in tests

* Remove collaborative drafts and proposals deprecated m cells

* Adapt proposal m cell cache hash to l cell

* Adapt proposal m-cell specs to l-cell

* Replace use of proposal_m card

* Remove condition on redesign from test

* Rename shared examples for attachments to not use redesign term

* Remove tests for CTA behavior deprecated in processes card-g

* Avoid duplicated ids of highlighted participatory process in menu breadcrumb

* Recover skipped examples

* Recover accessibility tests in participatory processes

* Remove participatory process description specs and include expected contents with metadata content block enabled

* Unskip REDESIGN_PENDING tests

* Move common statistics cells tests to shared examples

* Remove unused process metadata item

* Remove deprecated proceses m card and add tests for l and g cards

* Remove deprecated process group m card cell

* Recover tests after redesign in initiatives

* Remove skipped deprecated tests

* Remove assemblies description page test and move examples to show page with appropriate content blocks

* Remove assembly m card and related tests

* Unskip tests after completing redesing

* Adapt sorting test to redesigned interface

* Remove deprecated sorting tests because the redesigned interface prevents incomplete sortings

* Unskip tests

* Remove post m card cell

* Remove reference to redesign from test

* Remove comment m card

* Unskip accessibility test in debates versions

* Remove deprecated test

* Remove deprecated comments about redesign

* Remove deprecated test

The proposals card-l does not show the supports count in the metadata,
so there is no difference when supports are enabled on proposals
component or not

* Remove useless reference to redesign in test

* Remove REDESIGN_PENDING comment: do not use card-l cell for media links

* Remove REDESIGN_PENDING comments

* Remove unused partial

* Unskip tests

* Remove conference m card cell

* Adapt authorizations tests to redesign

* Remove deprecated tests

* Avoid errors in upload modal when file validation fails

* Unskip tests

* Remove deprecated test

* Remove REDESIGN_PENDING comments

* Update map styles in proposals

* Uncomment tests

* Uncomment and adapt selector in tests

* Remove reference to redesign

* Fix linter offense

* Remove obsolete brakeman skip and update other in proposals

* Remove unused translations and add some wizards keys to ignore unused

* Update expected url in activity cell with comments activities

* Increase header levels in version cell to include h1

* Recover missing data attribute in hero content block

* Fix coordinates update in add_proposal js

* Hide map only if there is no address with coordinates

* Empty address field before changing it in test

* Add issue reference to skipped tests

* Display replies on deleted comments and keep then with AJAX deletion refresh

* Unskip test

* Update decidim-core/app/cells/decidim/version/show.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Use h2 tag

* Move shared examples require to core

* Replace actions with method doing the same

* Fix test

* Remove references to redesign in shared examples

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Redesign: refactor the scope of the main Javascript initializer (decidim#11317)

* set the scope of all functions that are initialized at startup

* scope the datepicker as well

* remove precated js stuff (testing)

* fix lint & place accordingly the initializations

* Redesign: deprecate foundation-datepicker from public site (decidim#11420)

* deprecate foundation-datepicker public site

* fix core tests

* fix datepicker tests

* fix lint and rubocop

* replace now with current

* fix tests

* fix more tests

* fix tests

* remove byebugs

* Redesign: don't submit forms on modal's cancel

* Update documentation for here map configuration (decidim#11447)

* Two-columns layout fix (decidim#11400)

* Column conversations fix

* suggested changes added to &__aside

* &__main updated

* Changes made to span on &__main

* test

* spacing cli test

* Disabler for pointer events (decidim#11449)

* Added a disabler for pointer event

* Improved workaround for the tabs +1

* Indentation line 19

* Fix test component (decidim#11436)

* Fix label position on report button (decidim#11435)

* Fix pipeline after decidim#11449 (decidim#11455)

* Upgrade postgres from 11 to 14 (decidim#11453)

* Fix initiatives ransack filters (decidim#11329)

* Revert "Lock ChromeDriver to the latest working version (decidim#11391)" (decidim#11458)

This reverts commit 2450714.

* Force capital starting letter for PR titles (decidim#11457)

* Force capital starting letter for PR titles

* Force the starting character to be capitalized

* Allow disabling password expiration (decidim#11135)

* Allow disabling password expiration

NIST does not recommend expiring passwords:
https://pages.nist.gov/800-63-FAQ/#q-b05

* Add documentation about the new option

* Fix linter

* Fix linter

* Fix autocomplete result list duplicates (decidim#11442)

* Fix autocomplete user group duplication / Add system test

* Fix test

* Redesign: organization colors (decidim#11451)

* refactor the organization colors

* typo

* remove specs about them_color input

* fix specs

* use old red for testing

* set the default redesign colors to the organization factory (color-contrast)

* replace the uses of legacy primary color

* Redesign: axe accessibility issues (decidim#11403)

* dropdown card does not require an id

* add aria-label to progress bar

* disable dropdown for desktop navigation

* Refactor the use of filter_text_for to be in views instead of helpers

* Allow passing an id to filter_text_for method

* remove element_id (testing)

* pass the id to the label

* distinguish filters and order controls

* distinguish all uses of dropdown-menus

* rename control

* don't use a list when you need divs

* disable dropdown for desktop navigation

* update code for emoji

* remove ids from tests

* fix core tests

* fix election tests

* fix tests

* remove profile__user-role class

* remove needless aria-attribute

* remove duplicated ids

* empty merge

* Include alternative title for images when there's nothing but the title

* disable dropdown for desktop

* add alt text to default image

* user profile must not be an h5

* duplicate_id and copy button SR text

* fix odd layout for edit initiative

* redesign committee requests form

* fix a11y issue on budgets project list

* mark layout item header al role=complementary since it's outside

* do not expand elements if the page has very few contents

* fix a11y issue on debates, sortitions and forms

* fix rubocop

* fix erblint

* use the units as the aria-label

* standarize arias for progress bars

* initiatives style glitch

---------

Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com>

* Integrate Bullet in decidim-dev (decidim#11416)

* Initial commit on bullet integration

* remove uneeded condition

* Disable failing actions

* Disable failing workflows

* Disable all the workflows

* Refactor actions

* Revert generator change

* Redesign: comment button (decidim#11461)

* render the comment button depending of the settings

* enhance condition: initiatives is not a component

* handle comments_blocked? in case of null

* fix offenses

* refactor duplicated views (decidim#11459)

* Redesign: remove the item itself from nav menu (decidim#11452)

* remove the item itself from nav menu

* fix i18n

* fix specs

* fix specs

* Refactor Decidim jobs to inherit from Decidim::ApplicationJob (decidim#11468)

* Add Initiatives to antispam

* Add initiatives specs

---------

Co-authored-by: Eduardo Mart铆nez <eduardomech@gmail.com>
Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com>
Co-authored-by: Sina Eftekhar <104360479+sinaeftekhar@users.noreply.github.com>
Co-authored-by: Tom <101816158+greenwoodt@users.noreply.github.com>
Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
Co-authored-by: Carlo Beltrame <carlo@beltra.me>
Co-authored-by: JoonasAapro <110532525+JoonasAapro@users.noreply.github.com>
fblupi added a commit to Platoniq/decidim that referenced this pull request Aug 25, 2023
* Redesign: counteract the hover effects of the dropdown (decidim#11253)

* hack to counteract the hover effects of the dropdown

* keep menu unreachable onload

* due to a bug in Chrome, move the inline events to script tags

more info: https://bugs.chromium.org/p/chromium/issues/detail?id=868224&q=ontransitionend&colspe[%E2%80%A6]Block%20Component%20Status%20Owner%20Summary%20OS%20Modified

* fix spelling

* extract script to separate file

* restore removed element

* fix spelling

* trigger manually dropdown controller on hover parent

* move onmouseenter only to link

* handle dropdowns only via css animation

* no longer required

* fix styles

* disable animations on page load

* fix tests

* fix syntax

* Filter parameters details (decidim#11418)

* Tiny typo fix (decidim#11428)

* Redesign: rename tests (decidim#11184)

* Remove skip_unless_redesing_enabled calls in tests

* Remove redesign_helpers for tests

* Unskip and adapt REDESIGN_PENDING examples

* Remove deprecated examples

* Allow to configure the default header level of attributes titles in diff cell

* Ensure accessibility of h in collaborative draft show

* Recover accessibility tests in proposals

* Remove comments

* Unskip and adapt test

* Fix expected text of link in test

* Remove check for removed follow actions in participatory text index

* Unskip tests

* Unskip and adapt to vote proposal tests

* Remove deprecated methods

* Remove deprecations in tests

* Remove collaborative drafts and proposals deprecated m cells

* Adapt proposal m cell cache hash to l cell

* Adapt proposal m-cell specs to l-cell

* Replace use of proposal_m card

* Remove condition on redesign from test

* Rename shared examples for attachments to not use redesign term

* Remove tests for CTA behavior deprecated in processes card-g

* Avoid duplicated ids of highlighted participatory process in menu breadcrumb

* Recover skipped examples

* Recover accessibility tests in participatory processes

* Remove participatory process description specs and include expected contents with metadata content block enabled

* Unskip REDESIGN_PENDING tests

* Move common statistics cells tests to shared examples

* Remove unused process metadata item

* Remove deprecated proceses m card and add tests for l and g cards

* Remove deprecated process group m card cell

* Recover tests after redesign in initiatives

* Remove skipped deprecated tests

* Remove assemblies description page test and move examples to show page with appropriate content blocks

* Remove assembly m card and related tests

* Unskip tests after completing redesing

* Adapt sorting test to redesigned interface

* Remove deprecated sorting tests because the redesigned interface prevents incomplete sortings

* Unskip tests

* Remove post m card cell

* Remove reference to redesign from test

* Remove comment m card

* Unskip accessibility test in debates versions

* Remove deprecated test

* Remove deprecated comments about redesign

* Remove deprecated test

The proposals card-l does not show the supports count in the metadata,
so there is no difference when supports are enabled on proposals
component or not

* Remove useless reference to redesign in test

* Remove REDESIGN_PENDING comment: do not use card-l cell for media links

* Remove REDESIGN_PENDING comments

* Remove unused partial

* Unskip tests

* Remove conference m card cell

* Adapt authorizations tests to redesign

* Remove deprecated tests

* Avoid errors in upload modal when file validation fails

* Unskip tests

* Remove deprecated test

* Remove REDESIGN_PENDING comments

* Update map styles in proposals

* Uncomment tests

* Uncomment and adapt selector in tests

* Remove reference to redesign

* Fix linter offense

* Remove obsolete brakeman skip and update other in proposals

* Remove unused translations and add some wizards keys to ignore unused

* Update expected url in activity cell with comments activities

* Increase header levels in version cell to include h1

* Recover missing data attribute in hero content block

* Fix coordinates update in add_proposal js

* Hide map only if there is no address with coordinates

* Empty address field before changing it in test

* Add issue reference to skipped tests

* Display replies on deleted comments and keep then with AJAX deletion refresh

* Unskip test

* Update decidim-core/app/cells/decidim/version/show.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Use h2 tag

* Move shared examples require to core

* Replace actions with method doing the same

* Fix test

* Remove references to redesign in shared examples

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Redesign: refactor the scope of the main Javascript initializer (decidim#11317)

* set the scope of all functions that are initialized at startup

* scope the datepicker as well

* remove precated js stuff (testing)

* fix lint & place accordingly the initializations

* Redesign: deprecate foundation-datepicker from public site (decidim#11420)

* deprecate foundation-datepicker public site

* fix core tests

* fix datepicker tests

* fix lint and rubocop

* replace now with current

* fix tests

* fix more tests

* fix tests

* remove byebugs

* Redesign: don't submit forms on modal's cancel

* Update documentation for here map configuration (decidim#11447)

* Two-columns layout fix (decidim#11400)

* Column conversations fix

* suggested changes added to &__aside

* &__main updated

* Changes made to span on &__main

* test

* spacing cli test

* Disabler for pointer events (decidim#11449)

* Added a disabler for pointer event

* Improved workaround for the tabs +1

* Indentation line 19

* Fix test component (decidim#11436)

* Fix label position on report button (decidim#11435)

* Fix pipeline after decidim#11449 (decidim#11455)

* Upgrade postgres from 11 to 14 (decidim#11453)

* Fix initiatives ransack filters (decidim#11329)

* Revert "Lock ChromeDriver to the latest working version (decidim#11391)" (decidim#11458)

This reverts commit 2450714.

* Force capital starting letter for PR titles (decidim#11457)

* Force capital starting letter for PR titles

* Force the starting character to be capitalized

* Allow disabling password expiration (decidim#11135)

* Allow disabling password expiration

NIST does not recommend expiring passwords:
https://pages.nist.gov/800-63-FAQ/#q-b05

* Add documentation about the new option

* Fix linter

* Fix linter

* Fix autocomplete result list duplicates (decidim#11442)

* Fix autocomplete user group duplication / Add system test

* Fix test

* Redesign: organization colors (decidim#11451)

* refactor the organization colors

* typo

* remove specs about them_color input

* fix specs

* use old red for testing

* set the default redesign colors to the organization factory (color-contrast)

* replace the uses of legacy primary color

* Redesign: axe accessibility issues (decidim#11403)

* dropdown card does not require an id

* add aria-label to progress bar

* disable dropdown for desktop navigation

* Refactor the use of filter_text_for to be in views instead of helpers

* Allow passing an id to filter_text_for method

* remove element_id (testing)

* pass the id to the label

* distinguish filters and order controls

* distinguish all uses of dropdown-menus

* rename control

* don't use a list when you need divs

* disable dropdown for desktop navigation

* update code for emoji

* remove ids from tests

* fix core tests

* fix election tests

* fix tests

* remove profile__user-role class

* remove needless aria-attribute

* remove duplicated ids

* empty merge

* Include alternative title for images when there's nothing but the title

* disable dropdown for desktop

* add alt text to default image

* user profile must not be an h5

* duplicate_id and copy button SR text

* fix odd layout for edit initiative

* redesign committee requests form

* fix a11y issue on budgets project list

* mark layout item header al role=complementary since it's outside

* do not expand elements if the page has very few contents

* fix a11y issue on debates, sortitions and forms

* fix rubocop

* fix erblint

* use the units as the aria-label

* standarize arias for progress bars

* initiatives style glitch

---------

Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com>

* Integrate Bullet in decidim-dev (decidim#11416)

* Initial commit on bullet integration

* remove uneeded condition

* Disable failing actions

* Disable failing workflows

* Disable all the workflows

* Refactor actions

* Revert generator change

* Redesign: comment button (decidim#11461)

* render the comment button depending of the settings

* enhance condition: initiatives is not a component

* handle comments_blocked? in case of null

* fix offenses

* refactor duplicated views (decidim#11459)

* Redesign: remove the item itself from nav menu (decidim#11452)

* remove the item itself from nav menu

* fix i18n

* fix specs

* fix specs

* Refactor Decidim jobs to inherit from Decidim::ApplicationJob (decidim#11468)

* overwrite dropdown defaults for tablet size (decidim#11479)

* Fix ambiguous id column on projects query (decidim#11474)

* Redesign: resource metadata (decidim#11463)

* make every resource metadata equal

* remove any reference to "drawer"

* typo

* slightly different initiative layout

* Redesign: display alert when no projects (decidim#11480)

* display alert when no projects

* normalize locals

* Redesign: system (decidim#11478)

* prepare assets and login page

* responsive sidebar system

* organization forms

* refactor organization forms

* password forms

* admins forms

* oauth forms

* fix typo

* fix specs and required update modal

* fix lint

* fix lint

* update test settings

* avoid aside to expand

* remove deprecated styles

* Fix persistance of the area in initiative creation (decidim#11476)

* Lock TipTap editor to ~2.0.3 (decidim#11492)

* Redesign: consolidate 2-col layout (decidim#11426)

* spacing for participatory_processes, proposals, collaborative drafts, participatory texts and component announcement

* spacing for sortitions, elections, meetings and fixes over proposals

* spacing for assemblies and fixes over participatory spaces

* fix tests

* spacing for core

* spacing for conferences, blogs and accountability. Fixes over conversations

* aside heading responsive and spacig for budgets

* spacing for projects, debates and initiatives

* fix initiative specs

* fix proposals specs

* fix specs

* missing space for collaborative drafts

* avoid overwritting css rule du to tailwind directive

* missing class

* avoid weird space around the span

* missing condition

* Encode non-ASCII characters on external links (decidim#11472)

* Encode non-ASCII characters on external links

* Lint

* Apply suggestions

* Fix weird behavior with votes in comments (decidim#11490)

* Fix weird behavior with votes in comments

* Fix flaky test

* Update remixicon to 3.5.0 (decidim#11494)

* Replace close text with icon in order to enlarge it (decidim#11487)

* Remove deprecated views & translations (decidim#11488)

* Incorrect component link generation (decidim#11432)

* Fix SEO routing issue for components index

* Add tests for the redirects

* Fix failing tests

* Fix failing specs

* Fix all failing tests

* Fix linting error

* default gray (non-text contrast) (decidim#11502)

* Highlight the toggle contrast (decidim#11506)

* Allow tabbing on mobile devices (decidim#11501)

* Redesign: finish create-initiative step (decidim#11493)

* simplify the finish create-initiative step

* restore original condition

* Fix the length of edit button in proposals (decidim#11497)

* Fix wrong 'no activity' text on last activities page (decidim#11496)

* Fix wrong 'no activity' text on last activities page

* Fix failing spec

* Redesign: meetings code icon (decidim#11486)

* replace qr code icon with another related

* change icon

* Redesign: highlight links on hover (decidim#11508)

* hightlight links on hover

* highlight footer links

* distinguisable link banner

* place "skip to content" the first thing of all

* Focus styles (decidim#11509)

* Redesign: semantic datetimes (decidim#11513)

* include datetime semantically

* calendar a11y

* ignore missing translation

* Make visible the skip map option (decidim#11515)

* Render partner without any link if it's not configured (decidim#11512)

* Show different text for the Register CTA when the user is already registered (decidim#11511)

* Show different text for the Register CTA when the user is already registered

* Change two more buttons

* Normalize i18n

* Don't show initiative state field instead of showing it disabled (decidim#11518)

* Don't show initiative state field instead of showing it disabled

* Don't show the field in the edit form neither

* Add tests

* Lint files

* Update decidim-initiatives/app/views/decidim/initiatives/initiatives/_form.html.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Display special characters in breadcrumb menu (decidim#11514)

---------

Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com>
Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Co-authored-by: Ruth Cheesley <ruth@ruthcheesley.co.uk>
Co-authored-by: Eduardo Mart铆nez <eduardomech@gmail.com>
Co-authored-by: Sina Eftekhar <104360479+sinaeftekhar@users.noreply.github.com>
Co-authored-by: Tom <101816158+greenwoodt@users.noreply.github.com>
Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
Co-authored-by: Carlo Beltrame <carlo@beltra.me>
Co-authored-by: JoonasAapro <110532525+JoonasAapro@users.noreply.github.com>
Co-authored-by: Fran Bol铆var <francisco.bolivar@nazaries.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
module: initiatives no-backport Pull Requests that should not be backported type: fix PRs that implement a fix for a bug
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

2 participants