Skip to content

Commit

Permalink
upgrade to 0.28.0 (#9)
Browse files Browse the repository at this point in the history 
* upgrade to 0.28.0

* add files to .gitignore

* update icons

* update icons

* fix styles

* create menu class

* dd_breadcrumb_item_from_menu

* remove unused code from civicrm layouts

* update workflows files

* remove icon key from sidebar_menu

* fix styles for new.html.erb view

* fix styles participatory_space

* checkout main -- Gemfile.lock

* fix rubocop error

* remove extra ffi

* fix specs

* fix oauth spec

* remove NeedsMultiselectSnippets

* use tomselect instead of select2

* flow

* flow

* fix

* fix specs

* ruboxcop

* fix workflow

* fix workflow

* ruboxcop

* compact menus

* fix spec

---------

Co-authored-by: Ivan Vergés <[email protected]>
  • Loading branch information
@ElviaBth @microstudi
ElviaBth and microstudi authored Oct 7, 2024
1 parent febfbea commit 78e77fb
Show file tree
Hide file tree
Showing 128 changed files with 13,005 additions and 6,053 deletions.
248 changes: 2 additions & 246 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
@@ -1,247 +1,3 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": [
"eslint:recommended",
"prettier"
],
"parserOptions": {
"ecmaVersion": 12,
"sourceType": "module"
},
"globals": {
"require": false,
"$": false,
"jQuery": false,
"L": false,
"ApiFetcher": false,
"FormStorage": false,
"Quill": false,
"InscrybMDE": false,
"CodeMirror": false,
"Europa": false,
"DecidimAwesome": false,
"inlineAttachment": false,
"CustomFieldsBuilder": false
},
"rules": {
"accessor-pairs": "error",
"array-bracket-spacing": "error",
"array-callback-return": "error",
"arrow-body-style": "off",
"arrow-parens": [
"error",
"always"
],
"arrow-spacing": [
"error",
{
"after": true,
"before": true
}
],
"block-scoped-var": "error",
"block-spacing": "off",
"callback-return": "error",
"class-methods-use-this": "off",
"comma-dangle": ["error", "never"],
"comma-spacing": [
"error",
{
"after": true,
"before": false
}
],
"comma-style": [
"error",
"last"
],
"complexity": "error",
"computed-property-spacing": [
"error",
"never"
],
"consistent-this": "error",
"curly": "error",
"default-case": "error",
"dot-location": "error",
"dot-notation": "error",
"eol-last": "error",
"func-call-spacing": "error",
"func-name-matching": "error",
"func-names": [
"error",
"never"
],
"generator-star-spacing": "error",
"global-require": "error",
"handle-callback-err": "error",
"id-blacklist": "error",
"id-match": "error",
"indent": ["error", 2, { "VariableDeclarator": 2 }],
"jsx-quotes": "error",
"key-spacing": "error",
"keyword-spacing": [
"error",
{
"after": true,
"before": true
}
],
"linebreak-style": [
"error",
"unix"
],
"lines-around-comment": "error",
"lines-around-directive": "error",
"max-len": "off",
"max-lines": "error",
"max-nested-callbacks": "error",
"max-params": "error",
"max-statements": "off",
"max-statements-per-line": "error",
"multiline-ternary": "error",
"new-cap": "error",
"new-parens": "error",
"newline-after-var": "off",
"newline-before-return": "off",
"newline-per-chained-call": "off",
"no-alert": "error",
"no-array-constructor": "error",
"no-bitwise": "error",
"no-caller": "error",
"no-catch-shadow": "error",
"no-confusing-arrow": "error",
"no-continue": "error",
"no-div-regex": "error",
"no-duplicate-imports": "error",
"no-else-return": "error",
"no-eq-null": "error",
"no-eval": "error",
"no-extend-native": "error",
"no-extra-bind": "error",
"no-extra-label": "error",
"no-extra-parens": "off",
"no-floating-decimal": "error",
"no-implicit-coercion": "error",
"no-implicit-globals": "error",
"no-implied-eval": "error",
"no-iterator": "error",
"no-label-var": "error",
"no-labels": "error",
"no-lone-blocks": "error",
"no-lonely-if": "error",
"no-magic-numbers": "off",
"no-mixed-requires": "error",
"no-multi-spaces": "off",
"no-multi-str": "error",
"no-multiple-empty-lines": "error",
"no-native-reassign": "error",
"no-negated-condition": "error",
"no-negated-in-lhs": "error",
"no-nested-ternary": "error",
"no-new": "error",
"no-new-func": "error",
"no-new-object": "error",
"no-new-require": "error",
"no-new-wrappers": "error",
"no-octal-escape": "error",
"no-path-concat": "error",
"no-plusplus": "error",
"no-process-env": "error",
"no-process-exit": "error",
"no-proto": "error",
"no-prototype-builtins": "error",
"no-restricted-globals": "error",
"no-restricted-imports": "error",
"no-restricted-modules": "error",
"no-restricted-properties": "error",
"no-restricted-syntax": "error",
"no-return-assign": "error",
"no-script-url": "error",
"no-self-compare": "error",
"no-sequences": "error",
"no-shadow": "error",
"no-shadow-restricted-names": "error",
"no-spaced-func": "error",
"no-sync": "error",
"no-tabs": "error",
"no-template-curly-in-string": "error",
"no-throw-literal": "error",
"no-trailing-spaces": "off",
"no-undef-init": "error",
"no-undefined": "error",
"no-underscore-dangle": "off",
"no-unmodified-loop-condition": "error",
"no-unneeded-ternary": "error",
"no-unused-expressions": "error",
"no-use-before-define": "error",
"no-useless-call": "error",
"no-useless-computed-key": "error",
"no-useless-concat": "error",
"no-useless-constructor": "error",
"no-useless-escape": "error",
"no-useless-rename": "error",
"no-var": "error",
"no-void": "error",
"no-warning-comments": "error",
"no-whitespace-before-property": "error",
"no-with": "error",
"object-curly-newline": "off",
"object-curly-spacing": "off",
"object-property-newline": [
"error",
{
"allowMultiplePropertiesPerLine": true
}
],
"object-shorthand": "off",
"one-var": "off",
"one-var-declaration-per-line": "error",
"operator-assignment": "error",
"operator-linebreak": "error",
"padded-blocks": "off",
"prefer-arrow-callback": "off",
"prefer-const": "off",
"prefer-numeric-literals": "error",
"prefer-rest-params": "error",
"prefer-spread": "error",
"prefer-template": "error",
"quote-props": "off",
"quotes": ["error", "double", { "avoidEscape": true }],
"require-jsdoc": "error",
"rest-spread-spacing": "error",
"semi": "off",
"semi-spacing": "error",
"sort-imports": "off",
"sort-keys": "off",
"space-before-blocks": "error",
"space-before-function-paren": "off",
"space-in-parens": [
"error",
"never"
],
"space-infix-ops": "error",
"space-unary-ops": "error",
"spaced-comment": [
"error",
"always"
],
"strict": "error",
"symbol-description": "error",
"template-curly-spacing": "error",
"unicode-bom": [
"error",
"never"
],
"vars-on-top": "error",
"wrap-iife": "error",
"wrap-regex": "error",
"yield-star-spacing": "error",
"yoda": "error",
"import/no-named-as-default": "off",
"import/no-extraneous-dependencies": "off"
}
}
"extends": "@decidim"
}
27 changes: 21 additions & 6 deletions .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,37 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
RUBY_VERSION: 3.1.6
NODE_VERSION: 18.17.1

jobs:
lint-report:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: actions/setup-node@master
with:
node-version: ${{ env.NODE_VERSION }}

- run: npm ci
name: Install JS deps

- run: npm run lint
name: Lint JS files

- run: npm run stylelint
name: Lint SCSS files

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- name: Lint and Rubocop
run: |
bundle exec rubocop -P
bundle exec erblint app/**/*.erb
- run: bundle exec rubocop -P
name: Lint Ruby files

- run: bundle exec erblint app/**/*.erb
name: Lint ERB files
64 changes: 36 additions & 28 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
CI: 1
SIMPLECOV: 1
NODE_VERSION: 18.17.1
RUBY_VERSION: 3.1.6
DISPLAY: ":99"
RUBYOPT: '-W:no-deprecated'
RAILS_ENV: test
NODE_ENV: test

jobs:
test-report:
name: Tests
runs-on: ubuntu-latest

timeout-minutes: 30
services:
postgres:
image: postgres:11
Expand All @@ -30,53 +37,54 @@ jobs:
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
DATABASE_HOST: localhost

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: actions/setup-node@v3
- uses: ruby/setup-ruby@v1
with:
node-version: ${{ env.NODE_VERSION }}
bundler-cache: true

- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 126.0.6478.182

- name: Get npm cache directory path
id: npm-cache-dir-path
run: echo "::set-output name=dir::$(npm get cache)-civcrm"
- name: Remove Chrome
run: sudo apt remove google-chrome-stable

- uses: actions/[email protected]
id: npm-cache
- uses: browser-actions/setup-chrome@v1
with:
path: ${{ steps.npm-cache-dir-path.outputs.dir }}
key: npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
npm-
- run: npm ci
chrome-version: 126.0.6478.182

- uses: ruby/setup-ruby@v1
- uses: actions/setup-node@v3
with:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true
node-version: ${{ env.NODE_VERSION }}

- name: Setup Database
run: bundle exec rake test_app
- run: RAILS_ENV=test bundle exec rails assets:precompile
- run: bundle exec rake test_app
name: Create test app

- run: bundle exec rails assets:precompile
name: Precompile assets
working-directory: ./spec/decidim_dummy_app/
shell: "bash"

- run: bundle exec rspec
name: RSpec
env:
CODECOV: 1


- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3

- uses: actions/upload-artifact@v2-preview
- uses: actions/upload-artifact@v3
if: always()
with:
name: screenshots
path: ./spec/decidim_dummy_app/tmp/screenshots
if-no-files-found: ignore

- uses: actions/upload-artifact@v3
if: always()
with:
name: Test logs
path: ./spec/decidim_dummy_app/log/test.log
if-no-files-found: ignore
Loading

0 comments on commit 78e77fb

Please sign in to comment.