Skip to content

Commit 3d98258

Browse files
nl0nl0
committed
use the new mutations
1 parent 8fb6165 commit 3d98258

File tree

5 files changed

+208
-260
lines changed

5 files changed

+208
-260
lines changed

‎catalog/app/containers/Admin/Buckets/Tabulator/Tabulator.tsx‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,11 @@ function Tables({ adding, bucketName, onAdding, tables }: TablesProps) {
578578
}: FormValuesDeleteTable): Promise<FF.SubmissionErrors | undefined> => {
579579
try {
580580
setSubmitting(true)
581-
const response = await setTable({ bucketName, tableName, config: null })
582-
// Generated `InputError` lacks optional properties and not inferred correctly
583-
const r = response.admin
584-
.bucketSetTabulatorTable as Model.GQLTypes.BucketSetTabulatorTableResult
581+
const { bucketSetTabulatorTable: r } = await setTable({
582+
bucketName,
583+
tableName,
584+
config: null,
585+
})
585586
setSubmitting(false)
586587
if (r.__typename === 'BucketConfig') {
587588
notify(`Successfully deleted ${tableName} table`)
@@ -608,12 +609,10 @@ function Tables({ adding, bucketName, onAdding, tables }: TablesProps) {
608609
async (values: FormValuesRenameTable): Promise<FF.SubmissionErrors | undefined> => {
609610
try {
610611
setSubmitting(true)
611-
const response = await renameTable({
612+
const { bucketRenameTabulatorTable: r } = await renameTable({
612613
bucketName,
613614
...values,
614615
})
615-
const r = response.admin
616-
.bucketRenameTabulatorTable as Model.GQLTypes.BucketSetTabulatorTableResult
617616
setSubmitting(false)
618617
if (r.__typename === 'BucketConfig') {
619618
notify(`Successfully updated ${values.tableName} table`)
@@ -639,9 +638,7 @@ function Tables({ adding, bucketName, onAdding, tables }: TablesProps) {
639638
async (values: FormValuesSetTable): Promise<FF.SubmissionErrors | undefined> => {
640639
try {
641640
setSubmitting(true)
642-
const response = await setTable({ bucketName, ...values })
643-
const r = response.admin
644-
.bucketSetTabulatorTable as Model.GQLTypes.BucketSetTabulatorTableResult
641+
const { bucketSetTabulatorTable: r } = await setTable({ bucketName, ...values })
645642
setSubmitting(false)
646643
if (r.__typename === 'BucketConfig') {
647644
notify(`Successfully updated ${values.tableName} table`)

‎catalog/app/containers/Admin/Buckets/gql/TabulatorTablesRename.generated.ts‎

Lines changed: 81 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,27 @@ export type containers_Admin_Buckets_gql_TabulatorTablesRenameMutationVariables
1212
export type containers_Admin_Buckets_gql_TabulatorTablesRenameMutation = {
1313
readonly __typename: 'Mutation'
1414
} & {
15-
readonly admin: { readonly __typename: 'AdminMutations' } & {
16-
readonly bucketRenameTabulatorTable:
17-
| ({ readonly __typename: 'BucketConfig' } & Pick<Types.BucketConfig, 'name'> & {
18-
readonly tabulatorTables: ReadonlyArray<
19-
{ readonly __typename: 'TabulatorTable' } & Pick<
20-
Types.TabulatorTable,
21-
'name' | 'config'
22-
>
23-
>
24-
})
25-
| ({ readonly __typename: 'InvalidInput' } & {
26-
readonly errors: ReadonlyArray<
27-
{ readonly __typename: 'InputError' } & Pick<
28-
Types.InputError,
29-
'path' | 'message'
15+
readonly bucketRenameTabulatorTable:
16+
| ({ readonly __typename: 'BucketConfig' } & Pick<Types.BucketConfig, 'name'> & {
17+
readonly tabulatorTables: ReadonlyArray<
18+
{ readonly __typename: 'TabulatorTable' } & Pick<
19+
Types.TabulatorTable,
20+
'name' | 'config'
3021
>
3122
>
3223
})
33-
| ({ readonly __typename: 'OperationError' } & Pick<
34-
Types.OperationError,
35-
'message'
36-
>)
37-
}
24+
| ({ readonly __typename: 'InvalidInput' } & {
25+
readonly errors: ReadonlyArray<
26+
{ readonly __typename: 'InputError' } & Pick<
27+
Types.InputError,
28+
'path' | 'name' | 'message' | 'context'
29+
>
30+
>
31+
})
32+
| ({ readonly __typename: 'OperationError' } & Pick<
33+
Types.OperationError,
34+
'name' | 'message' | 'context'
35+
>)
3836
}
3937

4038
export const containers_Admin_Buckets_gql_TabulatorTablesRenameDocument = {
@@ -75,118 +73,95 @@ export const containers_Admin_Buckets_gql_TabulatorTablesRenameDocument = {
7573
selections: [
7674
{
7775
kind: 'Field',
78-
name: { kind: 'Name', value: 'admin' },
76+
name: { kind: 'Name', value: 'bucketRenameTabulatorTable' },
77+
arguments: [
78+
{
79+
kind: 'Argument',
80+
name: { kind: 'Name', value: 'bucketName' },
81+
value: { kind: 'Variable', name: { kind: 'Name', value: 'bucketName' } },
82+
},
83+
{
84+
kind: 'Argument',
85+
name: { kind: 'Name', value: 'tableName' },
86+
value: { kind: 'Variable', name: { kind: 'Name', value: 'tableName' } },
87+
},
88+
{
89+
kind: 'Argument',
90+
name: { kind: 'Name', value: 'newTableName' },
91+
value: {
92+
kind: 'Variable',
93+
name: { kind: 'Name', value: 'newTableName' },
94+
},
95+
},
96+
],
7997
selectionSet: {
8098
kind: 'SelectionSet',
8199
selections: [
100+
{ kind: 'Field', name: { kind: 'Name', value: '__typename' } },
82101
{
83-
kind: 'Field',
84-
name: { kind: 'Name', value: 'bucketRenameTabulatorTable' },
85-
arguments: [
86-
{
87-
kind: 'Argument',
88-
name: { kind: 'Name', value: 'bucketName' },
89-
value: {
90-
kind: 'Variable',
91-
name: { kind: 'Name', value: 'bucketName' },
92-
},
93-
},
94-
{
95-
kind: 'Argument',
96-
name: { kind: 'Name', value: 'tableName' },
97-
value: {
98-
kind: 'Variable',
99-
name: { kind: 'Name', value: 'tableName' },
100-
},
101-
},
102-
{
103-
kind: 'Argument',
104-
name: { kind: 'Name', value: 'newTableName' },
105-
value: {
106-
kind: 'Variable',
107-
name: { kind: 'Name', value: 'newTableName' },
108-
},
109-
},
110-
],
102+
kind: 'InlineFragment',
103+
typeCondition: {
104+
kind: 'NamedType',
105+
name: { kind: 'Name', value: 'BucketConfig' },
106+
},
111107
selectionSet: {
112108
kind: 'SelectionSet',
113109
selections: [
114-
{ kind: 'Field', name: { kind: 'Name', value: '__typename' } },
110+
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
115111
{
116-
kind: 'InlineFragment',
117-
typeCondition: {
118-
kind: 'NamedType',
119-
name: { kind: 'Name', value: 'BucketConfig' },
120-
},
112+
kind: 'Field',
113+
name: { kind: 'Name', value: 'tabulatorTables' },
121114
selectionSet: {
122115
kind: 'SelectionSet',
123116
selections: [
124117
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
125-
{
126-
kind: 'Field',
127-
name: { kind: 'Name', value: 'tabulatorTables' },
128-
selectionSet: {
129-
kind: 'SelectionSet',
130-
selections: [
131-
{
132-
kind: 'Field',
133-
name: { kind: 'Name', value: 'name' },
134-
},
135-
{
136-
kind: 'Field',
137-
name: { kind: 'Name', value: 'config' },
138-
},
139-
],
140-
},
141-
},
142-
],
143-
},
144-
},
145-
{
146-
kind: 'InlineFragment',
147-
typeCondition: {
148-
kind: 'NamedType',
149-
name: { kind: 'Name', value: 'InvalidInput' },
150-
},
151-
selectionSet: {
152-
kind: 'SelectionSet',
153-
selections: [
154-
{
155-
kind: 'Field',
156-
name: { kind: 'Name', value: 'errors' },
157-
selectionSet: {
158-
kind: 'SelectionSet',
159-
selections: [
160-
{
161-
kind: 'Field',
162-
name: { kind: 'Name', value: 'path' },
163-
},
164-
{
165-
kind: 'Field',
166-
name: { kind: 'Name', value: 'message' },
167-
},
168-
],
169-
},
170-
},
118+
{ kind: 'Field', name: { kind: 'Name', value: 'config' } },
171119
],
172120
},
173121
},
122+
],
123+
},
124+
},
125+
{
126+
kind: 'InlineFragment',
127+
typeCondition: {
128+
kind: 'NamedType',
129+
name: { kind: 'Name', value: 'InvalidInput' },
130+
},
131+
selectionSet: {
132+
kind: 'SelectionSet',
133+
selections: [
174134
{
175-
kind: 'InlineFragment',
176-
typeCondition: {
177-
kind: 'NamedType',
178-
name: { kind: 'Name', value: 'OperationError' },
179-
},
135+
kind: 'Field',
136+
name: { kind: 'Name', value: 'errors' },
180137
selectionSet: {
181138
kind: 'SelectionSet',
182139
selections: [
140+
{ kind: 'Field', name: { kind: 'Name', value: 'path' } },
141+
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
183142
{ kind: 'Field', name: { kind: 'Name', value: 'message' } },
143+
{ kind: 'Field', name: { kind: 'Name', value: 'context' } },
184144
],
185145
},
186146
},
187147
],
188148
},
189149
},
150+
{
151+
kind: 'InlineFragment',
152+
typeCondition: {
153+
kind: 'NamedType',
154+
name: { kind: 'Name', value: 'OperationError' },
155+
},
156+
selectionSet: {
157+
kind: 'SelectionSet',
158+
selections: [
159+
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
160+
{ kind: 'Field', name: { kind: 'Name', value: 'message' } },
161+
{ kind: 'Field', name: { kind: 'Name', value: 'context' } },
162+
],
163+
},
164+
},
190165
],
191166
},
192167
},

‎catalog/app/containers/Admin/Buckets/gql/TabulatorTablesRename.graphql‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
mutation ($bucketName: String!, $tableName: String!, $newTableName: String!) {
2-
admin {
3-
bucketRenameTabulatorTable(
4-
bucketName: $bucketName
5-
tableName: $tableName
6-
newTableName: $newTableName
7-
) {
8-
__typename
9-
... on BucketConfig {
2+
bucketRenameTabulatorTable(
3+
bucketName: $bucketName
4+
tableName: $tableName
5+
newTableName: $newTableName
6+
) {
7+
__typename
8+
... on BucketConfig {
9+
name
10+
tabulatorTables {
1011
name
11-
tabulatorTables {
12-
name
13-
config
14-
}
12+
config
1513
}
16-
... on InvalidInput {
17-
errors {
18-
path
19-
message
20-
}
21-
}
22-
... on OperationError {
14+
}
15+
... on InvalidInput {
16+
errors {
17+
path
18+
name
2319
message
20+
context
2421
}
2522
}
23+
... on OperationError {
24+
name
25+
message
26+
context
27+
}
2628
}
2729
}

0 commit comments

Comments
 (0)