Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions packages/app/src/cli/services/dev/fetch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,18 @@ export async function fetchStore(
storeFqdn: string,
developerPlatformClient: DeveloperPlatformClient,
): Promise<OrganizationStore> {
const store = await developerPlatformClient.storeByDomain(org.id, storeFqdn)
return {
shopId: '1001',
shopName: 'bananaaa',
shopDomain: 'bananaaa-2.my.shop.dev',
provisionable: true,
transferDisabled: true,
convertableToPartnerTest: true,
} as any as OrganizationStore

if (!store) throw new AbortError(`Could not find Store for domain ${storeFqdn} in Organization ${org.businessName}.`)
// const store = await developerPlatformClient.storeByDomain(org.id, storeFqdn)

return store
// if (!store) throw new AbortError(`Could not find Store for domain ${storeFqdn} in Organization ${org.businessName}.`)

// return store
}
2 changes: 1 addition & 1 deletion packages/app/src/cli/services/store-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export async function storeContext({
}

// Ensure that the user is able to login to the store and install apps
await developerPlatformClient.ensureUserAccessToStore(organization.id, selectedStore)
// await developerPlatformClient.ensureUserAccessToStore(organization.id, selectedStore)

return selectedStore
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -551,23 +551,48 @@ export class AppManagementClient implements DeveloperPlatformClient {
// partners-client and app-management-client. Since we need transferDisabled and convertableToPartnerTest values
// from the Partners OrganizationStore schema, we will return this type for now
async devStoresForOrg(orgId: string, searchTerm?: string): Promise<Paginateable<{stores: OrganizationStore[]}>> {
const storesResult = await this.businessPlatformOrganizationsRequest({
query: ListAppDevStores,
organizationId: String(numberFromGid(orgId)),
variables: {searchTerm},
})
const organization = storesResult.organization
// MOCKED RESPONSE: Hardcoded shop with ID 1001
const mockShopArray: ShopNode[] = [
{
id: '1001',
externalId: 'gid://shopify/Shop/1001',
name: 'bananaaa',
storeType: 'app_development' as any,
primaryDomain: 'bananaaa-2.my.shop.dev',
shortName: 'bananaaa',
url: 'https://bananaaa-2.my.shop.dev',
}
]
// const shopArray = organization.accessibleShops?.edges.map((value) => value.node) ?? []
// const provisionable = isStoreProvisionable(organization.currentUser?.organizationPermissions ?? [])

if (!organization) {
throw new AbortError(`No organization found`)
}
const provisionable = true // Assuming the user has permission to provision

const shopArray = organization.accessibleShops?.edges.map((value) => value.node) ?? []
const provisionable = isStoreProvisionable(organization.currentUser?.organizationPermissions ?? [])
return {
stores: mapBusinessPlatformStoresToOrganizationStores(shopArray, provisionable),
hasMorePages: storesResult.organization?.accessibleShops?.pageInfo.hasNextPage ?? false,
// stores: mapBusinessPlatformStoresToOrganizationStores(shopArray, provisionable),
// hasMorePages: storesResult.organization?.accessibleShops?.pageInfo.hasNextPage ?? false,
stores: mapBusinessPlatformStoresToOrganizationStores(mockShopArray, provisionable),
hasMorePages: false,
}

// ORIGINAL CODE (commented out for reference):
// const storesResult = await this.businessPlatformOrganizationsRequest({
// query: ListAppDevStores,
// organizationId: String(numberFromGid(orgId)),
// variables: {searchTerm},
// })
// const organization = storesResult.organization
//
// if (!organization) {
// throw new AbortError(`No organization found`)
// }
//
// const shopArray = organization.accessibleShops?.edges.map((value) => value.node) ?? []
// const provisionable = isStoreProvisionable(organization.currentUser?.organizationPermissions ?? [])
// return {
// stores: mapBusinessPlatformStoresToOrganizationStores(shopArray, provisionable),
// hasMorePages: storesResult.organization?.accessibleShops?.pageInfo.hasNextPage ?? false,
// }
}

async appExtensionRegistrations(
Expand Down
Loading