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

Update to version 0.10 #243

Merged
merged 25 commits into from
Nov 14, 2023
Merged

Update to version 0.10 #243

merged 25 commits into from
Nov 14, 2023

Conversation

microstudi
Copy link
Contributor

@microstudi microstudi commented Nov 3, 2023 •
edited
Loading

New features added:

  • Sorting options for proposals
  • Weighted voting for proposals. Added "voting cards" method
  • Fixes case insensitive in url redirects

microstudi and others added 19 commits October 7, 2022 11:14
@microstudi
New feature: customizable etiquette rules (#1)
d7115a8 
* Add configuration options

* erb lint

* set validations

* fix summary test

* fixes specs

* fix config merger

* bump version. add docs
@microstudi
Merge branch 'decidim-ice:main' into main
b0959f7
@antopalidi @microstudi
Setup admin accountablity (#6)
743fc4f 
* add new section, add new controller, add view index

* add permissions to index action

* add rspec tests

* add var to config and rspec

* fix initializer

* fix lint

* fix permissions

* refactor permissions handling

* fix test

Co-authored-by: Ivan Vergés <[email protected]>
@microstudi
Merge branch 'main' of github.com:decidim-ice/decidim-module-decidim_…
b043399 
…awesome
@microstudi
Merge branch 'main' into develop
7719858
@antopalidi @microstudi
View and controllers (#7)
0666824 
* improve the controller and add a table to the view

* logs list

* add PaperTrail instead ActionLog

* add removal date to table

* change datetime format

* move remove instance var from helper

* add styles to table, add role

* add pagination

* fix pagination

* add rspec

* change controller

* change controller

* fix lint

* add rspec

* add participatory_space_type to table

* fix lint

* refactoring

* change method's name

* improve the controller and add a table to the view

* logs list

* add PaperTrail instead ActionLog

* add removal date to table

* change datetime format

* move remove instance var from helper

* add styles to table, add role

* add pagination

* fix pagination

* add rspec

* change controller

* change controller

* fix lint

* add rspec

* add participatory_space_type to table

* fix lint

* refactoring

* change method's name

* add config for types_user_roles

* change view and helper, move building html to view from helper

* fix lint

* fix lint

* add presenter, remove helper

* fix pagination

* add link to participatory space, add presenter spec

* extract the i18n version of the role

* add rspec PaperTrailVersion

* rspec PaperTrailRolePresenter

* Fix presenter

* fix tests

* fix presenter

* handle deleted users

* fix checksums

---------

Co-authored-by: Ivan Vergés <[email protected]>
@microstudi
Merge branch 'main' into develop
fefd20a 
# Conflicts:
#	Gemfile.lock
@antopalidi @microstudi
Search and filtering (#8)
d5bccc9 
* add Filterable

* fix searching and filtering

* add filter by date

* add rspec

* change ransacker method name

* change locale

* fix test

* fix filter by date examples

---------

Co-authored-by: Ivan Vergés <[email protected]>
@antopalidi @microstudi
Export excel/csv (#9)
6163113 
* add export of admin_actions

* restore Gemfile.lock

* update gemfile

* add reference decidim admin for locales

* commit used Decidim styles

* restore envs

* remove default

* add tests

---------

Co-authored-by: Ivan Vergés <[email protected]>
@microstudi
configurable roles from initializer (#10)
1a97b89 
* translate values

* make roles configurable

* fix tests
@microstudi
Show superadmins in admin accountability (#12)
10958f9 
* refactor initializer & presenter clasess

* complete space role test

* differentiate admins from space admins

* add user presenter specs

* fix filters

* add tests for super admins

* fix tests

* fix permissions

* Add readme instructions

* update version

* fix readme
@microstudi @antopalidi
Admin accountability (#207)
606734e 
* View and controllers (#7)

* improve the controller and add a table to the view

* logs list

* add PaperTrail instead ActionLog

* add removal date to table

* change datetime format

* move remove instance var from helper

* add styles to table, add role

* add pagination

* fix pagination

* add rspec

* change controller

* change controller

* fix lint

* add rspec

* add participatory_space_type to table

* fix lint

* refactoring

* change method's name

* improve the controller and add a table to the view

* logs list

* add PaperTrail instead ActionLog

* add removal date to table

* change datetime format

* move remove instance var from helper

* add styles to table, add role

* add pagination

* fix pagination

* add rspec

* change controller

* change controller

* fix lint

* add rspec

* add participatory_space_type to table

* fix lint

* refactoring

* change method's name

* add config for types_user_roles

* change view and helper, move building html to view from helper

* fix lint

* fix lint

* add presenter, remove helper

* fix pagination

* add link to participatory space, add presenter spec

* extract the i18n version of the role

* add rspec PaperTrailVersion

* rspec PaperTrailRolePresenter

* Fix presenter

* fix tests

* fix presenter

* handle deleted users

* fix checksums

---------

Co-authored-by: Ivan Vergés <[email protected]>

* Fix awesomeMap layering (#206)

* fix awesome map layering2

* add editor fixes

* add checksum

* fix terms copy check

* add codecov action

* Search and filtering (#8)

* add Filterable

* fix searching and filtering

* add filter by date

* add rspec

* change ransacker method name

* change locale

* fix test

* fix filter by date examples

---------

Co-authored-by: Ivan Vergés <[email protected]>

* Export excel/csv (#9)

* add export of admin_actions

* restore Gemfile.lock

* update gemfile

* add reference decidim admin for locales

* commit used Decidim styles

* restore envs

* remove default

* add tests

---------

Co-authored-by: Ivan Vergés <[email protected]>

* configurable roles from initializer (#10)

* translate values

* make roles configurable

* fix tests

* Show superadmins in admin accountability (#12)

* refactor initializer & presenter clasess

* complete space role test

* differentiate admins from space admins

* add user presenter specs

* fix filters

* add tests for super admins

* fix tests

* fix permissions

* Add readme instructions

* update version

* fix readme

---------

Co-authored-by: Anna Topalidi <[email protected]>
@microstudi
Merge branch 'develop' of github.com:decidim-ice/decidim-module-decid…
e09e87e 
…im_awesome into develop
@microstudi
Merge branch 'main' into develop
5a99411 
# Conflicts:
#	CHANGELOG.md
#	Gemfile.legacy.lock
#	Gemfile.lock
#	app/controllers/decidim/decidim_awesome/admin/admin_accountability_controller.rb
#	app/models/decidim/decidim_awesome/paper_trail_version.rb
#	app/packs/src/decidim/decidim_awesome/editors/editor.js
#	app/presenters/decidim/decidim_awesome/user_entity_presenter.rb
#	app/views/decidim/decidim_awesome/admin/admin_accountability/index.html.erb
#	config/locales/en.yml
#	lib/decidim/decidim_awesome/test/shared_examples/action_log_presenter_examples.rb
#	lib/decidim/decidim_awesome/version.rb
#	package-lock.json
#	package.json
#	spec/jobs/export_admin_actions_job_spec.rb
#	spec/models/paper_trail_version_spec.rb
#	spec/presenters/participatory_space_role_presenter_spec.rb
#	spec/presenters/user_entity_presenter_spec.rb
#	spec/system/admin/admin_accountability_admin_filtering_spec.rb
#	spec/system/admin/admin_accountability_ps_filtering_spec.rb
#	spec/system/admin/admin_accountability_spec.rb
@ElviaBth
Fix forced downcase in custom redirect urls (#240)
9f4732c 
* fix forced downcase in url

* fix failed tests

* modify test title
@microstudi @antopalidi
Graded proposal voting (#238)
de30639 
* Setup migrations and models (#13)

* add migrations

* change grade to weight

* totals name

* hooks (wip)

* add total weight cache

* graded voting/set defaults (#14)

* initial defaults

* add deface

* add views to manifest

* add cells view hacker

* set weight validator for voting manifest

* test fixing

* add basic weight voting

* add specs

* manifest spec

* add controller spec

* add readme

* fix awesome spec

* rubocop

* fix system checker spec

* set openstreet map

* used mocked openstreet maps

* modernize actions

* Prevent changin voting manifest if votes exist (#16)

* update codecov report

* Export weights (#17)

* add label generation for the manifest

* tweak exported

* add weights to the exporter

* fix tests

* add graphql entry

* Order proposals by my votes (#18)

* override filters

* add specs

* FrontEnd vote action UI/implementation (#15)

* add vote button, add modal, change votes counter view

* change frontend

* add voting to modal

* add action cable, updating results

* refactoring

* isolate the specific implementation of the voting

* add abstain setting

* change modal, change voting

* add abstain to voting

* refactoring

* change weight colors

* add tests

* add cells specs

* fix lint

* fix stylelint

* normalize locale

* change controller

* fix proposal_vote_path

* fix locale

* fix locale

---------

Co-authored-by: Ivan Vergés <[email protected]>

* Minor fixes and improvements for frontend voting (#19)

* change basic copies

* namespace css

* add link "change my vote"

* change opacity method

* add tests

* add check settings for abstain

* fix cell test

---------

Co-authored-by: Anna Topalidi <[email protected]>

* Add modal window with instructions (#20)

* change basic copies

* namespace css

* introduce modal pre-voting

* handle localstorage

* refactor namespaces for copies

* fix copy

* copies

* add finger

* add svg icons

* add margin

* fix margins in modal

* abstain style

* fix tests

* prevent voting abstain if not allowed

* fix footer

* normalize i18n

* add additional specs

* add conf var for sorting

* fix cache proposal_m

* proposal conf fixes

* Rename manifest and minor fixes (#22)

* rename voting_cards manifest

* mend

* abstain color

* fix modal title

* fix test

* fix counter colors

* fix xss

* style fix

---------

Co-authored-by: Anna Topalidi <[email protected]>
Co-authored-by: Anna Topalidi <[email protected]>
@microstudi
add missing images
a75b81d
@pokecodebot
New Crowdin updates (#241)
1493c7b 
* 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 (Portuguese)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* 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 (Portuguese)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (French)

* 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 (Portuguese)

* New translations en.yml (Swedish)

* New translations en.yml (Portuguese, Brazilian)

* 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 (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 (Italian)
@microstudi
allow to configure proposal sorting in the admin (#242)
43a61bd 
* allow to configure orders in the admin

* readme

* fix tests

* fix order from machine translations

* fix mis var

* fix test

* increase wating time

* bump version
@codecov Codecov
Copy link

codecov bot commented Nov 3, 2023 •
edited
Loading

Codecov Report

Attention: 72 lines in your changes are missing coverage. Please review.

Comparison is base (9b4e315) 96.02% compared to head (a3858a4) 86.28%.

Files Patch % Lines
...me/proposals/proposal_votes_controller_override.rb 45.16% 17 Missing ⚠️
...cidim/decidim_awesome/has_proposal_extra_fields.rb 46.15% 14 Missing ⚠️
...im/decidim_awesome/proposals/orderable_override.rb 73.46% 13 Missing ⚠️
lib/decidim/decidim_awesome/voting_manifest.rb 73.91% 6 Missing ⚠️
...oncerns/decidim/decidim_awesome/has_vote_weight.rb 68.75% 5 Missing ⚠️
...im/decidim_awesome/proposal_serializer_override.rb 72.72% 3 Missing ⚠️
lib/decidim/decidim_awesome/engine.rb 92.85% 3 Missing ⚠️
lib/decidim/decidim_awesome/test/factories.rb 70.00% 3 Missing ⚠️
...erns/decidim/decidim_awesome/not_found_redirect.rb 0.00% 2 Missing ⚠️
.../decidim/decidim_awesome/proposal_type_override.rb 77.77% 2 Missing ⚠️
... and 3 more
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #243      +/-   ##
==========================================
- Coverage   96.02%   86.28%   -9.74%     
==========================================
  Files          97       94       -3     
  Lines        2440     2698     +258     
==========================================
- Hits         2343     2328      -15     
- Misses         97      370     +273

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

pokecodebot and others added 4 commits November 4, 2023 11:30
@pokecodebot
New Crowdin updates (#244)
a180288 
* New translations en.yml (Czech)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)
@pokecodebot
New Crowdin updates (#245)
805f2fe 
* New translations en.yml (Japanese)

* New translations en.yml (Romanian)

* New translations en.yml (German)
@microstudi
generalize extra fields table for future uses (#247)
4e6db57 
* generalize extra fields table for future uses

* fix factory

* migration name

* renames

* index name

* fix migration

* fix spec

* fix spec

* fix spec again

* readme

* add 0.10 version
@microstudi
Merge branch 'main' into develop
209cd1f 
# Conflicts:
#	config/locales/it.yml
#	config/locales/lt.yml
#	config/locales/ro-RO.yml
@microstudi microstudi marked this pull request as ready for review November 9, 2023 16:27
@microstudi microstudi merged commit 4f1b2eb into main Nov 14, 2023
12 of 13 checks passed
@microstudi microstudi deleted the develop branch November 14, 2023 09:11
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.
4 participants
@microstudi @antopalidi @ElviaBth @pokecodebot