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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to 0.28 #270

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

Upgrade to 0.28 #270

wants to merge 23 commits into from

Conversation

microstudi
Copy link
Contributor

@microstudi microstudi commented Feb 8, 2024 •
edited

This PR will stay in draft until all the awesome features are properly working with decidim 0.28.

As this is a collaborative effort, all 0.28 upgrade PR should start and point to this branch (develop). Once we have all of them working, we will merge to main.

Call for collaboration: if you see capable of fixing one of the issues, please leave a comment and open a PR against this branch. We will assign you to it.
Note that we have a staging Decidim to track the progress, feel free to register (leave a comment here if you want admin acces): https://decidim-awesome.dev.pokecode.net/

List of pending tasks (might not be exhaustive):

Transversal tasks

fixes #251 #257

@entantoencuanto @Crashillo @microstudi
Upgrade to 0.28 - Initial adaptation (#253)
7b356fe 
* Set decidim version to use develop branch

* Update js dependencies

* Move ProposalMCellOverride to ProposalLCellOverride

* Define set_component_breadcrumb_item in blank_component controller

* Set content security policies on iframes controller show action

* Redesign awesome iframe component

* Replace stylesheet_pack_tag and jasvascript_pack_tag prefixing with append_

* Use tailwind variables

* Replace no longer existing variable

* Replace snippets use in awesome map helper

* Comment deprecated source in awesome_map.js

* Small redesign in awesome map js to use default marker

* Disable temporarily js and css introduced by awesome

* Disable temporarily deface overrides

* Update components layouts

* Replace modal of admin config constraints with remote modals

* Recover custom styles render in front

* adapt forms with help_texts

* Redefine icons and register missing ones

* Refactor admin menus to use redesign

* Fix missing wrong icon reference

* Disable by default awesome tweaks pending of redesign

* refactor tweaks for admin form functionality

* replace select2 with tom-select for config/admin

* Upgrade faker version in Gemfile

* Upgrade Decidim and update Gemfile.lock

* Remove deprecated awesome iframe no_margins setting

The section container of the iframe does not have margins so this
setting is useless applying redesign

* Fix awesome iframe tests

* Upgrade tests workflow ruby and node versions

* style button at the bototm

* remove needless colors

* better looking list constraints

* missing color

* restore codemirror

* remove unused packs and set properly the order of scripts

* refactor menu_hacks

* refactor system compat

* Adapt scoped admin management tests

* Adapt menu overrides admin management tests

* Avoid undefined method exception when proposal custom fields feature is disabled in proposals admin

* Update expected texts in tests

* Update selectors in tests

* Update submit interaction in tests

* Fix callout selector in tests

NOTE: The admin accountability feature is not redesigned yet so the
views may appear wrong but the functionality of filter works fine

* Add skips to integration tests of features pending to be adapted to Decidim 0.28

* Fix selector in test

* Add skips in tests for disabled features

* Adapt selectors

* Add skip to tests

* Force config enabled for controller test

* Add skip to tests

* Fix renamed organization attribute

* Force config enabled for permissions test

* Skip tests

* Normalize locales

* Recover translation removed in 0.28

* Add skips pending of disabled features in configuration

* Use current_component in blank_component_controller

* Update TargetRubyVersion in rubocop config

* Update rubocop configuration

* Autocorrect rubocop offenses

* Unsafe autocorrect rubocop offenses

* Add exclusions in rubocop configuration

* Fix rubocop finders offenses

* Fix rubocop factories offenses

* Recover js dependencies with decidim 0.27

* Fix js and styles linters offenses

* Skip tests

* Fix association in factories

* Skip tests

* Add skips to integration tests of features pending to be adapted to 0.28

* Fix expected background in test

* Adapt menu hacks tests to 0.28

* Revert "Recover js dependencies with decidim 0.27"

This reverts commit c87b2fc.

* Add external link behavior to breadcrumb_root_menu_item_presenter

* Update test

* Fix expected text in examples

* Remove proposal from tests which breaks database constraints

* Fix selector in test

* Add skip to feature not adapted yet to 0.28

* Remove tests-legacy workflow

* Rename 0.27 tests

* Upgrade Decidim to release/0.28-stable branch

* Add home_content_block_menu to awesome configurations

* Manage menus using menu_id param

* Add submenus for menu hacks

* Fix translations

* Adapt menu hacks tests to multiple menus

* Add tests to home content block menu hacks

* Adapt admin spec

* Add definition extracted from shared context

* Remove references to legacy_version from enabled tests

* Don't override active attribute of menu items provided by Decidim

* Change menu hacks to keep the breadcrumb original structure

* fix the constraint modla form after updates

* Apply suggestions from code review

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* Expand limits of COMPAT_DECIDIM_VERSION

* Update Gemfile and package.json

* Update Gemfile.lock

* Update package-lock.json

* Fix rubocop-capybara version

* Remove unnecesary linter disable directive comment

* restore js linting

* update versions

* remove legacy conditionals

* rubocop fix

* enforce chromedriver 119

* fix stylelint

* use parallel tests

* fix gemfile

* use parallel tests

* debug

* debug

* debug

* fix gemfile location

* fixes

* add missing binaries

* Use multi step actions

* fix postgres access

* fix postgres access

* fix tests

* fix excludes

* reorganize system tests

* syntaxt

* fix checks spec

---------

Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com>
Co-authored-by: Ivan Vergés <ivan@pokecode.net>
@codecov Codecov
Copy link

codecov bot commented Feb 8, 2024 •
edited

Codecov Report

Attention: Patch coverage is 96.66667% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 96.50%. Comparing base (2a34c57) to head (1e0f5ac).
Report is 4 commits behind head on main.

❗ Current head 1e0f5ac differs from pull request most recent head b280025

Please upload reports for the commit b280025 to get more accurate results.

Files Patch % Lines
...decidim/decidim_awesome/admin/checks_controller.rb 25.00% 3 Missing ⚠️
...decidim/decidim_awesome/admin/config_controller.rb 50.00% 2 Missing ⚠️
...cidim_awesome/admin/custom_redirects_controller.rb 66.66% 1 Missing ⚠️
...dim/decidim_awesome/admin/menu_hacks_controller.rb 75.00% 1 Missing ⚠️
lib/decidim/decidim_awesome/awesome.rb 90.00% 1 Missing ⚠️
lib/tasks/decidim_awesome_upgrade_tasks.rake 50.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #270      +/-   ##
==========================================
+ Coverage   96.48%   96.50%   +0.02%     
==========================================
  Files         123      115       -8     
  Lines        3467     2916     -551     
==========================================
- Hits         3345     2814     -531     
+ Misses        122      102      -20

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@microstudi microstudi linked an issue Feb 8, 2024 that may be closed by this pull request
Upgrade to 0.28 - Admin front updates #257
Open
4 tasks
@microstudi
Fixes for awesome constrains editor (#272)
99b3885 
* ui fixes

* fix css

* fix dom update after modifying constrains

* rubocop fix

* fix scripts. let the constraints editor work again

* fix some tests

* fix autoedit

* acab

* fix auto edit for multiple

* fix test

* fix edit button in constraints

* linting

* more linting

* style checks

* rubocop fix
@ElviaBth ElviaBth mentioned this pull request Mar 6, 2024
Merged
@microstudi
Images & Videos in public editors (#275)
635a29c 
* rename image editors

* style fix

* fix some tests

* fix global menu cache. fix tests

* remove select2

* remove jqueries

* remove markdown modifier

* styles

* fix tests
@ElviaBth ElviaBth mentioned this pull request Mar 11, 2024
Merged
@ElviaBth @microstudi
Upgrade feature Custom Redirections (#274)
7a8f858 
* enable custom_redirects accessor

* style index view with tailwindcss

* fix lint

* modify custom_redirect form styles

* add help-text class and table styles

* remove skip from custom_redirect specs

* fix edit view

* resolve review comments

* add tom-select

* add styles to check-custom-redirections button

* fix stylelint

* update check_redirecions using JS vanilla

* fix JS lint

* fix javascript

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
@ElviaBth ElviaBth mentioned this pull request Mar 12, 2024
Merged
@ElviaBth
Upgrade admin accountability (#276)
9d85477 
* add styles to list global admin button

* adjust car divider style

* update filter section style

* update filter with date section styles

* fix export search button

* remove unuse scss admin_accountability file

* remove outline from buttons

* fix system admin_accountability_admin_filtering_spec

* fix system admin_accountability_ps_filtering_spec

* run npm run stylelint-fix

* update filter tags styles

* remove outline from export dropdown button

* remove extra whitespace detected by linter
@paarals paarals mentioned this pull request Mar 14, 2024
Open
20 tasks
@ElviaBth ElviaBth mentioned this pull request Mar 19, 2024
Merged
6 tasks
microstudi and others added 3 commits March 20, 2024 12:13
@microstudi
Adapt custom fields for the 0.28 (#277)
1ea6437 
* re-enable custom fields

* reboot formbuilder

* fix css

* add loading spinner

* fix public styles

* render formbuilder

* fix multilang editors

* add fb locales (wip)

* enables custom fields in amendments

* fix tests

* fix tests

* rename quill
@ElviaBth @microstudi
Upgrade auto-save for surveys and forms (#280)
b347da5 
* enable intergram_for_admins and for public

* enable intergram live chat

* add styles to livechat view header

* handle nil values for intergram settings

* add styles to intergram_for_public constraints-editor

* style input text chat_id

* add styles to intergram_for_admin

* add styles to intergram_for_admin

* remove whitespaces mark by erblint

* remove skip from admin_spec livechat

* fix input color display

* apply help-text class to paragraph

* remove skip from awesome_intergram_spec

* enable auto_save_forms config_accessor

* skip livechat spec

* update tweaks for surveys styles

* remove skip from admin_spec.rb:83

* disable intergram

* skip live chat spec

* adapt autosave.js with js vanilla

* fix lint error

* disable eslint line prefer-reflect

* stylize messages

* styles

* remove non belonging mods

* additional style fixes

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
@ElviaBth @microstudi
Upgrade live support chat (#279)
1ddb589 
* enable intergram_for_admins and for public

* enable intergram live chat

* add styles to livechat view header

* handle nil values for intergram settings

* add styles to intergram_for_public constraints-editor

* style input text chat_id

* add styles to intergram_for_admin

* add styles to intergram_for_admin

* remove whitespaces mark by erblint

* remove skip from admin_spec livechat

* fix input color display

* apply help-text class to paragraph

* remove skip from awesome_intergram_spec

* adjust help-text span margin-top

* add more steps to admin livechat

* remove padding style from constraints

* replace gap for row column classes

* add scripts

* admin styles

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
@microstudi microstudi linked an issue Mar 21, 2024 that may be closed by this pull request
Language file for FormBuilder is loaded from CDN #217
Open
@ElviaBth @microstudi
Upgrade awesome map (#282)
6f82825 
* enable intergram_for_admins and for public

* enable intergram live chat

* add styles to livechat view header

* handle nil values for intergram settings

* add styles to intergram_for_public constraints-editor

* style input text chat_id

* add styles to intergram_for_admin

* add styles to intergram_for_admin

* remove whitespaces mark by erblint

* remove skip from admin_spec livechat

* fix input color display

* apply help-text class to paragraph

* remove skip from awesome_intergram_spec

* disable live chat config accessor

* add slyles to meetings map-info popup

* add slyles to proposals map-info popup

* refactor marker-meeting-popup

* add proposal popup dinamic info

* run npm run lint-fix

* run bundle exec erblint app/**/*.erb

* add changes

* fix meetings cards in map

* style the controls

* restore icons

* restore custom icons for meetings

* fix proposals presentation

* hide debugging

* cops

* handle amendments

* fix hashtags

* fix i18n location

* fix home content block

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
@ElviaBth ElviaBth mentioned this pull request Mar 25, 2024
Merged
microstudi and others added 2 commits March 26, 2024 09:50
@microstudi @ElviaBth
upgrade weighted voting (#285)
2d00d0a 
* adapat vote override

* add styles to voting cards

* add styles to abstain-button

* add styles to buttons from vote_proposal_modal

* add font-size to h4

* modify voting cards proposal modal

* run bundle exec erblint app/**/*.erb

* replace jQuery for js vanilla in voting_cards.js

* refactor voting_cards_proposal_modal

* remove extra whitespace detected

* fix html

* change dialog trigger

* fix script

* fix modal clicks

* refactor voting_cards.js

* add proceed button backgroun-color

* remove extra whitespace detected

* fix initial actions

* add metadata info

* fix voting tests

* fix summary tests

* fix config spec

* add cell tests

* add lib test to simplecov ignore

---------

Co-authored-by: elviabth <ejbenedith@gmail.com>
@microstudi
Merge remote-tracking branch 'origin/main' into develop
c57c91c
@microstudi microstudi marked this pull request as ready for review March 26, 2024 10:24
ElviaBth and others added 7 commits March 26, 2024 19:02
@ElviaBth @microstudi
Update ReadMe images (#286)
659b2e4 
* update awesome map image

* updated menu-3 and menu-4 images

* update menu-1 and menu-2 images

* replace scoped admins images

* fix gap between menu_hacks inputs

* replace custom-redirections new image

* replace custom_validations new image

* replace admin_accountability image

* replace scope_admins_authorized image

* replace custom_styles image

* replace intergram image

* replace proposal_sorting images

* replace weighted_voting image

* replace custom_fields images

* replace custom-fields-1 gif

* replace custom-fields-1 gif extention

* replace quill image and proposal image

* resolve review comments

* remove image.png and image-1.png

* replace custom-redirections image

* replace admin-editor and scoped_admins_config

* update menu-3 and menu-4 images

* fix image

* spell

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
@microstudi
locales
1e0f5ac
@pokecodebot @microstudi
New Crowdin updates (#291)
c2aba07 
* New translations en.yml (French)

* New translations en.yml (Romanian)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (German)

* New translations en.yml (Basque)

* New translations en.yml (Hungarian)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.yml (Lithuanian)

* New translations en.yml (Dutch)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (Catalan)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (German)

* New translations en.yml (French)

* New translations en.yml (Japanese)

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
@pokecodebot
New Crowdin updates (#295)
52e1d73 
* New translations en.yml (Czech)

* New translations en.yml (Czech)
@antopalidi @microstudi
Fix image uploading in the front office (#300)
5701495 
* fix helper

* add tests

* fix rubocop

* fix tests

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
@entantoencuanto
Include all Decidim default sort orders choices in proposals settings (…
bd5eac8 
…#306)
@microstudi @pokecodebot @antopalidi
Limit amendments (#302)
85cb3e5 
* Allow to limit non-accepted amendments in proposals (#261)

* add admin config option in proposals

* add amendments controller concern

* limit amendments on controller

* limit only new and create methods

* add modal explanation window

* do not show modal if amendments limit disabled

* add test cases

* fx locales

* add readme

* fix locales

* remove quotes

* remove space

* New Crowdin updates (#264)

* New translations en.yml (Romanian)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (German)

* New translations en.yml (Basque)

* New translations en.yml (Hungarian)

* New translations en.yml (Italian)

* New translations en.yml (Dutch)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (Czech)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (German)

* New translations en.yml (Japanese)

* New translations en.yml (German)

* New translations en.yml (Romanian)

* New translations en.yml (Basque)

* New translations en.yml (Dutch)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Hungarian)

* New translations en.yml (German)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (German)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (German)

* New translations en.yml (French)

* New translations en.yml (Japanese)

* New translations en.yml (Czech)

* New translations en.yml (Japanese) (#269)

* skip hidden emendations

---------

Co-authored-by: PokeCode Bot <109160875+pokecodebot@users.noreply.github.com>

* remove file

* fix ca file

* change modal

* fix rubocop

* fic npm lint

* undo the changes

* fix modal, fix test

* fix limit modal override

* remove spaces

* simplify implementation

* fix flaky scoped admins

* fix intergram spec

* fix specs

* amendment image

* fix linking the correct amendmentd

---------

Co-authored-by: PokeCode Bot <109160875+pokecodebot@users.noreply.github.com>
Co-authored-by: Anna Topalidi <t.opalidisanna@gmail.com>
microstudi and others added 4 commits May 17, 2024 19:27
@microstudi
reorder settings for components (#308)
4ddf07a
@microstudi
readd missing key
dd37cf8
@pokecodebot @microstudi
New Crowdin updates (#309)
75e1fe6 
* New translations en.yml (Romanian)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (German)

* New translations en.yml (Basque)

* New translations en.yml (Hungarian)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.yml (Lithuanian)

* New translations en.yml (Dutch)

* New translations en.yml (Portuguese)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (German)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Hungarian)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (German)

* New translations en.yml (Japanese)

* New translations en.yml (Catalan)

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
@microstudi
change deface spec (#311)
b280025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upgrade to 0.28 - Admin front updates Upgrade to 0.28 Language file for FormBuilder is loaded from CDN
5 participants
@microstudi @entantoencuanto @ElviaBth @pokecodebot @antopalidi