Skip to content

Commit 72e0397

Browse files
rmcauleyrmcauley
authored
Merge pull request #22 from lukas-reineke/0.0.5-rc-6
NO-TICKET cinnamon update
2 parents be5ced5 + 54602bb commit 72e0397

File tree

5 files changed

+77
-9
lines changed

5 files changed

+77
-9
lines changed

‎graphql.schema.json‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1824,7 +1824,7 @@
18241824
{
18251825
"kind": "SCALAR",
18261826
"name": "FilterInput",
1827-
"description": "Accepts a single filterObject ({field: NonEmptyString!, operator: OPERATOR!,\nvalue: [String]}), a single array of filterObjects (creates an AND'ed query), or\na two dimentional array (each array is OR'ed) to produce your resource query.\nRefer to the following JSON schema for more filter restriction details:\n\n{\n \"anyOf\": [\n {\n \"type\": \"object\",\n \"$ref\": \"#/definitions/filterInput\"\n },\n {\n \"type\": \"array\",\n \"items\": {\n \"anyOf\": [\n {\n \"$ref\": \"#/definitions/filterInput\"\n },\n {\n \"type\": \"array\",\n \"items\": {\n \"$ref\": \"#/definitions/filterInput\"\n }\n }\n ]\n }\n }\n ],\n \"definitions\": {\n \"alphabeticString\": {\n \"type\": \"string\",\n \"pattern\": \"^[a-zA-Z]+$\",\n \"minLength\": 1,\n \"required\": true\n },\n \"filterInput\": {\n \"anyOf\": [\n {\n \"type\": \"object\",\n \"additionalProperties\": false,\n \"properties\": {\n \"field\": {\n \"$ref\": \"#/definitions/alphabeticString\"\n },\n \"operator\": {\n \"type\": \"string\",\n \"enum\": [\n \"IN\"\n ],\n \"required\": true\n },\n \"value\": {\n \"type\": \"array\",\n \"items\": {\n \"type\": [\n \"string\",\n \"integer\",\n \"boolean\"\n ]\n },\n \"require\": true\n }\n }\n },\n {\n \"type\": \"object\",\n \"additionalProperties\": false,\n \"properties\": {\n \"field\": {\n \"$ref\": \"#/definitions/alphabeticString\"\n },\n \"operator\": {\n \"type\": \"string\",\n \"enum\": [\n \"EQUALS\",\n \"NOT_EQUALS\",\n \"CONTAINS\",\n \"ICONTAINS\",\n \"GT\",\n \"GTE\",\n \"LT\",\n \"LTE\"\n ],\n \"required\": true\n },\n \"value\": {\n \"type\": [\n \"string\",\n \"integer\",\n \"boolean\"\n ],\n \"required\": true\n }\n }\n },\n {\n \"type\": \"object\",\n \"additionalProperties\": false,\n \"properties\": {\n \"field\": {\n \"$ref\": \"#/definitions/alphabeticString\"\n },\n \"operator\": {\n \"type\": \"string\",\n \"enum\": [\n \"IS_NULL\"\n ],\n \"required\": true\n }\n }\n }\n ]\n }\n }\n}",
1827+
"description": "Accepts a single filterObject (`{field: NonEmptyString!, operator: OPERATOR!,\nvalue: [String]}`), a single array of filterObjects (creates an AND'ed query),\nor a two dimentional array (each array is OR'ed) to produce your resource query.\nRefer to the following JSON schema for more filter restriction details:\n\n```json\n{\n \"anyOf\": [\n {\n \"type\": \"object\",\n \"$ref\": \"#/definitions/filterInput\"\n },\n {\n \"type\": \"array\",\n \"items\": {\n \"anyOf\": [\n {\n \"$ref\": \"#/definitions/filterInput\"\n },\n {\n \"type\": \"array\",\n \"items\": {\n \"$ref\": \"#/definitions/filterInput\"\n }\n }\n ]\n }\n }\n ],\n \"definitions\": {\n \"alphabeticString\": {\n \"type\": \"string\",\n \"pattern\": \"^[a-zA-Z]+$\",\n \"minLength\": 1,\n \"required\": true\n },\n \"filterInput\": {\n \"anyOf\": [\n {\n \"type\": \"object\",\n \"additionalProperties\": false,\n \"properties\": {\n \"field\": {\n \"$ref\": \"#/definitions/alphabeticString\"\n },\n \"operator\": {\n \"type\": \"string\",\n \"enum\": [\n \"IN\"\n ],\n \"required\": true\n },\n \"value\": {\n \"type\": \"array\",\n \"items\": {\n \"type\": [\n \"string\",\n \"integer\",\n \"boolean\"\n ]\n },\n \"require\": true\n }\n }\n },\n {\n \"type\": \"object\",\n \"additionalProperties\": false,\n \"properties\": {\n \"field\": {\n \"$ref\": \"#/definitions/alphabeticString\"\n },\n \"operator\": {\n \"type\": \"string\",\n \"enum\": [\n \"EQUALS\",\n \"NOT_EQUALS\",\n \"CONTAINS\",\n \"ICONTAINS\",\n \"GT\",\n \"GTE\",\n \"LT\",\n \"LTE\"\n ],\n \"required\": true\n },\n \"value\": {\n \"type\": [\n \"string\",\n \"integer\",\n \"boolean\"\n ],\n \"required\": true\n }\n }\n },\n {\n \"type\": \"object\",\n \"additionalProperties\": false,\n \"properties\": {\n \"field\": {\n \"$ref\": \"#/definitions/alphabeticString\"\n },\n \"operator\": {\n \"type\": \"string\",\n \"enum\": [\n \"IS_NULL\"\n ],\n \"required\": true\n }\n }\n }\n ]\n }\n }\n}\n```",
18281828
"fields": null,
18291829
"inputFields": null,
18301830
"interfaces": null,
@@ -3900,6 +3900,22 @@
39003900
"isDeprecated": false,
39013901
"deprecationReason": null
39023902
},
3903+
{
3904+
"name": "name",
3905+
"description": null,
3906+
"args": [],
3907+
"type": {
3908+
"kind": "NON_NULL",
3909+
"name": null,
3910+
"ofType": {
3911+
"kind": "SCALAR",
3912+
"name": "NonEmptyString",
3913+
"ofType": null
3914+
}
3915+
},
3916+
"isDeprecated": false,
3917+
"deprecationReason": null
3918+
},
39033919
{
39043920
"name": "status",
39053921
"description": null,
@@ -4028,6 +4044,22 @@
40284044
"isDeprecated": false,
40294045
"deprecationReason": null
40304046
},
4047+
{
4048+
"name": "catalog",
4049+
"description": null,
4050+
"args": [],
4051+
"type": {
4052+
"kind": "NON_NULL",
4053+
"name": null,
4054+
"ofType": {
4055+
"kind": "OBJECT",
4056+
"name": "Catalog",
4057+
"ofType": null
4058+
}
4059+
},
4060+
"isDeprecated": false,
4061+
"deprecationReason": null
4062+
},
40314063
{
40324064
"name": "campaignTemplate",
40334065
"description": null,
@@ -6414,6 +6446,16 @@
64146446
"ofType": null
64156447
},
64166448
"defaultValue": null
6449+
},
6450+
{
6451+
"name": "name",
6452+
"description": null,
6453+
"type": {
6454+
"kind": "SCALAR",
6455+
"name": "NonEmptyString",
6456+
"ofType": null
6457+
},
6458+
"defaultValue": null
64176459
}
64186460
],
64196461
"interfaces": null,
@@ -6455,6 +6497,16 @@
64556497
"ofType": null
64566498
},
64576499
"defaultValue": null
6500+
},
6501+
{
6502+
"name": "name",
6503+
"description": null,
6504+
"type": {
6505+
"kind": "SCALAR",
6506+
"name": "NonEmptyString",
6507+
"ofType": null
6508+
},
6509+
"defaultValue": null
64586510
}
64596511
],
64606512
"interfaces": null,

‎index.node.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.web.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/generated/graphql.d.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ export declare type Scalars = {
2121
/** The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf). */
2222
JSONObject: any;
2323
/**
24-
* Accepts a single filterObject ({field: NonEmptyString!, operator: OPERATOR!,
25-
* value: [String]}), a single array of filterObjects (creates an AND'ed query), or
26-
* a two dimentional array (each array is OR'ed) to produce your resource query.
24+
* Accepts a single filterObject (`{field: NonEmptyString!, operator: OPERATOR!,
25+
* value: [String]}`), a single array of filterObjects (creates an AND'ed query),
26+
* or a two dimentional array (each array is OR'ed) to produce your resource query.
2727
* Refer to the following JSON schema for more filter restriction details:
2828
*
29+
* ```json
2930
* {
3031
* "anyOf": [
3132
* {
@@ -136,6 +137,7 @@ export declare type Scalars = {
136137
* }
137138
* }
138139
* }
140+
* ```
139141
**/
140142
FilterInput: any;
141143
/** The `Upload` scalar type represents a file upload. */
@@ -327,10 +329,12 @@ export declare type MarketingCampaign = ResultResource & {
327329
id: Scalars['ObjectId'];
328330
creationDate: Scalars['DateISO'];
329331
lastChangeDate: Scalars['DateISO'];
332+
name: Scalars['NonEmptyString'];
330333
status: MarketingCampaignStatus;
331334
marketingAds?: Maybe<MarketingAdConnection>;
332335
products?: Maybe<ProductConnection>;
333336
vendor: Vendor;
337+
catalog: Catalog;
334338
campaignTemplate: CampaignTemplate;
335339
mediaChannel: MediaChannel;
336340
results?: Maybe<ResultConnection>;
@@ -369,6 +373,7 @@ export declare type MarketingCampaignInput = {
369373
runTimeSpec: Scalars['JSONObject'];
370374
productIds?: Maybe<Array<Scalars['ObjectId']>>;
371375
status?: Maybe<MarketingCampaignStatus>;
376+
name?: Maybe<Scalars['NonEmptyString']>;
372377
};
373378
export declare enum MarketingCampaignStatus {
374379
Active = "ACTIVE",
@@ -378,6 +383,7 @@ export declare type MarketingCampaignUpdateInput = {
378383
creativeSpec?: Maybe<Scalars['JSONObject']>;
379384
runTimeSpec?: Maybe<Scalars['JSONObject']>;
380385
status?: Maybe<MarketingCampaignStatus>;
386+
name?: Maybe<Scalars['NonEmptyString']>;
381387
};
382388
export declare type Marketplace = EntitlementResource & {
383389
id: Scalars['ObjectId'];
@@ -1263,10 +1269,12 @@ export declare type MarketingCampaignResolvers<ContextType = any, ParentType ext
12631269
id?: Resolver<ResolversTypes['ObjectId'], ParentType, ContextType>;
12641270
creationDate?: Resolver<ResolversTypes['DateISO'], ParentType, ContextType>;
12651271
lastChangeDate?: Resolver<ResolversTypes['DateISO'], ParentType, ContextType>;
1272+
name?: Resolver<ResolversTypes['NonEmptyString'], ParentType, ContextType>;
12661273
status?: Resolver<ResolversTypes['MarketingCampaignStatus'], ParentType, ContextType>;
12671274
marketingAds?: Resolver<Maybe<ResolversTypes['MarketingAdConnection']>, ParentType, ContextType, MarketingCampaignMarketingAdsArgs>;
12681275
products?: Resolver<Maybe<ResolversTypes['ProductConnection']>, ParentType, ContextType, RequireFields<MarketingCampaignProductsArgs, 'showDeleted'>>;
12691276
vendor?: Resolver<ResolversTypes['Vendor'], ParentType, ContextType>;
1277+
catalog?: Resolver<ResolversTypes['Catalog'], ParentType, ContextType>;
12701278
campaignTemplate?: Resolver<ResolversTypes['CampaignTemplate'], ParentType, ContextType>;
12711279
mediaChannel?: Resolver<ResolversTypes['MediaChannel'], ParentType, ContextType>;
12721280
results?: Resolver<Maybe<ResolversTypes['ResultConnection']>, ParentType, ContextType, MarketingCampaignResultsArgs>;

‎src/generated/graphql.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ export type Scalars = {
2424
/** The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf). */
2525
JSONObject: any;
2626
/**
27-
* Accepts a single filterObject ({field: NonEmptyString!, operator: OPERATOR!,
28-
* value: [String]}), a single array of filterObjects (creates an AND'ed query), or
29-
* a two dimentional array (each array is OR'ed) to produce your resource query.
27+
* Accepts a single filterObject (`{field: NonEmptyString!, operator: OPERATOR!,
28+
* value: [String]}`), a single array of filterObjects (creates an AND'ed query),
29+
* or a two dimentional array (each array is OR'ed) to produce your resource query.
3030
* Refer to the following JSON schema for more filter restriction details:
3131
*
32+
* ```json
3233
* {
3334
* "anyOf": [
3435
* {
@@ -139,6 +140,7 @@ export type Scalars = {
139140
* }
140141
* }
141142
* }
143+
* ```
142144
**/
143145
FilterInput: any;
144146
/** The `Upload` scalar type represents a file upload. */
@@ -360,10 +362,12 @@ export type MarketingCampaign = ResultResource & {
360362
id: Scalars['ObjectId'];
361363
creationDate: Scalars['DateISO'];
362364
lastChangeDate: Scalars['DateISO'];
365+
name: Scalars['NonEmptyString'];
363366
status: MarketingCampaignStatus;
364367
marketingAds?: Maybe<MarketingAdConnection>;
365368
products?: Maybe<ProductConnection>;
366369
vendor: Vendor;
370+
catalog: Catalog;
367371
campaignTemplate: CampaignTemplate;
368372
mediaChannel: MediaChannel;
369373
results?: Maybe<ResultConnection>;
@@ -408,6 +412,7 @@ export type MarketingCampaignInput = {
408412
runTimeSpec: Scalars['JSONObject'];
409413
productIds?: Maybe<Array<Scalars['ObjectId']>>;
410414
status?: Maybe<MarketingCampaignStatus>;
415+
name?: Maybe<Scalars['NonEmptyString']>;
411416
};
412417

413418
export enum MarketingCampaignStatus {
@@ -419,6 +424,7 @@ export type MarketingCampaignUpdateInput = {
419424
creativeSpec?: Maybe<Scalars['JSONObject']>;
420425
runTimeSpec?: Maybe<Scalars['JSONObject']>;
421426
status?: Maybe<MarketingCampaignStatus>;
427+
name?: Maybe<Scalars['NonEmptyString']>;
422428
};
423429

424430
export type Marketplace = EntitlementResource & {
@@ -1696,6 +1702,7 @@ export type MarketingCampaignResolvers<
16961702
ParentType,
16971703
ContextType
16981704
>;
1705+
name?: Resolver<ResolversTypes['NonEmptyString'], ParentType, ContextType>;
16991706
status?: Resolver<
17001707
ResolversTypes['MarketingCampaignStatus'],
17011708
ParentType,
@@ -1714,6 +1721,7 @@ export type MarketingCampaignResolvers<
17141721
RequireFields<MarketingCampaignProductsArgs, 'showDeleted'>
17151722
>;
17161723
vendor?: Resolver<ResolversTypes['Vendor'], ParentType, ContextType>;
1724+
catalog?: Resolver<ResolversTypes['Catalog'], ParentType, ContextType>;
17171725
campaignTemplate?: Resolver<
17181726
ResolversTypes['CampaignTemplate'],
17191727
ParentType,

0 commit comments

Comments
 (0)