diff --git a/.changeset/slow-cameras-jam.md b/.changeset/slow-cameras-jam.md new file mode 100644 index 000000000..ab549b5fd --- /dev/null +++ b/.changeset/slow-cameras-jam.md @@ -0,0 +1,5 @@ +--- +'@roadiehq/plugin-scaffolder-frontend-module-http-request-field': minor +--- + +Remove field validation for `SelectFieldFromApi`. The validation didn't make sense and was needlessly limiting. diff --git a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/package.json b/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/package.json index 03a89a36b..259f093b8 100644 --- a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/package.json +++ b/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/package.json @@ -33,9 +33,9 @@ "dependencies": { "@backstage/core-components": "^0.13.2", "@backstage/core-plugin-api": "^1.5.2", - "@backstage/catalog-model": "^1.4.0", "@backstage/theme": "^0.4.0", "@backstage/plugin-scaffolder": "^1.14.0", + "@backstage/plugin-scaffolder-react": "^1.5.0", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "^4.0.0-alpha.45", diff --git a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/src/components/SelectFieldFromApi/SelectFieldFromApi.tsx b/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/src/components/SelectFieldFromApi/SelectFieldFromApi.tsx index 226a98c2d..c0111a9d6 100644 --- a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/src/components/SelectFieldFromApi/SelectFieldFromApi.tsx +++ b/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/src/components/SelectFieldFromApi/SelectFieldFromApi.tsx @@ -14,9 +14,8 @@ * limitations under the License. */ import React, { useState } from 'react'; -import { FieldProps, FieldValidation } from '@rjsf/core'; +import { FieldProps } from '@rjsf/core'; import FormControl from '@material-ui/core/FormControl'; -import { KubernetesValidatorFunctions } from '@backstage/catalog-model'; import { discoveryApiRef, fetchApiRef, @@ -108,14 +107,3 @@ export const SelectFieldFromApi = (props: FieldProps) => { ); }; - -export const selectFieldFromApiValidation = ( - value: string, - validation: FieldValidation, -) => { - if (!KubernetesValidatorFunctions.isValidObjectName(value)) { - validation.addError( - 'must start and end with an alphanumeric character, and contain only alphanumeric characters, hyphens, underscores, and periods. Maximum length is 63 characters.', - ); - } -}; diff --git a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/src/plugin.ts b/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/src/plugin.ts index 737ec476a..18efdc9e0 100644 --- a/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/src/plugin.ts +++ b/plugins/scaffolder-field-extensions/scaffolder-frontend-module-http-request-field/src/plugin.ts @@ -13,19 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { - scaffolderPlugin, - createScaffolderFieldExtension, -} from '@backstage/plugin-scaffolder'; -import { - SelectFieldFromApi, - selectFieldFromApiValidation, -} from './components/SelectFieldFromApi'; +import { scaffolderPlugin } from '@backstage/plugin-scaffolder'; +import { createScaffolderFieldExtension } from '@backstage/plugin-scaffolder-react'; +import { SelectFieldFromApi } from './components/SelectFieldFromApi'; export const SelectFieldFromApiExtension = scaffolderPlugin.provide( createScaffolderFieldExtension({ name: 'SelectFieldFromApi', component: SelectFieldFromApi, - validation: selectFieldFromApiValidation, }), );