Skip to content

Chore: Add hint (description) to CodeSettingInput after label #27843

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

Merged
kodiakhq merged 3 commits into from
Feb 7, 2023
+14 −1
Merged

Chore: Add hint (description) to CodeSettingInput after label #27843

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08e13da
chore: adding hint to code input settings after label
hugocostadev Jan 25, 2023
f17c4e0
Merge branch 'develop' into chore/hint-position
yash-rajpal Jan 30, 2023
ce38a38
Merge branch 'develop' into chore/hint-position
kodiakhq[bot] Feb 7, 2023
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: 2 additions & 1 deletion apps/meteor/client/views/admin/settings/MemoizedSetting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,14 @@ const MemoizedSetting = ({
<Field className={className}>
<InputComponent
value={value}
hint={hint}
editor={editor}
onChangeValue={onChangeValue}
onChangeEditor={onChangeEditor}
{...inputProps}
disabled={disabled}
/>
{hint && <Field.Hint>{hint}</Field.Hint>}
{hint && type !== 'code' && <Field.Hint>{hint}</Field.Hint>}
{callout && (
<Margins block='x16'>
<Callout type='warning'>{callout}</Callout>
Expand Down
9 changes: 9 additions & 0 deletions apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,15 @@ WithValue.args = {
placeholder: 'Placeholder',
};

export const WithDescription = Template.bind({});
WithDescription.args = {
_id: 'setting_id',
label: 'Label',
hint: 'Description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
value: 'console.log("Hello World!");',
placeholder: 'Placeholder',
};

export const WithResetButton = Template.bind({});
WithResetButton.args = {
_id: 'setting_id',
Expand Down
3 changes: 3 additions & 0 deletions apps/meteor/client/views/admin/settings/inputs/CodeSettingInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import CodeMirror from './CodeMirror';
type CodeSettingInputProps = {
_id: string;
label: string;
hint: string;
value?: string;
code: string;
placeholder?: string;
Expand All @@ -24,6 +25,7 @@ type CodeSettingInputProps = {
function CodeSettingInput({
_id,
label,
hint,
value = '',
code,
placeholder,
Expand Down Expand Up @@ -51,6 +53,7 @@ function CodeSettingInput({
</Field.Label>
{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
</Box>
{hint && <Field.Hint>{hint}</Field.Hint>}
</Flex.Container>
<div className={['code-mirror-box', fullScreen && 'code-mirror-box-fullscreen content-background-color'].filter(Boolean).join(' ')}>
<div className='title'>{label}</div>
Expand Down