Working

transcend-io · Oct 18, 2023 · 5839716 · 5839716
1 parent aca82ac
commit 5839716
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/graphql/fetchAllUsers.ts b/src/graphql/fetchAllUsers.ts
@@ -1,5 +1,5 @@
 import { GraphQLClient } from 'graphql-request';
-import { TEAMS } from './gqls';
+import { USERS } from './gqls';
 import { makeGraphQLRequest } from './makeGraphQLRequest';
 
 export interface User {
@@ -35,7 +35,7 @@ export async function fetchAllUsers(client: GraphQLClient): Promise<User[]> {
         /** List */
         nodes: User[];
       };
-    }>(client, TEAMS, {
+    }>(client, USERS, {
       first: PAGE_SIZE,
       offset,
     });

diff --git a/src/graphql/gqls/dataPoint.ts b/src/graphql/gqls/dataPoint.ts
@@ -101,6 +101,8 @@ export const UPDATE_OR_CREATE_DATA_POINT = gql`
     $path: [String!]
     $title: String
     $description: String
+    $ownerIds: [ID!]
+    $teamIds: [ID!]
     $dataCollectionTag: String
     $querySuggestions: [DbIntegrationQuerySuggestionInput!]
     $enabledActions: [RequestActionObjectResolver!]
@@ -114,6 +116,8 @@ export const UPDATE_OR_CREATE_DATA_POINT = gql`
         title: $title
         dataCollectionTag: $dataCollectionTag
         description: $description
+        ownerIds: $ownerIds
+        teamIds: $teamIds
         querySuggestions: $querySuggestions
         enabledActions: $enabledActions
         subDataPoints: $subDataPoints

diff --git a/src/graphql/gqls/user.ts b/src/graphql/gqls/user.ts
@@ -7,15 +7,15 @@ export const USERS = gql`
   query TranscendCliUsers(
     $first: Int!
     $offset: Int!
-    $input: TeamFiltersInput
+    $input: UserFiltersInput
   ) {
     users(
       first: $first
       offset: $offset
       filterBy: $input
       orderBy: [
         { field: createdAt, direction: ASC }
-        { field: email, direction: ASC }
+        { field: name, direction: ASC }
       ]
     ) {
       nodes {

diff --git a/src/graphql/syncDataSilos.ts b/src/graphql/syncDataSilos.ts
@@ -10,7 +10,6 @@ import { GraphQLClient } from 'graphql-request';
 import { logger } from '../logger';
 import colors from 'colors';
 import { mapSeries, map } from 'bluebird';
-import keyBy from 'lodash/keyBy';
 import {
   DATA_SILOS,
   CREATE_DATA_SILOS,
@@ -38,7 +37,7 @@ import { makeGraphQLRequest } from './makeGraphQLRequest';
 import { apply } from '@transcend-io/type-utils';
 import { fetchAllUsers } from './fetchAllUsers';
 import { fetchAllTeams } from './fetchAllTeams';
-import { pickBy } from 'lodash';
+import { keyBy } from 'lodash';
 
 export interface DataSiloAttributeValue {
   /** Key associated to value */
@@ -799,11 +798,11 @@ export async function syncDataSilos(
   let teamNameToTeamId: { [k in string]: string } = {};
   if (ownerEmails.length > 0) {
     const users = await fetchAllUsers(client);
-    emailToUserId = apply(pickBy(users, 'email'), ({ id }) => id);
+    emailToUserId = apply(keyBy(users, 'email'), ({ id }) => id);
   }
   if (teamNames.length > 0) {
     const teams = await fetchAllTeams(client);
-    teamNameToTeamId = apply(pickBy(teams, 'name'), ({ id }) => id);
+    teamNameToTeamId = apply(keyBy(teams, 'name'), ({ id }) => id);
   }
 
   await map(
@@ -856,14 +855,14 @@ export async function syncDataSilos(
               description: datapoint.description,
               ...(datapoint.owners
                 ? {
-                    owners: datapoint.owners
+                    ownerIds: datapoint.owners
                       .map((email) => emailToUserId[email])
                       .filter((x) => !!x),
                   }
                 : {}),
               ...(datapoint.teams
                 ? {
-                    teams: datapoint.teams
+                    teamIds: datapoint.teams
                       .map((name) => teamNameToTeamId[name])
                       .filter((x) => !!x),
                   }