Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NativeAuth Update #3146

Open
wants to merge 2 commits into
base: minor
Choose a base branch
from
Open

NativeAuth Update #3146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c6a397
fix(chore): Return account conflict error for NativeAuth registration…
d46 Oct 18, 2024
b22e4b4
fix(chore): Run tests serial && retry mechanism for application boots…
d46 Oct 18, 2024
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
3 changes: 3 additions & 0 deletions e2e-common/vitest.config.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ export default defineConfig({
* automatically fail for going over the 5 second default timeout.
*/
testTimeout: process.env.E2E_DEBUG ? 1800 * 1000 : process.env.CI ? 30 * 1000 : 15 * 1000,
sequence: {
concurrent: false,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concurrency should be implicitly false otherwise tests are 100% failing

},
// threads: false,
// singleThread: true,
// reporters: ['verbose'],
Expand Down
40 changes: 34 additions & 6 deletions packages/admin-ui/src/lib/core/src/common/generated-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,9 +822,13 @@ export type CreateFacetInput = {
values?: InputMaybe<Array<CreateFacetValueWithFacetInput>>;
};

export type CreateFacetValueCustomFieldsInput = {
childFacetValueId?: InputMaybe<Scalars['ID']['input']>;
};

export type CreateFacetValueInput = {
code: Scalars['String']['input'];
customFields?: InputMaybe<Scalars['JSON']['input']>;
customFields?: InputMaybe<CreateFacetValueCustomFieldsInput>;
facetId: Scalars['ID']['input'];
translations: Array<FacetValueTranslationInput>;
};
Expand Down Expand Up @@ -856,9 +860,13 @@ export type CreatePaymentMethodInput = {
translations: Array<PaymentMethodTranslationInput>;
};

export type CreateProductCustomFieldsInput = {
testId?: InputMaybe<Scalars['ID']['input']>;
};

export type CreateProductInput = {
assetIds?: InputMaybe<Array<Scalars['ID']['input']>>;
customFields?: InputMaybe<Scalars['JSON']['input']>;
customFields?: InputMaybe<CreateProductCustomFieldsInput>;
enabled?: InputMaybe<Scalars['Boolean']['input']>;
facetValueIds?: InputMaybe<Array<Scalars['ID']['input']>>;
featuredAssetId?: InputMaybe<Scalars['ID']['input']>;
Expand Down Expand Up @@ -1766,7 +1774,7 @@ export type FacetValue = Node & {
__typename?: 'FacetValue';
code: Scalars['String']['output'];
createdAt: Scalars['DateTime']['output'];
customFields?: Maybe<Scalars['JSON']['output']>;
customFields?: Maybe<FacetValueCustomFields>;
facet: Facet;
facetId: Scalars['ID']['output'];
id: Scalars['ID']['output'];
Expand All @@ -1776,6 +1784,11 @@ export type FacetValue = Node & {
updatedAt: Scalars['DateTime']['output'];
};

export type FacetValueCustomFields = {
__typename?: 'FacetValueCustomFields';
childFacetValue?: Maybe<FacetValue>;
};

/**
* Used to construct boolean expressions for filtering search results
* by FacetValue ID. Examples:
Expand Down Expand Up @@ -1831,6 +1844,7 @@ export type FacetValueResult = {
};

export type FacetValueSortParameter = {
childFacetValue?: InputMaybe<SortOrder>;
code?: InputMaybe<SortOrder>;
createdAt?: InputMaybe<SortOrder>;
facetId?: InputMaybe<SortOrder>;
Expand Down Expand Up @@ -4622,7 +4636,7 @@ export type Product = Node & {
channels: Array<Channel>;
collections: Array<Collection>;
createdAt: Scalars['DateTime']['output'];
customFields?: Maybe<Scalars['JSON']['output']>;
customFields?: Maybe<ProductCustomFields>;
description: Scalars['String']['output'];
enabled: Scalars['Boolean']['output'];
facetValues: Array<FacetValue>;
Expand All @@ -4645,6 +4659,11 @@ export type ProductVariantListArgs = {
options?: InputMaybe<ProductVariantListOptions>;
};

export type ProductCustomFields = {
__typename?: 'ProductCustomFields';
test?: Maybe<Asset>;
};

export type ProductFilterParameter = {
_and?: InputMaybe<Array<ProductFilterParameter>>;
_or?: InputMaybe<Array<ProductFilterParameter>>;
Expand Down Expand Up @@ -4752,6 +4771,7 @@ export type ProductSortParameter = {
id?: InputMaybe<SortOrder>;
name?: InputMaybe<SortOrder>;
slug?: InputMaybe<SortOrder>;
test?: InputMaybe<SortOrder>;
updatedAt?: InputMaybe<SortOrder>;
};

Expand Down Expand Up @@ -6461,9 +6481,13 @@ export type UpdateFacetInput = {
translations?: InputMaybe<Array<FacetTranslationInput>>;
};

export type UpdateFacetValueCustomFieldsInput = {
childFacetValueId?: InputMaybe<Scalars['ID']['input']>;
};

export type UpdateFacetValueInput = {
code?: InputMaybe<Scalars['String']['input']>;
customFields?: InputMaybe<Scalars['JSON']['input']>;
customFields?: InputMaybe<UpdateFacetValueCustomFieldsInput>;
id: Scalars['ID']['input'];
translations?: InputMaybe<Array<FacetValueTranslationInput>>;
};
Expand Down Expand Up @@ -6512,9 +6536,13 @@ export type UpdatePaymentMethodInput = {
translations?: InputMaybe<Array<PaymentMethodTranslationInput>>;
};

export type UpdateProductCustomFieldsInput = {
testId?: InputMaybe<Scalars['ID']['input']>;
};

export type UpdateProductInput = {
assetIds?: InputMaybe<Array<Scalars['ID']['input']>>;
customFields?: InputMaybe<Scalars['JSON']['input']>;
customFields?: InputMaybe<UpdateProductCustomFieldsInput>;
enabled?: InputMaybe<Scalars['Boolean']['input']>;
facetValueIds?: InputMaybe<Array<Scalars['ID']['input']>>;
featuredAssetId?: InputMaybe<Scalars['ID']['input']>;
Expand Down
38 changes: 32 additions & 6 deletions packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,9 +808,13 @@ export type CreateFacetInput = {
values?: InputMaybe<Array<CreateFacetValueWithFacetInput>>;
};

export type CreateFacetValueCustomFieldsInput = {
childFacetValueId?: InputMaybe<Scalars['ID']['input']>;
};

export type CreateFacetValueInput = {
code: Scalars['String']['input'];
customFields?: InputMaybe<Scalars['JSON']['input']>;
customFields?: InputMaybe<CreateFacetValueCustomFieldsInput>;
facetId: Scalars['ID']['input'];
translations: Array<FacetValueTranslationInput>;
};
Expand Down Expand Up @@ -841,9 +845,13 @@ export type CreatePaymentMethodInput = {
translations: Array<PaymentMethodTranslationInput>;
};

export type CreateProductCustomFieldsInput = {
testId?: InputMaybe<Scalars['ID']['input']>;
};

export type CreateProductInput = {
assetIds?: InputMaybe<Array<Scalars['ID']['input']>>;
customFields?: InputMaybe<Scalars['JSON']['input']>;
customFields?: InputMaybe<CreateProductCustomFieldsInput>;
enabled?: InputMaybe<Scalars['Boolean']['input']>;
facetValueIds?: InputMaybe<Array<Scalars['ID']['input']>>;
featuredAssetId?: InputMaybe<Scalars['ID']['input']>;
Expand Down Expand Up @@ -1728,7 +1736,7 @@ export type FacetTranslationInput = {
export type FacetValue = Node & {
code: Scalars['String']['output'];
createdAt: Scalars['DateTime']['output'];
customFields?: Maybe<Scalars['JSON']['output']>;
customFields?: Maybe<FacetValueCustomFields>;
facet: Facet;
facetId: Scalars['ID']['output'];
id: Scalars['ID']['output'];
Expand All @@ -1738,6 +1746,10 @@ export type FacetValue = Node & {
updatedAt: Scalars['DateTime']['output'];
};

export type FacetValueCustomFields = {
childFacetValue?: Maybe<FacetValue>;
};

/**
* Used to construct boolean expressions for filtering search results
* by FacetValue ID. Examples:
Expand Down Expand Up @@ -1791,6 +1803,7 @@ export type FacetValueResult = {
};

export type FacetValueSortParameter = {
childFacetValue?: InputMaybe<SortOrder>;
code?: InputMaybe<SortOrder>;
createdAt?: InputMaybe<SortOrder>;
facetId?: InputMaybe<SortOrder>;
Expand Down Expand Up @@ -4312,7 +4325,7 @@ export type Product = Node & {
channels: Array<Channel>;
collections: Array<Collection>;
createdAt: Scalars['DateTime']['output'];
customFields?: Maybe<Scalars['JSON']['output']>;
customFields?: Maybe<ProductCustomFields>;
description: Scalars['String']['output'];
enabled: Scalars['Boolean']['output'];
facetValues: Array<FacetValue>;
Expand All @@ -4334,6 +4347,10 @@ export type ProductVariantListArgs = {
options?: InputMaybe<ProductVariantListOptions>;
};

export type ProductCustomFields = {
test?: Maybe<Asset>;
};

export type ProductFilterParameter = {
_and?: InputMaybe<Array<ProductFilterParameter>>;
_or?: InputMaybe<Array<ProductFilterParameter>>;
Expand Down Expand Up @@ -4435,6 +4452,7 @@ export type ProductSortParameter = {
id?: InputMaybe<SortOrder>;
name?: InputMaybe<SortOrder>;
slug?: InputMaybe<SortOrder>;
test?: InputMaybe<SortOrder>;
updatedAt?: InputMaybe<SortOrder>;
};

Expand Down Expand Up @@ -6038,9 +6056,13 @@ export type UpdateFacetInput = {
translations?: InputMaybe<Array<FacetTranslationInput>>;
};

export type UpdateFacetValueCustomFieldsInput = {
childFacetValueId?: InputMaybe<Scalars['ID']['input']>;
};

export type UpdateFacetValueInput = {
code?: InputMaybe<Scalars['String']['input']>;
customFields?: InputMaybe<Scalars['JSON']['input']>;
customFields?: InputMaybe<UpdateFacetValueCustomFieldsInput>;
id: Scalars['ID']['input'];
translations?: InputMaybe<Array<FacetValueTranslationInput>>;
};
Expand Down Expand Up @@ -6094,9 +6116,13 @@ export type UpdatePaymentMethodInput = {
translations?: InputMaybe<Array<PaymentMethodTranslationInput>>;
};

export type UpdateProductCustomFieldsInput = {
testId?: InputMaybe<Scalars['ID']['input']>;
};

export type UpdateProductInput = {
assetIds?: InputMaybe<Array<Scalars['ID']['input']>>;
customFields?: InputMaybe<Scalars['JSON']['input']>;
customFields?: InputMaybe<UpdateProductCustomFieldsInput>;
enabled?: InputMaybe<Scalars['Boolean']['input']>;
facetValueIds?: InputMaybe<Array<Scalars['ID']['input']>>;
featuredAssetId?: InputMaybe<Scalars['ID']['input']>;
Expand Down
17 changes: 15 additions & 2 deletions packages/common/src/generated-shop-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ export type FacetValue = Node & {
__typename?: 'FacetValue';
code: Scalars['String']['output'];
createdAt: Scalars['DateTime']['output'];
customFields?: Maybe<Scalars['JSON']['output']>;
customFields?: Maybe<FacetValueCustomFields>;
facet: Facet;
facetId: Scalars['ID']['output'];
id: Scalars['ID']['output'];
Expand All @@ -1030,6 +1030,11 @@ export type FacetValue = Node & {
updatedAt: Scalars['DateTime']['output'];
};

export type FacetValueCustomFields = {
__typename?: 'FacetValueCustomFields';
childFacetValue?: Maybe<FacetValue>;
};

/**
* Used to construct boolean expressions for filtering search results
* by FacetValue ID. Examples:
Expand Down Expand Up @@ -1085,6 +1090,7 @@ export type FacetValueResult = {
};

export type FacetValueSortParameter = {
childFacetValue?: InputMaybe<SortOrder>;
code?: InputMaybe<SortOrder>;
createdAt?: InputMaybe<SortOrder>;
facetId?: InputMaybe<SortOrder>;
Expand Down Expand Up @@ -2567,7 +2573,7 @@ export type Product = Node & {
assets: Array<Asset>;
collections: Array<Collection>;
createdAt: Scalars['DateTime']['output'];
customFields?: Maybe<Scalars['JSON']['output']>;
customFields?: Maybe<ProductCustomFields>;
description: Scalars['String']['output'];
enabled: Scalars['Boolean']['output'];
facetValues: Array<FacetValue>;
Expand All @@ -2589,6 +2595,11 @@ export type ProductVariantListArgs = {
options?: InputMaybe<ProductVariantListOptions>;
};

export type ProductCustomFields = {
__typename?: 'ProductCustomFields';
test?: Maybe<Asset>;
};

export type ProductFilterParameter = {
_and?: InputMaybe<Array<ProductFilterParameter>>;
_or?: InputMaybe<Array<ProductFilterParameter>>;
Expand Down Expand Up @@ -2672,6 +2683,7 @@ export type ProductSortParameter = {
id?: InputMaybe<SortOrder>;
name?: InputMaybe<SortOrder>;
slug?: InputMaybe<SortOrder>;
test?: InputMaybe<SortOrder>;
updatedAt?: InputMaybe<SortOrder>;
};

Expand Down Expand Up @@ -2965,6 +2977,7 @@ export type RegionTranslation = {
};

export type RegisterCustomerAccountResult =
| EmailAddressConflictError
| MissingPasswordError
| NativeAuthStrategyError
| PasswordValidationError
Expand Down
Loading
Loading