From 9d78d9e10faeb0c3606ebf3904d4482fb67019e0 Mon Sep 17 00:00:00 2001 From: judithmh <40442827+judithmh@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:33:14 +0100 Subject: [PATCH 1/2] feat/add-new-possible-color-to-result-page: add default to pageType enum --- .../content-types/result-page/schema.json | 3 +- types/generated/components.d.ts | 28 +++++++++---------- types/generated/contentTypes.d.ts | 4 ++- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/api/result-page/content-types/result-page/schema.json b/src/api/result-page/content-types/result-page/schema.json index e335a35..3501179 100644 --- a/src/api/result-page/content-types/result-page/schema.json +++ b/src/api/result-page/content-types/result-page/schema.json @@ -80,7 +80,8 @@ "enum": [ "error", "success", - "warning" + "warning", + "default" ], "required": true, "default": "error" diff --git a/types/generated/components.d.ts b/types/generated/components.d.ts index 0b8d359..217d5a0 100644 --- a/types/generated/components.d.ts +++ b/types/generated/components.d.ts @@ -360,19 +360,6 @@ export interface FormHelperErrors extends Schema.Component { }; } -export interface FieldField extends Schema.Component { - collectionName: 'components_field_fields'; - info: { - displayName: 'Field'; - icon: ''; - description: ''; - }; - attributes: { - name: Attribute.String & Attribute.Required; - value: Attribute.Text & Attribute.Required; - }; -} - export interface FormElementsTimeInput extends Schema.Component { collectionName: 'components_form_elements_time_inputs'; info: { @@ -623,6 +610,19 @@ export interface FormElementsAutoSuggestInput extends Schema.Component { }; } +export interface FieldField extends Schema.Component { + collectionName: 'components_field_fields'; + info: { + displayName: 'Field'; + icon: ''; + description: ''; + }; + attributes: { + name: Attribute.String & Attribute.Required; + value: Attribute.Text & Attribute.Required; + }; +} + export interface BasicParagraph extends Schema.Component { collectionName: 'components_basic_paragraphs'; info: { @@ -706,7 +706,6 @@ declare module '@strapi/types' { 'form-helper.tile': FormHelperTile; 'form-helper.select-option': FormHelperSelectOption; 'form-helper.errors': FormHelperErrors; - 'field.field': FieldField; 'form-elements.time-input': FormElementsTimeInput; 'form-elements.tile-group': FormElementsTileGroup; 'form-elements.textarea': FormElementsTextarea; @@ -719,6 +718,7 @@ declare module '@strapi/types' { 'form-elements.checkbox': FormElementsCheckbox; 'form-elements.button': FormElementsButton; 'form-elements.auto-suggest-input': FormElementsAutoSuggestInput; + 'field.field': FieldField; 'basic.paragraph': BasicParagraph; 'basic.link': BasicLink; 'basic.heading': BasicHeading; diff --git a/types/generated/contentTypes.d.ts b/types/generated/contentTypes.d.ts index deca711..d53e39c 100644 --- a/types/generated/contentTypes.d.ts +++ b/types/generated/contentTypes.d.ts @@ -1380,7 +1380,9 @@ export interface ApiResultPageResultPage extends Schema.CollectionType { localized: true; }; }>; - pageType: Attribute.Enumeration<['error', 'success', 'warning']> & + pageType: Attribute.Enumeration< + ['error', 'success', 'warning', 'default'] + > & Attribute.Required & Attribute.SetPluginOptions<{ i18n: { From 9ed0fd6cc30ccc522ce1271596b233c43025bf0c Mon Sep 17 00:00:00 2001 From: judithmh <40442827+judithmh@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:54:57 +0100 Subject: [PATCH 2/2] feat/add-new-possible-color-to-result-page: change default to info for pageType enum on resultPage --- src/api/result-page/content-types/result-page/schema.json | 2 +- types/generated/contentTypes.d.ts | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/api/result-page/content-types/result-page/schema.json b/src/api/result-page/content-types/result-page/schema.json index 3501179..95174b8 100644 --- a/src/api/result-page/content-types/result-page/schema.json +++ b/src/api/result-page/content-types/result-page/schema.json @@ -81,7 +81,7 @@ "error", "success", "warning", - "default" + "info" ], "required": true, "default": "error" diff --git a/types/generated/contentTypes.d.ts b/types/generated/contentTypes.d.ts index d53e39c..432c097 100644 --- a/types/generated/contentTypes.d.ts +++ b/types/generated/contentTypes.d.ts @@ -1380,9 +1380,7 @@ export interface ApiResultPageResultPage extends Schema.CollectionType { localized: true; }; }>; - pageType: Attribute.Enumeration< - ['error', 'success', 'warning', 'default'] - > & + pageType: Attribute.Enumeration<['error', 'success', 'warning', 'info']> & Attribute.Required & Attribute.SetPluginOptions<{ i18n: {