-
Notifications
You must be signed in to change notification settings - Fork 1.6k
[PM-32066] - Add Org Ability View #7194
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
Open
jrmccannon
wants to merge
6
commits into
main
Choose a base branch
from
jmccannon/ac/pm-32066-add-new-org-ability
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+165
β0
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
689519c
Added sproc, view, repo methods, and tests.
jrmccannon 341f9f7
fixing inconsistency
jrmccannon 99f37e1
changed up test a bit
jrmccannon 533dc50
adding empty object check to EF query.
jrmccannon e598f4e
Switching to constructor
jrmccannon 527e9f1
aligning test
jrmccannon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/Sql/dbo/Stored Procedures/Organization_ReadAbilityById.sql
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| CREATE PROCEDURE [dbo].[Organization_ReadAbilityById] | ||
| @Id UNIQUEIDENTIFIER | ||
| AS | ||
| BEGIN | ||
| SET NOCOUNT ON | ||
|
|
||
| SELECT | ||
| * | ||
| FROM | ||
| [dbo].[OrganizationAbilityView] | ||
| WHERE | ||
| [Id] = @Id | ||
| END |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| CREATE VIEW [dbo].[OrganizationAbilityView] | ||
| AS | ||
| SELECT | ||
| [Id], | ||
| [UseEvents], | ||
| [Use2fa], | ||
| IIF([Use2fa] = 1 AND [TwoFactorProviders] IS NOT NULL AND [TwoFactorProviders] != '{}', 1, 0) AS [Using2fa], | ||
jrmccannon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| [UsersGetPremium], | ||
| [Enabled], | ||
| [UseSso], | ||
| [UseKeyConnector], | ||
| [UseScim], | ||
| [UseResetPassword], | ||
| [UseCustomPermissions], | ||
| [UsePolicies], | ||
| [LimitCollectionCreation], | ||
| [LimitCollectionDeletion], | ||
| [LimitItemDeletion], | ||
| [AllowAdminAccessToAllCollectionItems], | ||
| [UseRiskInsights], | ||
| [UseOrganizationDomains], | ||
| [UseAdminSponsoredFamilies], | ||
| [UseAutomaticUserConfirmation], | ||
| [UseDisableSmAdsForUsers], | ||
| [UsePhishingBlocker], | ||
| [UseMyItems] | ||
| FROM | ||
| [dbo].[Organization] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
util/Migrator/DbScripts/2026-03-09_00_AddOrganizationAbilityView.sql
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| CREATE OR ALTER VIEW [dbo].[OrganizationAbilityView] | ||
| AS | ||
| SELECT | ||
| [Id], | ||
| [UseEvents], | ||
| [Use2fa], | ||
| IIF([Use2fa] = 1 AND [TwoFactorProviders] IS NOT NULL AND [TwoFactorProviders] != '{}', 1, 0) AS [Using2fa], | ||
| [UsersGetPremium], | ||
| [Enabled], | ||
| [UseSso], | ||
| [UseKeyConnector], | ||
| [UseScim], | ||
| [UseResetPassword], | ||
| [UseCustomPermissions], | ||
| [UsePolicies], | ||
| [LimitCollectionCreation], | ||
| [LimitCollectionDeletion], | ||
| [LimitItemDeletion], | ||
| [AllowAdminAccessToAllCollectionItems], | ||
| [UseRiskInsights], | ||
| [UseOrganizationDomains], | ||
| [UseAdminSponsoredFamilies], | ||
| [UseAutomaticUserConfirmation], | ||
| [UseDisableSmAdsForUsers], | ||
| [UsePhishingBlocker], | ||
| [UseMyItems] | ||
| FROM | ||
| [dbo].[Organization] | ||
| GO | ||
|
|
||
| CREATE OR ALTER PROCEDURE [dbo].[Organization_ReadAbilityById] | ||
| @Id UNIQUEIDENTIFIER | ||
| AS | ||
| BEGIN | ||
| SET NOCOUNT ON | ||
|
|
||
| SELECT | ||
| * | ||
| FROM | ||
| [dbo].[OrganizationAbilityView] | ||
| WHERE | ||
| [Id] = @Id | ||
| END | ||
| GO |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
β Is this view necessary? We already have a view called
OrganizationViewthat contains all of the columns in theOrganizationtable. Can you just select the columns you need fromOrganizationViewin your stored procedure?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was done according to our contributing docs.