btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

refactor: update ID based backend queries to proper types

Browse Source
This commit is contained in:
Andrew Bastin
2021-09-30 12:52:31 +05:30
parent 728515c225
commit c71333d9cb
6 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/hoppscotch-app/components/collections/index.vue
View File

@@ -506,7 +506,7 @@ export default defineComponent({
mutation: gql` mutation: gql`
mutation CreateChildCollection( mutation CreateChildCollection(
$childTitle: String! $childTitle: String!
$collectionID: String! $collectionID: ID!
) { ) {
createChildCollection( createChildCollection(
childTitle: $childTitle childTitle: $childTitle
@@ -613,7 +613,7 @@ export default defineComponent({
.mutate({ .mutate({
// Query // Query
mutation: gql` mutation: gql`
mutation ($collectionID: String!) { mutation ($collectionID: ID!) {
deleteCollection(collectionID: $collectionID) deleteCollection(collectionID: $collectionID)
} }
`, `,

12
packages/hoppscotch-app/helpers/teams/TeamCollectionAdapter.ts
View File

@@ -382,7 +382,7 @@ export default class TeamCollectionAdapter {
this.teamCollectionAdded$ = apolloClient this.teamCollectionAdded$ = apolloClient
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamCollectionAdded($teamID: String!) { subscription TeamCollectionAdded($teamID: ID!) {
teamCollectionAdded(teamID: $teamID) { teamCollectionAdded(teamID: $teamID) {
id id
title title
@@ -411,7 +411,7 @@ export default class TeamCollectionAdapter {
this.teamCollectionUpdated$ = apolloClient this.teamCollectionUpdated$ = apolloClient
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamCollectionUpdated($teamID: String!) { subscription TeamCollectionUpdated($teamID: ID!) {
teamCollectionUpdated(teamID: $teamID) { teamCollectionUpdated(teamID: $teamID) {
id id
title title
@@ -435,7 +435,7 @@ export default class TeamCollectionAdapter {
this.teamCollectionRemoved$ = apolloClient this.teamCollectionRemoved$ = apolloClient
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamCollectionRemoved($teamID: String!) { subscription TeamCollectionRemoved($teamID: ID!) {
teamCollectionRemoved(teamID: $teamID) teamCollectionRemoved(teamID: $teamID)
} }
`, `,
@@ -450,7 +450,7 @@ export default class TeamCollectionAdapter {
this.teamRequestAdded$ = apolloClient this.teamRequestAdded$ = apolloClient
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamRequestAdded($teamID: String!) { subscription TeamRequestAdded($teamID: ID!) {
teamRequestAdded(teamID: $teamID) { teamRequestAdded(teamID: $teamID) {
id id
collectionID collectionID
@@ -477,7 +477,7 @@ export default class TeamCollectionAdapter {
this.teamRequestUpdated$ = apolloClient this.teamRequestUpdated$ = apolloClient
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamRequestUpdated($teamID: String!) { subscription TeamRequestUpdated($teamID: ID!) {
teamRequestUpdated(teamID: $teamID) { teamRequestUpdated(teamID: $teamID) {
id id
collectionID collectionID
@@ -502,7 +502,7 @@ export default class TeamCollectionAdapter {
this.teamRequestDeleted$ = apolloClient this.teamRequestDeleted$ = apolloClient
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamRequestDeleted($teamID: String!) { subscription TeamRequestDeleted($teamID: ID!) {
teamRequestDeleted(teamID: $teamID) teamRequestDeleted(teamID: $teamID)
} }
`, `,

8
packages/hoppscotch-app/helpers/teams/TeamMemberAdapter.ts
View File

@@ -56,7 +56,7 @@ export default class TeamMemberAdapter {
while (true) { while (true) {
const response: Apollo.ApolloQueryResult<any> = await apolloClient.query({ const response: Apollo.ApolloQueryResult<any> = await apolloClient.query({
query: gql` query: gql`
query GetTeamMembers($teamID: String!, $cursor: String) { query GetTeamMembers($teamID: ID!, $cursor: ID) {
team(teamID: $teamID) { team(teamID: $teamID) {
members(cursor: $cursor) { members(cursor: $cursor) {
membershipID membershipID
@@ -92,7 +92,7 @@ export default class TeamMemberAdapter {
this.teamMemberAdded$ = apolloClient this.teamMemberAdded$ = apolloClient
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamMemberAdded($teamID: String!) { subscription TeamMemberAdded($teamID: ID!) {
teamMemberAdded(teamID: $teamID) { teamMemberAdded(teamID: $teamID) {
user { user {
uid uid
@@ -113,7 +113,7 @@ export default class TeamMemberAdapter {
this.teamMemberRemoved$ = apolloClient this.teamMemberRemoved$ = apolloClient
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamMemberRemoved($teamID: String!) { subscription TeamMemberRemoved($teamID: ID!) {
teamMemberRemoved(teamID: $teamID) teamMemberRemoved(teamID: $teamID)
} }
`, `,
@@ -132,7 +132,7 @@ export default class TeamMemberAdapter {
this.teamMemberUpdated$ = apolloClient this.teamMemberUpdated$ = apolloClient
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamMemberUpdated($teamID: String!) { subscription TeamMemberUpdated($teamID: ID!) {
teamMemberUpdated(teamID: $teamID) { teamMemberUpdated(teamID: $teamID) {
user { user {
uid uid

53
packages/hoppscotch-app/helpers/teams/utils.js
View File

@@ -14,7 +14,7 @@ export async function getLiveTeamMembersList(apollo, teamID) {
const { data } = await apollo.query({ const { data } = await apollo.query({
query: gql` query: gql`
query GetTeamMembers($teamID: String!) { query GetTeamMembers($teamID: ID!) {
team(teamID: $teamID) { team(teamID: $teamID) {
members { members {
user { user {
@@ -36,7 +36,7 @@ export async function getLiveTeamMembersList(apollo, teamID) {
const addedSub = apollo const addedSub = apollo
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamMemberAdded($teamID: String!) { subscription TeamMemberAdded($teamID: ID!) {
teamMemberAdded(teamID: $teamID) { teamMemberAdded(teamID: $teamID) {
user { user {
uid uid
@@ -57,7 +57,7 @@ export async function getLiveTeamMembersList(apollo, teamID) {
const updateSub = apollo const updateSub = apollo
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamMemberUpdated($teamID: String!) { subscription TeamMemberUpdated($teamID: ID!) {
teamMemberUpdated(teamID: $teamID) { teamMemberUpdated(teamID: $teamID) {
user { user {
uid uid
@@ -84,7 +84,7 @@ export async function getLiveTeamMembersList(apollo, teamID) {
const removeSub = apollo const removeSub = apollo
.subscribe({ .subscribe({
query: gql` query: gql`
subscription TeamMemberRemoved($teamID: String!) { subscription TeamMemberRemoved($teamID: ID!) {
teamMemberRemoved(teamID: $teamID) teamMemberRemoved(teamID: $teamID)
} }
`, `,
@@ -134,7 +134,7 @@ export function addTeamMemberByEmail(apollo, userRole, userEmail, teamID) {
mutation addTeamMemberByEmail( mutation addTeamMemberByEmail(
$userRole: TeamMemberRole! $userRole: TeamMemberRole!
$userEmail: String! $userEmail: String!
$teamID: String! $teamID: ID!
) { ) {
addTeamMemberByEmail( addTeamMemberByEmail(
userRole: $userRole userRole: $userRole
@@ -159,7 +159,7 @@ export function updateTeamMemberRole(apollo, userID, newRole, teamID) {
mutation updateTeamMemberRole( mutation updateTeamMemberRole(
$newRole: TeamMemberRole! $newRole: TeamMemberRole!
$userUid: String! $userUid: String!
$teamID: String! $teamID: ID!
) { ) {
updateTeamMemberRole( updateTeamMemberRole(
newRole: $newRole newRole: $newRole
@@ -181,7 +181,7 @@ export function updateTeamMemberRole(apollo, userID, newRole, teamID) {
export function renameTeam(apollo, name, teamID) { export function renameTeam(apollo, name, teamID) {
return apollo.mutate({ return apollo.mutate({
mutation: gql` mutation: gql`
mutation renameTeam($newName: String!, $teamID: String!) { mutation renameTeam($newName: String!, $teamID: ID!) {
renameTeam(newName: $newName, teamID: $teamID) { renameTeam(newName: $newName, teamID: $teamID) {
id id
} }
@@ -197,7 +197,7 @@ export function renameTeam(apollo, name, teamID) {
export function removeTeamMember(apollo, userID, teamID) { export function removeTeamMember(apollo, userID, teamID) {
return apollo.mutate({ return apollo.mutate({
mutation: gql` mutation: gql`
mutation removeTeamMember($userUid: String!, $teamID: String!) { mutation removeTeamMember($userUid: String!, $teamID: ID!) {
removeTeamMember(userUid: $userUid, teamID: $teamID) removeTeamMember(userUid: $userUid, teamID: $teamID)
} }
`, `,
@@ -213,7 +213,7 @@ export async function deleteTeam(apollo, teamID) {
while (true) { while (true) {
response = await apollo.mutate({ response = await apollo.mutate({
mutation: gql` mutation: gql`
mutation ($teamID: String!) { mutation ($teamID: ID!) {
deleteTeam(teamID: $teamID) deleteTeam(teamID: $teamID)
} }
`, `,
@@ -229,7 +229,7 @@ export async function deleteTeam(apollo, teamID) {
export function exitTeam(apollo, teamID) { export function exitTeam(apollo, teamID) {
return apollo.mutate({ return apollo.mutate({
mutation: gql` mutation: gql`
mutation ($teamID: String!) { mutation ($teamID: ID!) {
leaveTeam(teamID: $teamID) leaveTeam(teamID: $teamID)
} }
`, `,
@@ -245,7 +245,7 @@ export async function rootCollectionsOfTeam(apollo, teamID) {
while (true) { while (true) {
const response = await apollo.query({ const response = await apollo.query({
query: gql` query: gql`
query rootCollectionsOfTeam($teamID: String!, $cursor: String!) { query rootCollectionsOfTeam($teamID: ID!, $cursor: ID!) {
rootCollectionsOfTeam(teamID: $teamID, cursor: $cursor) { rootCollectionsOfTeam(teamID: $teamID, cursor: $cursor) {
id id
title title
@@ -271,7 +271,7 @@ export async function getCollectionChildren(apollo, collectionID) {
const children = [] const children = []
const response = await apollo.query({ const response = await apollo.query({
query: gql` query: gql`
query getCollectionChildren($collectionID: String!) { query getCollectionChildren($collectionID: ID!) {
collection(collectionID: $collectionID) { collection(collectionID: $collectionID) {
children { children {
id id
@@ -297,7 +297,7 @@ export async function getCollectionRequests(apollo, collectionID) {
while (true) { while (true) {
const response = await apollo.query({ const response = await apollo.query({
query: gql` query: gql`
query getCollectionRequests($collectionID: String!, $cursor: String) { query getCollectionRequests($collectionID: ID!, $cursor: ID) {
requestsInCollection(collectionID: $collectionID, cursor: $cursor) { requestsInCollection(collectionID: $collectionID, cursor: $cursor) {
id id
title title
@@ -329,7 +329,7 @@ export async function renameCollection(apollo, title, id) {
while (true) { while (true) {
response = await apollo.mutate({ response = await apollo.mutate({
mutation: gql` mutation: gql`
mutation ($newTitle: String!, $collectionID: String!) { mutation ($newTitle: String!, $collectionID: ID!) {
renameCollection(newTitle: $newTitle, collectionID: $collectionID) { renameCollection(newTitle: $newTitle, collectionID: $collectionID) {
id id
} }
@@ -350,7 +350,7 @@ export async function updateRequest(apollo, request, requestName, requestID) {
while (true) { while (true) {
response = await apollo.mutate({ response = await apollo.mutate({
mutation: gql` mutation: gql`
mutation ($data: UpdateTeamRequestInput!, $requestID: String!) { mutation ($data: UpdateTeamRequestInput!, $requestID: ID!) {
updateRequest(data: $data, requestID: $requestID) { updateRequest(data: $data, requestID: $requestID) {
id id
} }
@@ -374,7 +374,7 @@ export async function addChildCollection(apollo, title, id) {
while (true) { while (true) {
response = await apollo.mutate({ response = await apollo.mutate({
mutation: gql` mutation: gql`
mutation ($childTitle: String!, $collectionID: String!) { mutation ($childTitle: String!, $collectionID: ID!) {
createChildCollection( createChildCollection(
childTitle: $childTitle childTitle: $childTitle
collectionID: $collectionID collectionID: $collectionID
@@ -398,7 +398,7 @@ export async function deleteCollection(apollo, id) {
while (true) { while (true) {
response = await apollo.mutate({ response = await apollo.mutate({
mutation: gql` mutation: gql`
mutation ($collectionID: String!) { mutation ($collectionID: ID!) {
deleteCollection(collectionID: $collectionID) deleteCollection(collectionID: $collectionID)
} }
`, `,
@@ -416,7 +416,7 @@ export async function deleteRequest(apollo, requestID) {
while (true) { while (true) {
response = await apollo.mutate({ response = await apollo.mutate({
mutation: gql` mutation: gql`
mutation ($requestID: String!) { mutation ($requestID: ID!) {
deleteRequest(requestID: $requestID) deleteRequest(requestID: $requestID)
} }
`, `,
@@ -434,7 +434,7 @@ export async function createNewRootCollection(apollo, title, id) {
while (true) { while (true) {
response = await apollo.mutate({ response = await apollo.mutate({
mutation: gql` mutation: gql`
mutation ($title: String!, $teamID: String!) { mutation ($title: String!, $teamID: ID!) {
createRootCollection(title: $title, teamID: $teamID) { createRootCollection(title: $title, teamID: $teamID) {
id id
} }
@@ -459,7 +459,7 @@ export async function saveRequestAsTeams(
) { ) {
const x = await apollo.mutate({ const x = await apollo.mutate({
mutation: gql` mutation: gql`
mutation ($data: CreateTeamRequestInput!, $collectionID: String!) { mutation ($data: CreateTeamRequestInput!, $collectionID: ID!) {
createRequestInCollection(data: $data, collectionID: $collectionID) { createRequestInCollection(data: $data, collectionID: $collectionID) {
id id
collection { collection {
@@ -487,10 +487,7 @@ export async function saveRequestAsTeams(
export async function overwriteRequestTeams(apollo, request, title, requestID) { export async function overwriteRequestTeams(apollo, request, title, requestID) {
await apollo.mutate({ await apollo.mutate({
mutation: gql` mutation: gql`
mutation updateRequest( mutation updateRequest($data: UpdateTeamRequestInput!, $requestID: ID!) {
$data: UpdateTeamRequestInput!
$requestID: String!
) {
updateRequest(data: $data, requestID: $requestID) { updateRequest(data: $data, requestID: $requestID) {
id id
title title
@@ -512,7 +509,7 @@ export async function importFromMyCollections(apollo, collectionID, teamID) {
mutation: gql` mutation: gql`
mutation importFromMyCollections( mutation importFromMyCollections(
$fbCollectionPath: String! $fbCollectionPath: String!
$teamID: String! $teamID: ID!
) { ) {
importCollectionFromUserFirestore( importCollectionFromUserFirestore(
fbCollectionPath: $fbCollectionPath fbCollectionPath: $fbCollectionPath
@@ -534,7 +531,7 @@ export async function importFromMyCollections(apollo, collectionID, teamID) {
export async function importFromJSON(apollo, collections, teamID) { export async function importFromJSON(apollo, collections, teamID) {
const response = await apollo.mutate({ const response = await apollo.mutate({
mutation: gql` mutation: gql`
mutation importFromJSON($jsonString: String!, $teamID: String!) { mutation importFromJSON($jsonString: String!, $teamID: ID!) {
importCollectionsFromJSON(jsonString: $jsonString, teamID: $teamID) importCollectionsFromJSON(jsonString: $jsonString, teamID: $teamID)
} }
`, `,
@@ -549,7 +546,7 @@ export async function importFromJSON(apollo, collections, teamID) {
export async function replaceWithJSON(apollo, collections, teamID) { export async function replaceWithJSON(apollo, collections, teamID) {
const response = await apollo.mutate({ const response = await apollo.mutate({
mutation: gql` mutation: gql`
mutation replaceWithJSON($jsonString: String!, $teamID: String!) { mutation replaceWithJSON($jsonString: String!, $teamID: ID!) {
replaceCollectionsWithJSON(jsonString: $jsonString, teamID: $teamID) replaceCollectionsWithJSON(jsonString: $jsonString, teamID: $teamID)
} }
`, `,
@@ -564,7 +561,7 @@ export async function replaceWithJSON(apollo, collections, teamID) {
export async function exportAsJSON(apollo, teamID) { export async function exportAsJSON(apollo, teamID) {
const response = await apollo.query({ const response = await apollo.query({
query: gql` query: gql`
query exportAsJSON($teamID: String!) { query exportAsJSON($teamID: ID!) {
exportCollectionsToJSON(teamID: $teamID) exportCollectionsToJSON(teamID: $teamID)
} }
`, `,

1
packages/hoppscotch-app/package.json
View File

@@ -48,6 +48,7 @@
"graphql": "^15.6.0", "graphql": "^15.6.0",
"graphql-language-service-interface": "^2.8.4", "graphql-language-service-interface": "^2.8.4",
"graphql-language-service-parser": "^1.9.2", "graphql-language-service-parser": "^1.9.2",
"graphql-tag": "^2.12.5",
"json-loader": "^0.5.7", "json-loader": "^0.5.7",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mustache": "^4.2.0", "mustache": "^4.2.0",

8
pnpm-lock.yaml generated
View File

@@ -69,6 +69,7 @@ importers:
graphql: ^15.6.0 graphql: ^15.6.0
graphql-language-service-interface: ^2.8.4 graphql-language-service-interface: ^2.8.4
graphql-language-service-parser: ^1.9.2 graphql-language-service-parser: ^1.9.2
graphql-tag: ^2.12.5
jest: ^27.2.2 jest: ^27.2.2
jest-serializer-vue: ^2.0.2 jest-serializer-vue: ^2.0.2
json-loader: ^0.5.7 json-loader: ^0.5.7
@@ -127,6 +128,7 @@ importers:
graphql: 15.6.0 graphql: 15.6.0
graphql-language-service-interface: 2.8.4_graphql@15.6.0 graphql-language-service-interface: 2.8.4_graphql@15.6.0
graphql-language-service-parser: 1.9.2_graphql@15.6.0 graphql-language-service-parser: 1.9.2_graphql@15.6.0
graphql-tag: 2.12.5_graphql@15.6.0
json-loader: 0.5.7 json-loader: 0.5.7
lodash: 4.17.21 lodash: 4.17.21
mustache: 4.2.0 mustache: 4.2.0
@@ -138,7 +140,7 @@ importers:
socketio-wildcard: 2.0.0 socketio-wildcard: 2.0.0
splitpanes: 2.3.8 splitpanes: 2.3.8
tern: 0.24.3 tern: 0.24.3
vue-apollo: 3.0.8 vue-apollo: 3.0.8_graphql-tag@2.12.5
vue-cli-plugin-apollo: 0.22.2_typescript@4.4.3 vue-cli-plugin-apollo: 0.22.2_typescript@4.4.3
vue-functional-data-merge: 3.1.0 vue-functional-data-merge: 3.1.0
vue-github-button: 1.3.0 vue-github-button: 1.3.0
@@ -12579,6 +12581,7 @@ packages:
/nan/2.15.0: /nan/2.15.0:
resolution: {integrity: sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==} resolution: {integrity: sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==}
requiresBuild: true
dev: false dev: false
optional: true optional: true
@@ -17362,12 +17365,13 @@ packages:
deprecated: Sorry but vue-analytics is no longer maintained. I would suggest you switch to vue-gtag, with love, the guy who made the package. deprecated: Sorry but vue-analytics is no longer maintained. I would suggest you switch to vue-gtag, with love, the guy who made the package.
dev: true dev: true
/vue-apollo/3.0.8: /vue-apollo/3.0.8_graphql-tag@2.12.5:
resolution: {integrity: sha512-RnkC75PMoGwl1sdZdVO3R9P51wqmgOVi4QmljkBaTzlVThVlqfkJhrBcPiw2K9EohvSagvZclNqXktyOCcXbBA==} resolution: {integrity: sha512-RnkC75PMoGwl1sdZdVO3R9P51wqmgOVi4QmljkBaTzlVThVlqfkJhrBcPiw2K9EohvSagvZclNqXktyOCcXbBA==}
peerDependencies: peerDependencies:
graphql-tag: ^2 graphql-tag: ^2
dependencies: dependencies:
chalk: 2.4.2 chalk: 2.4.2
graphql-tag: 2.12.5_graphql@15.6.0
serialize-javascript: 4.0.0 serialize-javascript: 4.0.0
throttle-debounce: 2.3.0 throttle-debounce: 2.3.0
dev: false dev: false