Skip to content

myTracker View #3925

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
lcampbell2 merged 46 commits into from
Oct 4, 2022
Merged

myTracker View #3925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
38fc313
org-level tags input for create/update domain mutations
lcampbell2 Jul 19, 2022
692946f
add org-level tags to find/loadOrgBySlug
lcampbell2 Jul 19, 2022
cbf7393
fix query/loader for claim tags
lcampbell2 Jul 19, 2022
a6e0e7a
show claim tags on admin page
lcampbell2 Jul 19, 2022
3882941
tags visible on orgDetails page
lcampbell2 Jul 19, 2022
4c0e51b
change mutation input name to 'tags'
lcampbell2 Jul 20, 2022
2ba0d1d
adding/removing claim tags on admin page
lcampbell2 Jul 20, 2022
a6f69cc
new tag adding UI
lcampbell2 Jul 21, 2022
857480a
fix create-domain bug
lcampbell2 Jul 26, 2022
92bb4f0
domain tag enums
lcampbell2 Jul 26, 2022
6169fb2
change tag file names
lcampbell2 Jul 26, 2022
2668051
fix enum index.js
lcampbell2 Jul 26, 2022
2b266e0
add french labels to tags
lcampbell2 Jul 26, 2022
a3b2a3f
translated tags on org page
lcampbell2 Jul 27, 2022
1469af7
fix tests
lcampbell2 Jul 28, 2022
901e24a
fix loader test
lcampbell2 Jul 28, 2022
702bb4c
domain card styling
lcampbell2 Jul 28, 2022
80611d5
remove commented code
lcampbell2 Jul 28, 2022
4ea10d2
user favourite domain mutation
lcampbell2 Aug 3, 2022
d18e63e
add favourite btn to DomainCard
lcampbell2 Aug 3, 2022
db5b11b
create query + loaders for user claimed domains
lcampbell2 Aug 3, 2022
c1f29e3
remove favourited domain mutation
lcampbell2 Aug 4, 2022
02c955d
fix query + loader
lcampbell2 Aug 4, 2022
a502506
new faker schema
lcampbell2 Aug 4, 2022
8e57a6a
myTracker page init
lcampbell2 Aug 4, 2022
9d2881d
myTracker domain list working
lcampbell2 Aug 5, 2022
41ca651
update translations
lcampbell2 Aug 5, 2022
df2cf29
add api descriptions
lcampbell2 Aug 5, 2022
88b7d5e
db collection names array in one file
lcampbell2 Aug 5, 2022
ffea2d2
frontend tests
lcampbell2 Aug 5, 2022
f959f7a
fix collection names file location
lcampbell2 Aug 8, 2022
d715fce
change unfavourite btn to star
lcampbell2 Aug 8, 2022
31cab3d
api tests
lcampbell2 Aug 10, 2022
dc7324a
translate tags in loader
lcampbell2 Aug 15, 2022
f60a73d
fix tag object
lcampbell2 Aug 16, 2022
bf18e6f
add language to load-domain-conn-org-id tests
lcampbell2 Aug 16, 2022
183f423
Merge branch 'master' into user-generated-tags
lcampbell2 Sep 27, 2022
a622cba
fix bug in loader
lcampbell2 Sep 28, 2022
e297160
add AB testing
lcampbell2 Sep 28, 2022
3b7508b
Merge branch 'master' into user-generated-tags
lcampbell2 Sep 28, 2022
8e63b52
Merge branch 'user-generated-tags' into my-tracker-view
lcampbell2 Sep 28, 2022
66e43a7
add AB testing
lcampbell2 Sep 28, 2022
85e0f2b
Merge branch 'master' into my-tracker-view
lcampbell2 Sep 28, 2022
837c8f6
translations
lcampbell2 Sep 28, 2022
9fdff8a
fix mocking schema
lcampbell2 Oct 3, 2022
7768370
fix test
lcampbell2 Oct 4, 2022
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
9 changes: 9 additions & 0 deletions api/database.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,15 @@
"numberOfShards": 6
}
},
{
"type": "edgecollection",
"name": "favourites",
"options": {
"replicationFactor": 3,
"writeConcern": 1,
"numberOfShards": 6
}
},
Comment thread
lcampbell2 marked this conversation as resolved.
{
"type": "edgecollection",
"name": "domainsDKIM",
Expand Down
34 changes: 1 addition & 33 deletions api/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Server } from './src/server'
import { createContext } from './src/create-context'
import { createI18n } from './src/create-i18n'
import { connect, JSONCodec } from 'nats'
import { collectionNames as collections } from './src/collection-names'

const {
PORT = 4000,
Expand All @@ -21,39 +22,6 @@ const {
NATS_URL,
} = process.env

const collections = [
'users',
'organizations',
'domains',
'dkim',
'dkimResults',
'dmarc',
'spf',
'https',
'ssl',
'dkimGuidanceTags',
'dmarcGuidanceTags',
'spfGuidanceTags',
'httpsGuidanceTags',
'sslGuidanceTags',
'chartSummaries',
'dmarcSummaries',
'aggregateGuidanceTags',
'scanSummaryCriteria',
'chartSummaryCriteria',
'scanSummaries',
'affiliations',
'claims',
'domainsDKIM',
'dkimToDkimResults',
'domainsDMARC',
'domainsSPF',
'domainsHTTPS',
'domainsSSL',
'ownership',
'domainsToDmarcSummaries',
]

;(async () => {
const db = new Database({
url,
Expand Down
34 changes: 1 addition & 33 deletions api/src/affiliation/mutations/__tests__/invite-user-to-org.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,42 +17,10 @@ import { cleanseInput } from '../../../validators'
import { loadOrgByKey } from '../../../organization/loaders'
import { loadUserByKey, loadUserByUserName } from '../../../user/loaders'
import dbschema from '../../../../database.json'
import { collectionNames } from '../../../collection-names'

const { DB_PASS: rootPass, DB_URL: url, SIGN_IN_KEY } = process.env

const collectionNames = [
'users',
'organizations',
'domains',
'dkim',
'dkimResults',
'dmarc',
'spf',
'https',
'ssl',
'dkimGuidanceTags',
'dmarcGuidanceTags',
'spfGuidanceTags',
'httpsGuidanceTags',
'sslGuidanceTags',
'chartSummaries',
'dmarcSummaries',
'aggregateGuidanceTags',
'scanSummaryCriteria',
'chartSummaryCriteria',
'scanSummaries',
'affiliations',
'claims',
'domainsDKIM',
'dkimToDkimResults',
'domainsDMARC',
'domainsSPF',
'domainsHTTPS',
'domainsSSL',
'ownership',
'domainsToDmarcSummaries',
]

describe('invite user to org', () => {
let query,
drop,
Expand Down
34 changes: 1 addition & 33 deletions api/src/affiliation/mutations/__tests__/leave-organization.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,10 @@ import { cleanseInput } from '../../../validators'
import { createMutationSchema } from '../../../mutation'
import { createQuerySchema } from '../../../query'
import dbschema from '../../../../database.json'
import { collectionNames } from '../../../collection-names'

const { DB_PASS: rootPass, DB_URL: url, SIGN_IN_KEY } = process.env

const collectionNames = [
'users',
'organizations',
'domains',
'dkim',
'dkimResults',
'dmarc',
'spf',
'https',
'ssl',
'dkimGuidanceTags',
'dmarcGuidanceTags',
'spfGuidanceTags',
'httpsGuidanceTags',
'sslGuidanceTags',
'chartSummaries',
'dmarcSummaries',
'aggregateGuidanceTags',
'scanSummaryCriteria',
'chartSummaryCriteria',
'scanSummaries',
'affiliations',
'claims',
'domainsDKIM',
'dkimToDkimResults',
'domainsDMARC',
'domainsSPF',
'domainsHTTPS',
'domainsSSL',
'ownership',
'domainsToDmarcSummaries',
]

describe('given a successful leave', () => {
let query,
drop,
Expand Down
34 changes: 1 addition & 33 deletions api/src/affiliation/mutations/__tests__/remove-user-from-org.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,10 @@ import { loadOrgByKey } from '../../../organization/loaders'
import { loadUserByKey } from '../../../user/loaders'
import { loadAffiliationByKey } from '../../loaders'
import dbschema from '../../../../database.json'
import { collectionNames } from '../../../collection-names'

const { DB_PASS: rootPass, DB_URL: url } = process.env

const collectionNames = [
'users',
'organizations',
'domains',
'dkim',
'dkimResults',
'dmarc',
'spf',
'https',
'ssl',
'dkimGuidanceTags',
'dmarcGuidanceTags',
'spfGuidanceTags',
'httpsGuidanceTags',
'sslGuidanceTags',
'chartSummaries',
'dmarcSummaries',
'aggregateGuidanceTags',
'scanSummaryCriteria',
'chartSummaryCriteria',
'scanSummaries',
'affiliations',
'claims',
'domainsDKIM',
'dkimToDkimResults',
'domainsDMARC',
'domainsSPF',
'domainsHTTPS',
'domainsSSL',
'ownership',
'domainsToDmarcSummaries',
]

const orgOneData = {
verified: true,
summaries: {
Expand Down
34 changes: 1 addition & 33 deletions api/src/affiliation/mutations/__tests__/transfer-org-ownership.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,10 @@ import { cleanseInput } from '../../../validators'
import { createMutationSchema } from '../../../mutation'
import { createQuerySchema } from '../../../query'
import dbschema from '../../../../database.json'
import { collectionNames } from '../../../collection-names'

const { DB_PASS: rootPass, DB_URL: url, SIGN_IN_KEY } = process.env

const collectionNames = [
'users',
'organizations',
'domains',
'dkim',
'dkimResults',
'dmarc',
'spf',
'https',
'ssl',
'dkimGuidanceTags',
'dmarcGuidanceTags',
'spfGuidanceTags',
'httpsGuidanceTags',
'sslGuidanceTags',
'chartSummaries',
'dmarcSummaries',
'aggregateGuidanceTags',
'scanSummaryCriteria',
'chartSummaryCriteria',
'scanSummaries',
'affiliations',
'claims',
'domainsDKIM',
'dkimToDkimResults',
'domainsDMARC',
'domainsSPF',
'domainsHTTPS',
'domainsSSL',
'ownership',
'domainsToDmarcSummaries',
]

describe('given the transferOrgOwnership mutation', () => {
let query,
drop,
Expand Down
34 changes: 1 addition & 33 deletions api/src/affiliation/mutations/__tests__/update-user-role.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,42 +17,10 @@ import {
import { loadUserByUserName, loadUserByKey } from '../../../user/loaders'
import { loadOrgByKey } from '../../../organization/loaders'
import dbschema from '../../../../database.json'
import { collectionNames } from '../../../collection-names'

const { DB_PASS: rootPass, DB_URL: url } = process.env

const collectionNames = [
'users',
'organizations',
'domains',
'dkim',
'dkimResults',
'dmarc',
'spf',
'https',
'ssl',
'dkimGuidanceTags',
'dmarcGuidanceTags',
'spfGuidanceTags',
'httpsGuidanceTags',
'sslGuidanceTags',
'chartSummaries',
'dmarcSummaries',
'aggregateGuidanceTags',
'scanSummaryCriteria',
'chartSummaryCriteria',
'scanSummaries',
'affiliations',
'claims',
'domainsDKIM',
'dkimToDkimResults',
'domainsDMARC',
'domainsSPF',
'domainsHTTPS',
'domainsSSL',
'ownership',
'domainsToDmarcSummaries',
]

describe('update a users role', () => {
let query, drop, truncate, schema, collections, transaction, i18n, user

Expand Down
33 changes: 33 additions & 0 deletions api/src/collection-names.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
export const collectionNames = [
'users',
'organizations',
'domains',
'dkim',
'dkimResults',
'dmarc',
'spf',
'https',
'ssl',
'dkimGuidanceTags',
'dmarcGuidanceTags',
'spfGuidanceTags',
'httpsGuidanceTags',
'sslGuidanceTags',
'chartSummaries',
'dmarcSummaries',
'aggregateGuidanceTags',
'scanSummaryCriteria',
'chartSummaryCriteria',
'scanSummaries',
'affiliations',
'claims',
'favourites',
'domainsDKIM',
'dkimToDkimResults',
'domainsDMARC',
'domainsSPF',
'domainsHTTPS',
'domainsSSL',
'ownership',
'domainsToDmarcSummaries',
]
12 changes: 11 additions & 1 deletion api/src/domain/loaders/load-domain-connections-by-user-id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const loadDomainConnectionsByUserId =
ownership,
orderBy,
isSuperAdmin,
myTracker,
search,
}) => {
const userDBId = `users/${userKey}`
Expand Down Expand Up @@ -326,7 +327,16 @@ export const loadDomainConnectionsByUserId =
}

let domainKeysQuery
if (!loginRequiredBool) {
if (myTracker) {
domainKeysQuery = aql`
WITH favourites
LET domainKeys = (
FOR v, e IN 1..1 OUTBOUND ${userDBId} favourites
OPTIONS {bfs: true}
RETURN v._key
)
`
} else if (!loginRequiredBool) {
domainKeysQuery = aql`
WITH affiliations, domains, organizations, users, domainSearch, claims, ownership
LET domainKeys = UNIQUE(FLATTEN(
Expand Down
34 changes: 1 addition & 33 deletions api/src/domain/mutations/__tests__/create-domain.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,42 +23,10 @@ import {
} from '../../../organization/loaders'
import { loadUserByKey } from '../../../user/loaders'
import dbschema from '../../../../database.json'
import { collectionNames } from '../../../collection-names'

const { DB_PASS: rootPass, DB_URL: url, HASHING_SECRET } = process.env

const collectionNames = [
'users',
'organizations',
'domains',
'dkim',
'dkimResults',
'dmarc',
'spf',
'https',
'ssl',
'dkimGuidanceTags',
'dmarcGuidanceTags',
'spfGuidanceTags',
'httpsGuidanceTags',
'sslGuidanceTags',
'chartSummaries',
'dmarcSummaries',
'aggregateGuidanceTags',
'scanSummaryCriteria',
'chartSummaryCriteria',
'scanSummaries',
'affiliations',
'claims',
'domainsDKIM',
'dkimToDkimResults',
'domainsDMARC',
'domainsSPF',
'domainsHTTPS',
'domainsSSL',
'ownership',
'domainsToDmarcSummaries',
]

describe('create a domain', () => {
let query, drop, truncate, schema, collections, transaction, user, org

Expand Down
Loading