Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DFE-Digital/dfe-complete-conversions-transfers-and-changes
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b3c7639
Choose a base ref
...
head repository: DFE-Digital/dfe-complete-conversions-transfers-and-changes
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 75138d0
Choose a head ref
  • 13 commits
  • 30 files changed
  • 4 contributors

Commits on Jun 26, 2024

  1. Configuration menu
    Copy the full SHA
    f872c26 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Merge pull request #1702 from DFE-Digital/chore/169283-add-team-to-rp…

    …a-report
    
    Add the team a project is assigned to to the RPA, SUG and FA letters export
    lozette authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    bd05098 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ae26570 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1703 from DFE-Digital/renovate/hashicorp-terrafor…

    …m-1.x
    
    Update dependency hashicorp/terraform to v1.9.0
    lozette authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    e90b131 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7d90c63 View commit details
    Browse the repository at this point in the history
  5. Use descriptive state

    Using enums is great for lots of reasons, one of them is we don't have
    to think about the mapping and what each values means, we can use the
    words and we should do so whenever we can to make our code more
    approachable.
    mec committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    2a53f0f View commit details
    Browse the repository at this point in the history
  6. Add a DAO Revocation factory

    mec committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    b873401 View commit details
    Browse the repository at this point in the history
  7. Refactor ByMonthProjectFetcherService

    These two pairs of methods should return the same set of projects with
    the same sort order, which means we can DRY this up.
    
    We also add a new scope for this service: `active`. This only includes
    projects that are not completed or have the DAO revoked.
    
    A single month can be represented by passing two dates in the same month
    to the ranged fetcher. Although these dates are always the 1st, we felt
    the code should handle any case so we take steps to endure the from date
    is the 1st while the to date is the end of the month.
    
    We then have to ensure that even on routes that pass only a single date,
    we turn that into a from and to date, at the same time we try to ensure
    we are passing a Date object as much as possible, casting to strings as
    needed rather than passing strings about.
    
    We added the DateRangable controller concern for the common behaviour
    between the conversion and transfer controllers.
    mec committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    ba1497f View commit details
    Browse the repository at this point in the history
  8. Include the state of DAO in export

    We think the users of the pre conversion grant export will want to see
    DAO projects, but there would be no way to identify them.
    
    This work adds a 'Directive academy order revoked' column to this export
    so that users can identify any that have been revoked.
    
    The value will be one of:
    
    - Not applicable, when the project has no DAO
    - 'no', when the project has a DAO but it has not been revoked
    - date, the date on which the DAO revocation decision was made, this
      value is capture during the revocation steps
    mec committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    4264c90 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #1701 from DFE-Digital/feature/169471-dao-revocati…

    …on-not-show-in-export
    
    (169471) DAO dao revocations in exports
    mec authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    97224e6 View commit details
    Browse the repository at this point in the history
  10. Remove unused views

    This show view is never rendered because projects redirect to their
    tasks list on show.
    
    The /app/views/projects/show/_task_list is not used either.
    mec committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    0bf839b View commit details
    Browse the repository at this point in the history
  11. Redirect DAO revocations unless project dao_revokable

    If a user were to try and run the DAO Revoke paths on a project that is
    no suitable, we want to redirect a show an error message.
    mec committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    4a9587f View commit details
    Browse the repository at this point in the history
  12. User can revoke a DAO

    This work exposes the new 'DAO revocation' UI to users. It follows the
    same pattern as the 'completing a project' UI.
    
    We show a link and some brief guidance at the bottom of the task list
    of appropriate projects. We also add a link to the side navigation. The
    logic for showing the links in the side bar is the same as that of
    showing the guidance and links.
    mec committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    75138d0 View commit details
    Browse the repository at this point in the history
Loading