-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: hide cancel button by default (#696)
- Loading branch information
Showing
11 changed files
with
156 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
packages/codegen-ui/lib/__tests__/utils/form-utils.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"). | ||
| You may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
| import { StudioForm } from '../../types'; | ||
| import { shouldIncludeCancel } from '../../utils/form-utils'; | ||
|
|
||
| describe('should include cancel button check', () => { | ||
| const form: StudioForm = { | ||
| name: 'mySampleForm', | ||
| formActionType: 'create', | ||
| dataType: { dataSourceType: 'Custom', dataTypeName: 'Custom' }, | ||
| style: {}, | ||
| sectionalElements: {}, | ||
| fields: {}, | ||
| cta: {}, | ||
| }; | ||
| it('should not include cancel by default', () => { | ||
| expect(shouldIncludeCancel(form)).toBe(false); | ||
| }); | ||
|
|
||
| it('should include cancel if there is an empty object for cancel', () => { | ||
| const formOverride: StudioForm = { | ||
| ...form, | ||
| cta: { cancel: {} }, | ||
| }; | ||
| expect(shouldIncludeCancel(formOverride)).toBe(true); | ||
| }); | ||
|
|
||
| it('should remove cancel button if explicitly excluded', () => { | ||
| const formOverride: StudioForm = { | ||
| ...form, | ||
| cta: { cancel: { excluded: true } }, | ||
| }; | ||
| expect(shouldIncludeCancel(formOverride)).toBe(false); | ||
| }); | ||
|
|
||
| it('should not render cancel button even if cta is undefined', () => { | ||
| const { cta, ...rest } = form; | ||
| // overriding to any in case cta is not defined when pulling from the api | ||
| expect(shouldIncludeCancel(rest as any)).toBe(false); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| Licensed under the Apache License, Version 2.0 (the "License"). | ||
| You may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import { StudioForm } from '../types'; | ||
|
|
||
| export const shouldIncludeCancel = ({ cta }: StudioForm): boolean => { | ||
| // first check if excluded is added in explicitly | ||
| if (cta?.cancel && 'excluded' in cta.cancel && cta.cancel.excluded) { | ||
| return false; | ||
| } | ||
| // if we find that cta has cancel defined (ex. an empty object) | ||
| // we include the cancel button | ||
| if (cta && cta.cancel) { | ||
| return true; | ||
| } | ||
|
|
||
| // otherwise we return false | ||
| return false; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters