Skip to content

Fix Super Admin Org Filter #2395

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

Merged
nsdeschenes merged 1 commit into from
Jun 8, 2021
Merged

Fix Super Admin Org Filter #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions api-js/src/organization/loaders/__tests__/load-organization-connections-by-domain-id.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2273,7 +2273,7 @@ describe('given the load organizations connection function', () => {
},
orgDetails: {
en: {
slug: 'sa',
slug: 'super-admin',
acronym: 'SA',
name: 'Super Admin',
zone: 'zone sa',
Expand All @@ -2283,7 +2283,7 @@ describe('given the load organizations connection function', () => {
city: 'city two',
},
fr: {
slug: 'sa',
slug: 'super-admin',
acronym: 'SA',
name: 'Super Admin',
zone: 'zone sa',
Expand Down Expand Up @@ -4529,7 +4529,7 @@ describe('given the load organizations connection function', () => {
},
orgDetails: {
en: {
slug: 'sa',
slug: 'super-admin',
acronym: 'SA',
name: 'Super Admin',
zone: 'zone sa',
Expand All @@ -4539,7 +4539,7 @@ describe('given the load organizations connection function', () => {
city: 'city two',
},
fr: {
slug: 'sa',
slug: 'super-admin',
acronym: 'SA',
name: 'Super Admin',
zone: 'zone sa',
Expand Down
8 changes: 4 additions & 4 deletions api-js/src/organization/loaders/__tests__/load-organization-connections-by-user-id.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2312,7 +2312,7 @@ describe('given the load organization connections by user id function', () => {
},
orgDetails: {
en: {
slug: 'sa',
slug: 'super-admin',
acronym: 'SA',
name: 'Super Admin Org',
zone: 'zone sa',
Expand All @@ -2322,7 +2322,7 @@ describe('given the load organization connections by user id function', () => {
city: 'city sa',
},
fr: {
slug: 'sa',
slug: 'super-admin',
acronym: 'SA',
name: 'Super Admin Org',
zone: 'zone sa',
Expand Down Expand Up @@ -4635,7 +4635,7 @@ describe('given the load organization connections by user id function', () => {
},
orgDetails: {
en: {
slug: 'sa',
slug: 'super-admin',
acronym: 'SA',
name: 'Super Admin Org',
zone: 'zone sa',
Expand All @@ -4645,7 +4645,7 @@ describe('given the load organization connections by user id function', () => {
city: 'city sa',
},
fr: {
slug: 'sa',
slug: 'super-admin',
acronym: 'SA',
name: 'Super Admin Org',
zone: 'zone sa',
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/organization/loaders/load-organization-connections-by-domain-id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ export const loadOrgConnectionsByDomainId = ({

let includeSuperAdminOrgQuery = aql``
if (!includeSuperAdminOrg) {
includeSuperAdminOrgQuery = aql`FILTER org.orgDetails.en.slug != "sa" OR org.orgDetails.fr.slug != "sa"`
includeSuperAdminOrgQuery = aql`FILTER org.orgDetails.en.slug != "super-admin" OR org.orgDetails.fr.slug != "super-admin"`
}

let orgKeysQuery
Expand Down
2 changes: 1 addition & 1 deletion api-js/src/organization/loaders/load-organization-connections-by-user-id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ export const loadOrgConnectionsByUserId = ({

let includeSuperAdminOrgQuery = aql``
if (!includeSuperAdminOrg) {
includeSuperAdminOrgQuery = aql`FILTER org.orgDetails.en.slug != "sa" OR org.orgDetails.fr.slug != "sa"`
includeSuperAdminOrgQuery = aql`FILTER org.orgDetails.en.slug != "super-admin" OR org.orgDetails.fr.slug != "super-admin"`
}

let orgKeysQuery
Expand Down