Skip to content

feat: add max length reached warning #64

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
smarcet merged 2 commits into from
Dec 2, 2024
+31 −10
Merged

feat: add max length reached warning #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70c21fa
feat: add max length reached warning
romanetar Oct 29, 2024
61c6e0c
fix: extract input length limit to a constant
romanetar Nov 19, 2024
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
27 changes: 21 additions & 6 deletions resources/js/oauth2/profile/edit_client/components/form_controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import React, {useState} from "react";
import {makeStyles, withStyles} from '@material-ui/core/styles';
import {
Checkbox,
Expand Down Expand Up @@ -44,28 +44,43 @@ const TooltipLabel = ({id, title, tooltip}) => (
</FormLabel>
);

export const SimpleTextFormControl = ({id, title, tooltip, type, value, touched, errors, maxLength, onChange}) => (
<FormControl variant="outlined" className={styles.form_control}>
export const SimpleTextFormControl = ({id, title, tooltip, type, value, touched, errors, maxLength, onChange}) => {
const SIMPLE_INPUT_MAX_LENGTH = (maxLength ?? 100) + 1;
const [text, setText] = useState('');

const handleChange = (e) => {
setText(e.target.value);
if (onChange) onChange(e);
};

const isLimitExceeded = text.length > maxLength;

return <FormControl variant="outlined" className={styles.form_control}>
<TooltipLabel id={id} title={title} tooltip={tooltip}/>
<TextField
id={id}
name={id}
variant="outlined"
fullWidth
size="small"
inputProps={{maxLength: maxLength ?? 100}}
inputProps={{maxLength: SIMPLE_INPUT_MAX_LENGTH}}
autoFocus={true}
value={value}
onChange={onChange}
onChange={handleChange}
type={type}
error={
touched &&
Boolean(errors)
}
helperText={touched && errors}
/>
{isLimitExceeded &&
<div className={styles.error_label}>
{`Cannot exceed max length (${maxLength} chars)`}
</div>
}
</FormControl>
);
};

export const SelectFormControl = ({id, title, tooltip, value, touched, errors, onChange, options}) => (
<FormControl variant="outlined" className={styles.form_control}>
Expand Down
14 changes: 10 additions & 4 deletions resources/js/oauth2/profile/edit_client/components/oauth_panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ const OauthPanel = ({
onRefreshTokenChange,
onSavePromise
}) => {
const SIMPLE_INPUT_MAX_LENGTH = 255;

const {application_type, client_type, is_own} = entity;
const {can_request_refresh_tokens} = initialValues;

Expand Down Expand Up @@ -85,6 +87,10 @@ const OauthPanel = ({
app_description: string("The app description field is required.").required(
"The app description field is required."
),
website: string().max(SIMPLE_INPUT_MAX_LENGTH, ''),
logo_uri: string().max(SIMPLE_INPUT_MAX_LENGTH, ''),
tos_uri: string().max(SIMPLE_INPUT_MAX_LENGTH, ''),
policy_uri: string().max(SIMPLE_INPUT_MAX_LENGTH, ''),
});
}

Expand Down Expand Up @@ -282,7 +288,7 @@ const OauthPanel = ({
title="Application Web Site Url (optional)"
tooltip="Client home page URL."
type="url"
maxLength={255}
maxLength={SIMPLE_INPUT_MAX_LENGTH}
value={formik.values.website ?? ''}
touched={formik.touched.website}
errors={formik.errors.website}
Expand All @@ -293,7 +299,7 @@ const OauthPanel = ({
title="Application Logo Url (optional)"
tooltip="URL that references a logo for the Client application."
type="url"
maxLength={255}
maxLength={SIMPLE_INPUT_MAX_LENGTH}
value={formik.values.logo_uri ?? ''}
touched={formik.touched.logo_uri}
errors={formik.errors.logo_uri}
Expand All @@ -304,7 +310,7 @@ const OauthPanel = ({
title="Application Term of Service Url (optional)"
tooltip="URL that the Relying Party Client provides to the End-User to read about the Relying Party's terms of service."
type="url"
maxLength={255}
maxLength={SIMPLE_INPUT_MAX_LENGTH}
value={formik.values.tos_uri ?? ''}
touched={formik.touched.tos_uri}
errors={formik.errors.tos_uri}
Expand All @@ -315,7 +321,7 @@ const OauthPanel = ({
title="Application Policy Url (optional)"
tooltip="URL that the Relying Party Client provides to the End-User to read about the how the profile data will be used."
type="url"
maxLength={255}
maxLength={SIMPLE_INPUT_MAX_LENGTH}
value={formik.values.policy_uri ?? ''}
touched={formik.touched.policy_uri}
errors={formik.errors.policy_uri}
Expand Down