Skip to content

Commit 6fba53f

Browse files
shaunsshauns
authored
Merge pull request #5274 from Shopify/shauns/01-27-remotespecfication_includes_uidisclientprovided
RemoteSpecfication includes uidIsClientProvided
2 parents ab1a33a + e4f686a commit 6fba53f

File tree

7 files changed

+41
-4
lines changed

7 files changed

+41
-4
lines changed

‎packages/app/src/cli/api/graphql/app-management/generated/specifications.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ export type FetchSpecificationsQuery = {
1111
identifier: string
1212
externalIdentifier: string
1313
features: string[]
14-
uidStrategy: {appModuleLimit: number} | {appModuleLimit: number}
14+
uidStrategy:
15+
| {appModuleLimit: number; isClientProvided: boolean}
16+
| {appModuleLimit: number; isClientProvided: boolean}
1517
validationSchema?: {jsonSchema: string} | null
1618
}[]
1719
}
@@ -43,6 +45,7 @@ export const FetchSpecifications = {
4345
kind: 'SelectionSet',
4446
selections: [
4547
{kind: 'Field', name: {kind: 'Name', value: 'appModuleLimit'}},
48+
{kind: 'Field', name: {kind: 'Name', value: 'isClientProvided'}},
4649
{kind: 'Field', name: {kind: 'Name', value: '__typename'}},
4750
],
4851
},

‎packages/app/src/cli/api/graphql/app-management/queries/specifications.graphql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ query fetchSpecifications {
66
features
77
uidStrategy {
88
appModuleLimit
9+
isClientProvided
910
}
1011
validationSchema {
1112
jsonSchema

‎packages/app/src/cli/api/graphql/extension_specifications.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export interface RemoteSpecification {
3939
options: {
4040
managementExperience: 'cli' | 'custom' | 'dashboard'
4141
registrationLimit: number
42+
uidIsClientProvided: boolean
4243
}
4344
features?: {
4445
argo?: {

‎packages/app/src/cli/models/app/app.test-data.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
623623
options: {
624624
managementExperience: 'cli',
625625
registrationLimit: 1,
626+
uidIsClientProvided: true,
626627
},
627628
features: {
628629
argo: {
@@ -640,6 +641,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
640641
options: {
641642
managementExperience: 'cli',
642643
registrationLimit: 1,
644+
uidIsClientProvided: true,
643645
},
644646
},
645647
{
@@ -652,6 +654,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
652654
options: {
653655
managementExperience: 'cli',
654656
registrationLimit: 1,
657+
uidIsClientProvided: true,
655658
},
656659
features: {
657660
argo: {
@@ -669,6 +672,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
669672
options: {
670673
managementExperience: 'cli',
671674
registrationLimit: 50,
675+
uidIsClientProvided: true,
672676
},
673677
features: {
674678
argo: {
@@ -686,6 +690,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
686690
options: {
687691
managementExperience: 'cli',
688692
registrationLimit: 5,
693+
uidIsClientProvided: true,
689694
},
690695
features: {
691696
argo: {
@@ -705,6 +710,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
705710
options: {
706711
managementExperience: 'cli',
707712
registrationLimit: 1,
713+
uidIsClientProvided: true,
708714
},
709715
features: {
710716
argo: {
@@ -722,6 +728,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
722728
options: {
723729
managementExperience: 'dashboard',
724730
registrationLimit: 100,
731+
uidIsClientProvided: true,
725732
},
726733
},
727734
{
@@ -734,6 +741,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
734741
options: {
735742
managementExperience: 'cli',
736743
registrationLimit: 1,
744+
uidIsClientProvided: true,
737745
},
738746
features: {
739747
argo: {
@@ -751,6 +759,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
751759
options: {
752760
managementExperience: 'cli',
753761
registrationLimit: 100,
762+
uidIsClientProvided: true,
754763
},
755764
},
756765
{
@@ -763,6 +772,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
763772
options: {
764773
managementExperience: 'cli',
765774
registrationLimit: 100,
775+
uidIsClientProvided: true,
766776
},
767777
},
768778
{
@@ -775,6 +785,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
775785
options: {
776786
managementExperience: 'cli',
777787
registrationLimit: 300,
788+
uidIsClientProvided: true,
778789
},
779790
},
780791
{
@@ -787,6 +798,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
787798
options: {
788799
managementExperience: 'cli',
789800
registrationLimit: 100,
801+
uidIsClientProvided: true,
790802
},
791803
},
792804
{
@@ -799,6 +811,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
799811
options: {
800812
managementExperience: 'cli',
801813
registrationLimit: 50,
814+
uidIsClientProvided: true,
802815
},
803816
},
804817
{
@@ -811,6 +824,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
811824
options: {
812825
managementExperience: 'cli',
813826
registrationLimit: 1,
827+
uidIsClientProvided: true,
814828
},
815829
},
816830
{
@@ -823,6 +837,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
823837
options: {
824838
managementExperience: 'cli',
825839
registrationLimit: 1,
840+
uidIsClientProvided: false,
826841
},
827842
},
828843
{
@@ -835,6 +850,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
835850
options: {
836851
managementExperience: 'cli',
837852
registrationLimit: 1,
853+
uidIsClientProvided: false,
838854
},
839855
},
840856
{
@@ -847,6 +863,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
847863
options: {
848864
managementExperience: 'cli',
849865
registrationLimit: 1,
866+
uidIsClientProvided: false,
850867
},
851868
},
852869
{
@@ -859,6 +876,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
859876
options: {
860877
managementExperience: 'cli',
861878
registrationLimit: 1,
879+
uidIsClientProvided: false,
862880
},
863881
},
864882
{
@@ -871,6 +889,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
871889
options: {
872890
managementExperience: 'cli',
873891
registrationLimit: 1,
892+
uidIsClientProvided: false,
874893
},
875894
},
876895
{
@@ -883,6 +902,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
883902
options: {
884903
managementExperience: 'cli',
885904
registrationLimit: 1,
905+
uidIsClientProvided: false,
886906
},
887907
},
888908
{
@@ -895,6 +915,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
895915
options: {
896916
managementExperience: 'cli',
897917
registrationLimit: 1,
918+
uidIsClientProvided: false,
898919
},
899920
},
900921
{
@@ -907,6 +928,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
907928
options: {
908929
managementExperience: 'cli',
909930
registrationLimit: 1,
931+
uidIsClientProvided: true,
910932
},
911933
},
912934
{
@@ -919,6 +941,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
919941
options: {
920942
managementExperience: 'cli',
921943
registrationLimit: 1,
944+
uidIsClientProvided: true,
922945
},
923946
validationSchema: {
924947
jsonSchema:
@@ -935,6 +958,7 @@ const testRemoteSpecifications: RemoteSpecification[] = [
935958
options: {
936959
managementExperience: 'cli',
937960
registrationLimit: 1,
961+
uidIsClientProvided: true,
938962
},
939963
validationSchema: {
940964
jsonSchema:

‎packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ export class AppManagementClient implements DeveloperPlatformClient {
321321
options: {
322322
managementExperience: 'cli',
323323
registrationLimit: spec.uidStrategy.appModuleLimit,
324+
uidIsClientProvided: spec.uidStrategy.isClientProvided,
324325
},
325326
experience: experience(spec.identifier),
326327
validationSchema: spec.validationSchema,

‎packages/app/src/cli/utilities/developer-platform-client/partners-client.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,14 @@ export class PartnersClient implements DeveloperPlatformClient {
324324
async specifications({apiKey}: MinimalAppIdentifiers): Promise<RemoteSpecification[]> {
325325
const variables: ExtensionSpecificationsQueryVariables = {api_key: apiKey}
326326
const result: ExtensionSpecificationsQuerySchema = await this.request(ExtensionSpecificationsQuery, variables)
327-
return result.extensionSpecifications
327+
// Partners client does not support isClientProvided. Safe to assume that all modules are extension-style.
328+
return result.extensionSpecifications.map((spec) => ({
329+
...spec,
330+
options: {
331+
...spec.options,
332+
uidIsClientProvided: true,
333+
},
334+
}))
328335
}
329336

330337
async templateSpecifications({apiKey}: MinimalAppIdentifiers): Promise<ExtensionTemplate[]> {

‎packages/eslint-plugin-cli/rules/no-inline-graphql.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const knownFailures = {
143143
'packages/app/src/cli/api/graphql/extension_migrate_to_ui_extension.ts':
144144
'dd3fb42d0b9327de627bd02295de9e08087266885777602a34b44bdc460c0285',
145145
'packages/app/src/cli/api/graphql/extension_specifications.ts':
146-
'a514090fe981495a67123ccc7fcb74169d97f5b33551f9b8ebbbe6476bb66faa',
146+
'1628d3252de6e390290264b5ae10a8d57861420fa638ce2f97f6e20d982b261c',
147147
'packages/app/src/cli/api/graphql/find_app.ts': '699def43534d0fdb4988b91e74a890778026960fd31662fecd86384ecfc05370',
148148
'packages/app/src/cli/api/graphql/find_app_preview_mode.ts':
149149
'8311925b338d4aba1957974bb815cfa8c5d8272226f68b8e74a69d91acc9c8cb',
@@ -152,7 +152,7 @@ const knownFailures = {
152152
'867f01113c20386d6a438dd56a6d241199e407eab928ab1ad9a7f233cd35c1be',
153153
'packages/app/src/cli/api/graphql/find_store_by_domain.ts':
154154
'0824f5baaab1ad419a7fa1d64824e306bd369430da47c7457ed72e74a1e94a9a',
155-
'packages/app/src/cli/api/graphql/functions/api_schema_definition.ts':
155+
'packages/app/src/cli/api/graphql/functions/api_schema_definition.ts':
156156
'e71100cf61919831681da1be8f12cd9067c4e3f2faf04c1b88b764fd8a275b82',
157157
'packages/app/src/cli/api/graphql/functions/target_schema_definition.ts':
158158
'd338c5d187ca8a1e1e68892987d780e540426faeba89df2dd9d8c96e193f5c13',

0 commit comments

Comments
 (0)