Merge into production #14

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

AlexTheProg wants to merge 1,622 commits into primero-romania from main

.eslintrc.js

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -51,7 +51,7 @@ module.exports = {
  
        "react/display-name": ["error", { ignoreTranspilerName: true }],

        "react/forbid-prop-types": "off",

        "react/jsx-props-no-spreading": "off",

        "react/jsx-sort-default-props": [

        "react/sort-default-props": [

          "error",

          {

            ignoreCase: true

    @@ -65,7 +65,7 @@ module.exports = {
  
        "import/no-extraneous-dependencies": "off",

        "default-param-last": "off",

        "arrow-body-style": "off",

        "react/function-component-definition": "off",

        "react/function-component-definition": [2, { namedComponents: "function-declaration" }],

        "no-restricted-exports": "off",

        "no-import-assign": "off",

        "react/jsx-no-useless-fragment": "off",

.github/workflows/app.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,13 +2,17 @@
  
    name: App

    on:

      push:

        branches:

          - main

      pull_request:

        branches:

          - main

          - 'release-*'

          - develop_react_upgrade

          - develop

      workflow_dispatch:

    jobs:

      server-test:

        name: RSpec Test

    @@ -51,94 +55,38 @@ jobs:
  
          - uses: actions/checkout@v2

          - uses: actions/setup-node@v2

            with:

              node-version: '18'

              cache: 'npm'

              cache-dependency-path: '**/package-lock.json'

          - name: Run client tests

            run: |

              npm ci

              npm run test:batch:1

      client-test-2:

        name: Client Test (Batch 2)

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - uses: actions/setup-node@v2

            with:

              node-version: '18'

              cache: 'npm'

              cache-dependency-path: '**/package-lock.json'

          - name: Run client tests

            run: |

              npm ci

              npm run test:batch:2

      client-test-3:

        name: Client Test (Batch 3)

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - uses: actions/setup-node@v2

            with:

              node-version: '18'

              cache: 'npm'

              cache-dependency-path: '**/package-lock.json'

          - name: Run client tests

            run: |

              npm ci

              npm run test:batch:3

      client-test-4:

        name: Client Test (Batch 4)

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - uses: actions/setup-node@v2

            with:

              node-version: '18'

              cache: 'npm'

              cache-dependency-path: '**/package-lock.json'

          - name: Run client tests

            run: |

              npm ci

              npm run test:batch:4

      client-test-5:

        name: Client Test (Batch 5)

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - uses: actions/setup-node@v2

            with:

              node-version: '18'

              node-version: '20'

              cache: 'npm'

              cache-dependency-path: '**/package-lock.json'

          - name: Run client tests

            run: |

              npm ci

              npm run test:batch:5

      client-test-new:

        name: Client Test (New)

              npm config set legacy-peer-deps true && npm ci

              npm run test

      client-test-components:

        name: Client Test (Components)

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - uses: actions/setup-node@v2

            with:

              node-version: '18'

              node-version: '20'

              cache: 'npm'

              cache-dependency-path: '**/package-lock.json'

          - name: Run client tests

            run: |

              npm ci

              npm run test:new -- --maxWorkers=2

              npm config set legacy-peer-deps true && npm ci

              npm run test:components -- --maxWorkers=2

      client-lint:

        name: Client Linter

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - uses: actions/setup-node@v2

            with:

              node-version: '18'

              node-version: '20'

              cache: 'npm'

              cache-dependency-path: '**/package-lock.json'

          - name: Run client linter

            run: |

              npm ci

              npm config set legacy-peer-deps true && npm ci

              npm run lint

.ruby-version

Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ruby-3.2.2
		ruby-3.3.5

Gemfile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,7 +3,7 @@
  
    # Copyright (c) 2014 - 2023 UNICEF. All rights reserved.

    source 'https://rubygems.org'

    ruby '3.2.2'

    ruby '3.3.5'

    gem 'activerecord-nulldb-adapter'      # Running Rake tasks at build time before DB is set up. TODO: Still needed?

    gem 'aws-sdk-s3',          '~> 1.130', # Access and manage Amazon S3 storage (with ActiveStorage).

    @@ -17,13 +17,13 @@ gem 'deep_merge',          '~> 1.2',   # Recursive merging of Hashes. Used for m
  
        require: 'deep_merge/rails_compat'

    gem 'delayed_job_active_record', '~> 4.1.7'

    gem 'devise',              '~> 4.9'    # Authentication framework

    gem 'devise-jwt',          '~> 0.10'   # JWT authentication for native Primero users

    gem 'faraday',             '~> 0.17'   # Ruby HTTP client

    gem 'file_validators',     '~> 3.0'    # ActiveRecord extension for validating attachment file sizes

    gem 'i18n-js',             '~> 3.9'    # Shares Rails i18n strings with the front end

    gem 'image_processing',    '~> 1.12'   # Ruby bindings for ImageMagick, resize attachments. Depenency of ActiveStorage

    gem 'jbuilder',            '~> 2.11'   # JSON templating for the API

    gem 'json_schemer',        '~> 1.0'    # Validation for submited JSON

    gem 'jwt',                 '~> 2.8'    # Ruby JWT library used to authenticate 3rd party identity provider tokens

    gem 'matrix',              '~> 0.4'    # No longer part of Ruby 3.2 core. Must be included explicitly

    gem 'minipack',            '~> 0.3'    # An alternative to Webpacker. TODO: Is this still needed? In prod?

    gem 'net-http-persistent', '~> 4.0'    # Thread safe persistent HTTP connections, optional Faraday dependency

    @@ -34,25 +34,28 @@ gem 'prawn-table',         '~> 0.2'    # PDF generation
  
    gem 'puma',                '~> 6.4'    # Ruby Rack server

    gem 'rack',                '~> 2.2'

    gem 'rack-attack',         '>= 6.6'    # Rack middleware to rate limit sensetive routes, such as those used for auth

    gem 'rails',               '6.1.7.6'

    gem 'rails',               '6.1.7.9'

    gem 'rake',                '~> 13.0'

    gem 'rbnacl',              '>= 7.1.1'  # Libsodium Ruby binding. Used for encrypting export file passwords.

    gem 'rubyzip',             '~> 2.3',   # Zip and encrypt exported files

        require: 'zip'

    gem 'spreadsheet',         '~> 1.3'    # Read XLS spreadsheets for imports (not XLSX!). TODO: Different gem? Reconsider?

    # Note: if upgrading Sunspot, update the corresponding version of Solr on the Docker image

    # Current Solr version is 5.3.1

    gem 'sunspot_rails',       '~> 2.6'    # Rails ODM bindings to Solr

    gem 'sunspot_solr',        '~> 2.6'    # Ruby bindings to Solr

    gem 'sunspot_rails',       '~> 2.6',    # Rails ODM bindings to Solr

        require: false

    gem 'sunspot_solr',        '~> 2.6',    # Ruby bindings to Solr

        require: false

    gem 'text',                '~> 1.3'    # Phonetic Search Algorithms

    gem 'twitter_cldr',        '~> 4.4'    # Localization for dates, money. TODO: Is this still used?

    gem 'tzinfo-data',         '~> 1.2023' # Timezone Data for TZInfo

    gem 'uri',                 '>= 0.12.2' # CVE-2023-36617: ReDoS vulnerability in URI

    gem 'uri',                 '~> 0.12'   # CVE-2023-36617: ReDoS vulnerability in URI

    gem 'web-push',            '~> 3.0'

    gem 'will_paginate',       '~> 4.0'    # Paginates ActiveRecord models  TODO: This can be refactored away.

    gem 'write_xlsx',          '~> 1.11'   # Exports XLSX

    group :development, :test do

      gem 'bundler-audit',              '~> 0.8'

      gem 'bundler-audit',              '~> 0.9'

      gem 'ci_reporter',                '~> 2.0'

      gem 'factory_bot',                '~> 5.0'

      gem 'foreman'

    @@ -78,6 +81,7 @@ group :development, :test do
  
      gem 'rspec-rails',                '~> 6.0'

      gem 'rubocop',                    '~> 1.54'

      gem 'rubocop-performance',        '~> 1.18'

      gem 'ruby-lsp',                   '~> 0.17'

      gem 'ruby-prof',                  '~> 0.17'

      gem 'simplecov',                  '~> 0.18'

      # TODO: Latest version (1.2.5) of this conflicts with sunspot gem. Upgrade when we upgrade sunspot

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge into production #14

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!