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

EXUI 1851 #3790

Merged
merged 12 commits into from
Jul 29, 2024
Merged

EXUI 1851 #3790

merged 12 commits into from
Jul 29, 2024

Conversation

anthonydummer
Copy link
Contributor

Jira link (if applicable)

https://tools.hmcts.net/jira/browse/EXUI-1851

Change description

Fix to broken functional test plus enhancements to other areas in the timing section

Checklist

  • commit messages are meaningful and follow good commit message guidelines
  • tests have been updated / new tests has been added (if needed)
  • Does this PR introduce a breaking change

anthonydummer and others added 5 commits July 9, 2024 10:29
@anthonydummer
EXUI-2018 (#3762)
a626101 
* EXUI-2018 - initial check in to stop user progressing when action required still selected.

* EXUI-2018 - added in null checks.

* EXUI-2018 - run yarn known issues.

* removing comment as per peer review comments

* EXUI-2018 - run yarn known issues.

* EXUI-2018 - run yarn known issues.
@anthonydummer
EXUI-2018 - run yarn known issues.
00a0149
@anthonydummer
Exui 2018 yarn issues (#3789)
7f13249 
* EXUI-2018 - run yarn known issues.

* EXUI-2018 - run yarn known issues.
@anthonydummer
incorporating exui-2018 changes
b940bcd
@anthonydummer
EXUI-1851
6d336df
@anthonydummer anthonydummer added the enable_keep_helm enable_keep_helm label Jul 9, 2024
@hmcts-jenkins-j-to-z
Copy link
Contributor

Plan Result (aat)

⚠️ Resource Deletion will happen

This plan contains resource delete operation. Please check the plan result very carefully!

Plan: 0 to add, 1 to change, 1 to destroy.
  • Update
    • module.redis6-cache.azurerm_redis_cache.redis
  • Delete
    • azurerm_key_vault_secret.app_insights_connection_string
Change Result (Click me) 
  # azurerm_key_vault_secret.app_insights_connection_string will be destroyed
  # (because azurerm_key_vault_secret.app_insights_connection_string is not in configuration)
  - resource "azurerm_key_vault_secret" "app_insights_connection_string" {
      - id                      = "https://rpx-aat.vault.azure.net/secrets/appinsights-connection-string-mc/2614e61a879b4789a81a54df6739a022" -> null
      - key_vault_id            = "/subscriptions/1c4f0704-a29e-403d-b719-b90c34ef14c9/resourceGroups/rpx-aat/providers/Microsoft.KeyVault/vaults/rpx-aat" -> null
      - name                    = "appinsights-connection-string-mc" -> null
      - resource_id             = "/subscriptions/1c4f0704-a29e-403d-b719-b90c34ef14c9/resourceGroups/rpx-aat/providers/Microsoft.KeyVault/vaults/rpx-aat/secrets/appinsights-connection-string-mc/versions/2614e61a879b4789a81a54df6739a022" -> null
      - resource_versionless_id = "/subscriptions/1c4f0704-a29e-403d-b719-b90c34ef14c9/resourceGroups/rpx-aat/providers/Microsoft.KeyVault/vaults/rpx-aat/secrets/appinsights-connection-string-mc" -> null
      - tags                    = {} -> null
      - value                   = (sensitive value) -> null
      - version                 = "2614e61a879b4789a81a54df6739a022" -> null
      - versionless_id          = "https://rpx-aat.vault.azure.net/secrets/appinsights-connection-string-mc" -> null
    }

  # module.redis6-cache.azurerm_redis_cache.redis will be updated in-place
  ~ resource "azurerm_redis_cache" "redis" {
        id                            = "/subscriptions/1c4f0704-a29e-403d-b719-b90c34ef14c9/resourceGroups/rpx-mc-redis6-cache-aat/providers/Microsoft.Cache/redis/xui-webapp-aat"
        name                          = "xui-webapp-aat"
        tags                          = {
            "application"         = "expert-ui"
            "autoShutdown"        = "true"
            "builtFrom"           = "https://github.com/HMCTS/rpx-xui-webapp.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#xui-pipeline"
            "environment"         = "staging"
            "managedBy"           = "Expert UI"
        }
        # (21 unchanged attributes hidden)

      ~ redis_configuration {
          ~ maxfragmentationmemory_reserved         = 1330 -> 642
          ~ maxmemory_delta                         = 1330 -> 642
          ~ maxmemory_reserved                      = 1330 -> 642
            # (8 unchanged attributes hidden)
        }
    }

Plan: 0 to add, 1 to change, 1 to destroy.

Changes to Outputs:
  - appInsightsConnectionString   = (sensitive value) -> null

@hmcts-jenkins-j-to-z
Copy link
Contributor

hmcts-jenkins-j-to-z bot commented Jul 9, 2024 •
edited

Plan Result (prod)

⚠️ Resource Deletion will happen

This plan contains resource delete operation. Please check the plan result very carefully!

Plan: 0 to add, 1 to change, 1 to destroy.
  • Update
    • module.redis6-cache.azurerm_redis_cache.redis
  • Delete
    • azurerm_key_vault_secret.app_insights_connection_string
Change Result (Click me) 
  # azurerm_key_vault_secret.app_insights_connection_string will be destroyed
  # (because azurerm_key_vault_secret.app_insights_connection_string is not in configuration)
  - resource "azurerm_key_vault_secret" "app_insights_connection_string" {
      - id                      = "https://rpx-prod.vault.azure.net/secrets/appinsights-connection-string-mc/2b71ffdbfe4844aeb79bd893d815cc94" -> null
      - key_vault_id            = "/subscriptions/8999dec3-0104-4a27-94ee-6588559729d1/resourceGroups/rpx-prod/providers/Microsoft.KeyVault/vaults/rpx-prod" -> null
      - name                    = "appinsights-connection-string-mc" -> null
      - resource_id             = "/subscriptions/8999dec3-0104-4a27-94ee-6588559729d1/resourceGroups/rpx-prod/providers/Microsoft.KeyVault/vaults/rpx-prod/secrets/appinsights-connection-string-mc/versions/2b71ffdbfe4844aeb79bd893d815cc94" -> null
      - resource_versionless_id = "/subscriptions/8999dec3-0104-4a27-94ee-6588559729d1/resourceGroups/rpx-prod/providers/Microsoft.KeyVault/vaults/rpx-prod/secrets/appinsights-connection-string-mc" -> null
      - tags                    = {} -> null
      - value                   = (sensitive value) -> null
      - version                 = "2b71ffdbfe4844aeb79bd893d815cc94" -> null
      - versionless_id          = "https://rpx-prod.vault.azure.net/secrets/appinsights-connection-string-mc" -> null
    }

  # module.redis6-cache.azurerm_redis_cache.redis will be updated in-place
  ~ resource "azurerm_redis_cache" "redis" {
        id                            = "/subscriptions/8999dec3-0104-4a27-94ee-6588559729d1/resourceGroups/rpx-mc-redis6-cache-prod/providers/Microsoft.Cache/redis/xui-webapp-prod"
        name                          = "xui-webapp-prod"
        tags                          = {
            "application"         = "expert-ui"
            "builtFrom"           = "https://github.com/HMCTS/rpx-xui-webapp.git"
            "businessArea"        = "CFT"
            "contactSlackChannel" = "#xui-pipeline"
            "environment"         = "production"
            "managedBy"           = "Expert UI"
        }
        # (21 unchanged attributes hidden)

      ~ redis_configuration {
          ~ maxfragmentationmemory_reserved         = 1330 -> 642
          ~ maxmemory_delta                         = 1330 -> 642
          ~ maxmemory_reserved                      = 1330 -> 642
            # (8 unchanged attributes hidden)
        }
    }

Plan: 0 to add, 1 to change, 1 to destroy.

Changes to Outputs:
  - appInsightsConnectionString   = (sensitive value) -> null

StoneBenHMCTS
StoneBenHMCTS reviewed Jul 10, 2024
View reviewed changes
...uest-hearing/hearing-edit-summary/hearing-timing-section/hearing-timing-section.component.ts Outdated
this.hearingRequestToCompareMainModel.hearingDetails.duration,
this.hearingRequestMainModel.hearingDetails.duration
);
this.hearingLengthChanged = HearingsUtils.hasHearingDurationChagned(this.hearingRequestToCompareMainModel.hearingDetails.duration, this.hearingRequestMainModel.hearingDetails.duration);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same spelling mistake

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved, thank you

StoneBenHMCTS
StoneBenHMCTS reviewed Jul 10, 2024
View reviewed changes
src/hearings/containers/request-hearing/hearing-timing/hearing-timing.component.ts Outdated
this.dateRangeStartChanged = HearingsUtils.hasDateChanged(this.hearingRequestMainModel.hearingDetails.hearingWindow.dateRangeStart, this.serviceHearingValuesModel.hearingWindow.dateRangeStart);
this.dateRangeEndChanged = HearingsUtils.hasDateChanged(this.hearingRequestMainModel.hearingDetails.hearingWindow.dateRangeEnd, this.serviceHearingValuesModel.hearingWindow.dateRangeEnd);
this.firstDateTimeMustBeChanged = HearingsUtils.hasDateChanged(this.hearingRequestMainModel.hearingDetails.hearingWindow.firstDateTimeMustBe, this.serviceHearingValuesModel.hearingWindow.firstDateTimeMustBe);
this.durationChanged = HearingsUtils.hasHearingDurationChagned(this.hearingRequestMainModel.hearingDetails.duration, this.serviceHearingValuesModel.duration);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

spelling

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved, thank you

StoneBenHMCTS
StoneBenHMCTS reviewed Jul 10, 2024
View reviewed changes
Copy link
Contributor

@StoneBenHMCTS StoneBenHMCTS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just need to fix the method name spelling issue!

@StoneBenHMCTS StoneBenHMCTS merged commit 8977f37 into feature/CR-84-Sprint-PI-32 Jul 29, 2024
3 checks passed
@StoneBenHMCTS StoneBenHMCTS deleted the EXUI-1851 branch July 29, 2024 09:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@StoneBenHMCTS StoneBenHMCTS StoneBenHMCTS approved these changes

Assignees
No one assigned
Labels
aat/destroy enable_keep_helm enable_keep_helm ns:xui prd:xui prod/destroy
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@anthonydummer @StoneBenHMCTS