Skip to content

Commit

Permalink
[PATCH] refactor: Added onClick to submit buttons
Browse files Browse the repository at this point in the history
To prevent possible issues with nested cases e.g. Draggable Editable Tasks in Card
  • Loading branch information
RARgames committed Nov 21, 2024
1 parent d1472e6 commit d8661e3
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion client/src/components/Board/ListAdd.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const ListAdd = React.memo(({ onCreate, onClose }) => {
<TextArea ref={nameField} name="name" value={data.name} placeholder={t('common.enterListTitle')} maxRows={2} onKeyDown={handleFieldKeyDown} onChange={handleFieldChange} onBlur={handleBlur} />
<div className={gStyles.controls}>
<Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
<Button style={ButtonStyle.Submit} content={t('action.addList')} />
<Button style={ButtonStyle.Submit} content={t('action.addList')} onClick={handleSubmit} />
</div>
</Form>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const Connections = React.memo(({ defaultData, onUpdate, onBack, onClose }) => {
<Input ref={inputRef} value={data.githubRepo} name="githubRepo" onKeyDown={handleFieldKeyDown} onChange={handleFieldChange} className={classNames(styles.field, isError && styles.fieldError)} />
<div className={gStyles.controlsSpaceBetween}>
<Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
<Button style={ButtonStyle.Submit} content={t('action.save')} />
<Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/BoardAddPopup/BoardAddPopup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ const AddStep = React.memo(({ projects, projectId, skipProjectDropdown, isAdmin,
<Icon type={data.import ? IconType.Attach : IconType.ArrowDown} size={IconSize.Size13} />
{data.import ? data.import.file.name : t('action.import')}
</Button>
<Button style={ButtonStyle.Submit} content={data.import ? t('common.importBoard', { context: 'title' }) : t('common.addBoard')} className={styles.submitButton} />
<Button style={ButtonStyle.Submit} content={data.import ? t('common.importBoard', { context: 'title' }) : t('common.addBoard')} className={styles.submitButton} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Card/NameEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
<TextArea ref={field} value={value} maxRows={2} onKeyDown={handleFieldKeyDown} onChange={handleFieldChange} onBlur={handleBlur} onFocus={handleFocus} />
<div className={gStyles.controls}>
<Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
<Button style={ButtonStyle.Submit} content={t('action.save')} />
<Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
</div>
</Form>
);
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/CardModal/Activities/CommentEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, placeholder, comm
/>
<div className={gStyles.controls}>
<Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
<Button style={ButtonStyle.Submit} content={t('action.save')} />
<Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
</div>
</Form>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const TextFileAddModal = React.memo(({ content, onCreate, onClose }) => {
<Input ref={nameField} name="name" value={data.name} className={styles.field} onChange={handleFieldChange} />
<div className={styles.inputLabel}>.txt</div>
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('action.createFile')} />
<Button style={ButtonStyle.Submit} content={t('action.createFile')} onClick={handleSubmit} />
</div>
</Form>
</>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/CardModal/Attachments/EditPopup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const EditStep = React.memo(({ defaultData, onUpdate, onDelete, onClose }) => {
<Input ref={nameField} name="name" value={data.name} className={styles.field} onChange={handleFieldChange} />
<div className={gStyles.controlsSpaceBetween}>
<Button style={ButtonStyle.Cancel} content={t('action.delete')} onClick={handleDeleteClick} />
<Button style={ButtonStyle.Submit} content={t('action.save')} />
<Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/CardMoveStep/CardMoveStep.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const CardMoveStep = React.memo(({ projectsToLists, defaultPath, onMove, onTrans
</>
)}
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('action.move')} disabled={(selectedBoard && selectedBoard.isFetching !== false) || !selectedList} />
<Button style={ButtonStyle.Submit} content={t('action.move')} disabled={(selectedBoard && selectedBoard.isFetching !== false) || !selectedList} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/LabelsStep/AddStep.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const AddStep = React.memo(({ defaultData, onCreate, onBack }) => {
<Form onSubmit={handleSubmit}>
<Editor data={data} onFieldChange={handleFieldChange} />
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('action.createLabel')} />
<Button style={ButtonStyle.Submit} content={t('action.createLabel')} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/LabelsStep/EditStep.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const EditStep = React.memo(({ defaultData, onUpdate, onDelete, onBack }) => {
<Editor data={data} onFieldChange={handleFieldChange} />
<div className={gStyles.controlsSpaceBetween}>
<Button style={ButtonStyle.Cancel} content={t('action.delete')} onClick={handleDeleteClick} />
<Button style={ButtonStyle.Submit} content={t('action.save')} />
<Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/List/CardAdd.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const CardAdd = React.memo(({ isOpen, onCreate, onClose, labelIds, memberIds })
<TextArea ref={nameField} name="name" value={data.name} placeholder={t('common.enterCardTitle')} maxRows={3} onKeyDown={handleFieldKeyDown} onChange={handleFieldChange} onBlur={handleBlur} />
<div className={gStyles.controls}>
<Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={handleCancel} />
<Button style={ButtonStyle.Submit} content={t('action.addCard')} />
<Button style={ButtonStyle.Submit} content={t('action.addCard')} onClick={handleSubmit} />
</div>
</Form>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const MembershipPermissionsSelectStep = React.memo(({ defaultData, title, button
</div>
)}
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t(buttonContent)} />
<Button style={ButtonStyle.Submit} content={t(buttonContent)} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ProjectAddPopup/ProjectAddPopup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const ProjectAddPopup = React.memo(({ defaultData, isSubmitting, onCreate, onClo
<Form onSubmit={handleSubmit} className={styles.formWrapper} onKeyDown={handleKeyDown}>
<Input ref={nameField} name="name" value={data.name} readOnly={isSubmitting} className={styles.field} onChange={handleFieldChange} />
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('common.addProject')} disabled={isSubmitting} />
<Button style={ButtonStyle.Submit} content={t('common.addProject')} disabled={isSubmitting} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/RenameStep/RenameStep.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const RenameStep = React.memo(({ title, defaultData, onUpdate, onBack, onClose }
<TextArea ref={field} name="name" value={data.name} onChange={handleFieldChange} onKeyDown={handleFieldKeyDown} maxRows={3} />
<div className={gStyles.controlsSpaceBetween}>
<Button style={ButtonStyle.Cancel} content={t('action.cancel')} onClick={onClose} />
<Button style={ButtonStyle.Submit} content={t('action.save')} />
<Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const InformationEdit = React.memo(({ defaultData, onUpdate }) => {
<div className={styles.text}>{t('common.title')}</div>
<Input ref={nameField} name="name" value={data.name} className={styles.field} onChange={handleFieldChange} />
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={dequal(cleanData, defaultData)} />
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={dequal(cleanData, defaultData)} onClick={handleSubmit} />
</div>
</Form>
);
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/TimerEditStep/TimerEditStep.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
</div>
<div className={gStyles.controlsSpaceBetween}>
<Button style={ButtonStyle.Cancel} content={t('action.remove')} onClick={handleClearClick} />
{isEditing && <Button style={ButtonStyle.Submit} content={t('action.save')} />}
{isEditing && <Button style={ButtonStyle.Submit} content={t('action.save')} onClick={handleSubmit} />}
{!isEditing &&
(defaultValue && defaultValue.startedAt ? (
<Button style={ButtonStyle.Submit} type="button" title={t('action.stop')} onClick={handleStopClick}>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/UserAddStep/UserAddStep.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ const UserAddStep = React.memo(({ defaultData, isSubmitting, error, onCreate, on
</div>
<Input ref={usernameField} name="username" value={data.username || ''} readOnly={isSubmitting} className={styles.field} onChange={handleFieldChange} />
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('action.addUser')} disabled={isSubmitting} />
<Button style={ButtonStyle.Submit} content={t('action.addUser')} disabled={isSubmitting} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const UserEmailEditStep = React.memo(({ defaultData, email, isSubmitting, error,
</>
)}
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} />
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const UserInformationEdit = React.memo(({ defaultData, onUpdate }) => {
<div className={styles.text}>{t('common.organization')}</div>
<Input style={InputStyle.Default} name="organization" value={data.organization} className={styles.field} onChange={handleFieldChange} />
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={dequal(cleanData, defaultData)} />
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={dequal(cleanData, defaultData)} onClick={handleSubmit} />
</div>
</Form>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const UserPasswordEditStep = React.memo(({ defaultData, isSubmitting, error, use
</>
)}
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} />
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const UserUsernameEditStep = React.memo(({ defaultData, username, isSubmitting,
</>
)}
<div className={gStyles.controls}>
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} />
<Button style={ButtonStyle.Submit} content={t('action.save')} disabled={isSubmitting} onClick={handleSubmit} />
</div>
</Form>
</Popup.Content>
Expand Down

0 comments on commit d8661e3

Please sign in to comment.