Skip to content

[SG-390] Fix for missing org items with single org & personal ownership enabled#1953

Merged
mpbw2 merged 3 commits intomasterfrom
bugfix-vaultfilter
Jun 15, 2022
Merged

[SG-390] Fix for missing org items with single org & personal ownership enabled#1953
mpbw2 merged 3 commits intomasterfrom
bugfix-vaultfilter

Conversation

@mpbw2
Copy link
Contributor

@mpbw2 mpbw2 commented Jun 15, 2022

Type of change

  • Bug fix
  • New feature development
  • Tech debt (refactoring, code cleanup, dependency upgrades, etc)
  • Build/deploy pipeline (DevOps)
  • Other

Objective

This fixes an issue where org items were not appearing when the vault filter control was hidden due to the single org and personal ownership policies both being enabled.

Code changes

  • VaultFilterViewModel.cs: Update logic to handle mixed policy variations/changes better on initial load and refresh. A delay is required before setting ShowVaultFilter to properly draw the org name in the vault filter if the filter was previously hidden but now shown after a refresh.

Before you submit

  • I have checked for formatting errors (dotnet tool run dotnet-format --check) (required)
  • I have added unit tests where it makes sense to do so (encouraged but not required)
  • This change requires a documentation update (notify the documentation team)
  • This change has particular deployment requirements (notify the DevOps team)

@mpbw2 mpbw2 changed the title Fix for missing org items with single org & personal ownership enabled [SG-390] Fix for missing org items with single org & personal ownership enabled Jun 15, 2022
@mpbw2 mpbw2 requested review from a team and fedemkr June 15, 2022 13:42
@mpbw2 mpbw2 enabled auto-merge (squash) June 15, 2022 13:47
_hideMyVaultFilterOption = await policyService.PolicyAppliesToUser(PolicyType.PersonalOwnership);
if (_vaultFilterSelection == null)
_personalOwnershipPolicyApplies = await policyService.PolicyAppliesToUser(PolicyType.PersonalOwnership);
_singleOrgPolicyApplies = await policyService.PolicyAppliesToUser(PolicyType.OnlyOrg);
Copy link
Member

Choose a reason for hiding this comment

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

_singleOrgPolicyApplies doesn't need to be a field, it can be a var or directly put the await call inside the if

@mpbw2 mpbw2 requested a review from fedemkr June 15, 2022 14:35
@mpbw2 mpbw2 merged commit c53a85c into master Jun 15, 2022
@mpbw2 mpbw2 deleted the bugfix-vaultfilter branch June 15, 2022 14:43
mpbw2 added a commit that referenced this pull request Jun 15, 2022
…ip enabled (#1953)

* fix for missing org items with single org & personal ownership enabled

* fix for ui issue with vault filter state change on pull to refresh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants