Skip to content

Commit

Permalink
feat: when commiting add a message field to the commit modal
Browse files Browse the repository at this point in the history
  • Loading branch information
danielstefanequilobe committed Apr 21, 2022
1 parent b0045b0 commit 6d1b852
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 21 deletions.
38 changes: 27 additions & 11 deletions src/components/blocks/CommitModal.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,52 @@
import React from 'react';
import React, { useState } from 'react';
import { useDispatch } from 'react-redux';
import { useIntl } from 'react-intl';

import { Modal, modalTypeEnum, Body } from '../../components';
import {
Modal,
modalTypeEnum,
StyledFieldContainer,
InputContainer,
StandardInput,
InputSizeEnum,
InputVariantEnum,
} from '../../components';

import { commitStagingData } from '../../store/actions/climateWarehouseActions';

const CommitModal = ({ onClose }) => {
const intl = useIntl();
const dispatch = useDispatch();
const [commitMessage, setCommitMessage] = useState('');

const onCommit = () => {
dispatch(commitStagingData('Projects'));
dispatch(commitStagingData('Projects', commitMessage));
onClose();
};

const onCommitAll = () => {
dispatch(commitStagingData('all'));
dispatch(commitStagingData('all', commitMessage));
onClose();
};

return (
<Modal
title={intl.formatMessage({ id: 'commit-message' })}
title={intl.formatMessage({ id: 'commit-projects-message-question' })}
body={
<div>
this is where the field
<Body size="Large">
{intl.formatMessage({
id: 'commit-projects-message-question',
})}
</Body>
<StyledFieldContainer>
<InputContainer>
<StandardInput
size={InputSizeEnum.large}
variant={InputVariantEnum.default}
value={commitMessage}
onChange={value => setCommitMessage(value)}
placeholderText={intl.formatMessage({
id: 'commit-message',
})}
/>
</InputContainer>
</StyledFieldContainer>
</div>
}
modalType={modalTypeEnum.basic}
Expand Down
4 changes: 3 additions & 1 deletion src/store/actions/climateWarehouseActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ export const getPaginatedData = ({
};
};

export const commitStagingData = data => {
export const commitStagingData = (data, message) => {
console.log(message);

return async dispatch => {
try {
dispatch(activateProgressIndicator);
Expand Down
6 changes: 3 additions & 3 deletions src/translations/tokens/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"filters": "Filters",
"ok": "Ok",
"cancel": "Cancel",
"commit-message": "Commit Message",
"commit-projects-message-question": "Would you like to commit everything or only Projects?",
"commit-units-message-question": "Would you like to commit everything or only Units?",
"commit-message": "Add optional commit message",
"commit-projects-message-question": "Commit everything or only projects?",
"commit-units-message-question": "Commit everything or only units?",
"only-units": "Only Units",
"only-projects": "Only projects",
"everything": "Everything",
Expand Down
6 changes: 3 additions & 3 deletions src/translations/tokens/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"cancel": "Cancelar",
"required-field": "Campo obligatorio",
"commit": "Cometer",
"commit-message": "Mensaje de confirmación",
"commit-message": "Agregar mensaje de compromiso opcional",
"only-units": "Sólo Unidades",
"only-projects": "Sólo proyectos",
"everything": "Todo",
"commit-projects-message-question": "¿Te gustaría comprometer todo o solo Proyectos?",
"commit-units-message-question": "¿Te gustaría comprometer todo o solo Unidades?",
"commit-projects-message-question": "¿Comprometerse todo o solo proyectos?",
"commit-units-message-question": "¿Comprometer todo o solo unidades?",
"committed": "Comprometido",
"pending-info": "Mensaje pendiente",
"create-pending-title": "Temas pendientes",
Expand Down
6 changes: 3 additions & 3 deletions src/translations/tokens/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"cancel": "キャンセル",
"required-field": "必須フィールド",
"commit": "犯す",
"commit-message": "メッセージのコミット",
"commit-projects-message-question": "すべてコミットしますか、それともプロジェクトだけをコミットしますか",
"commit-units-message-question": "すべてをコミットしますか、それともユニットだけをコミットしますか",
"commit-message": "オプションのコミットメッセージを追加する",
"commit-projects-message-question": "すべてをコミットしますか、それともプロジェクトのみをコミットしますか?",
"commit-units-message-question": "すべてをコミットしますか、それともユニットのみをコミットしますか?",
"only-units": "単位のみ",
"only-projects": "プロジェクトのみ",
"everything": "すべてが",
Expand Down

0 comments on commit 6d1b852

Please sign in to comment.