@configuratorware/configurator-admingui 1.31.0 → 1.31.1

package/Screens/Item/Components/Variants/VariantsEditorPopup.js

@@ -23,18 +23,12 @@ var GroupEntryActions = _interopRequireWildcard(require("../../../GroupEntry/Red
 
 var _i18n = require("../../../../App/i18n");
 
-var _Actions3 = require("../../../../App/Reducers/Api/Actions");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -78,7 +72,6 @@ var VariantsEditorPopup = /*#__PURE__*/function (_React$Component) {
         open: showGroupEditor,
         scroll: 'paper'
       }, /*#__PURE__*/_react["default"].createElement(_Edit["default"], {
-        customPostData: this.props.customPostData,
         onCancel: this.props.cancelGroup,
         closeAfterSave: true
       })), /*#__PURE__*/_react["default"].createElement(_Dialog["default"], {
@@ -113,33 +106,6 @@ var renderDispatchToProps = function renderDispatchToProps(dispatch) {
     cancelGroup: function cancelGroup() {
       dispatch(GroupActions.hideDetails(false));
     },
-    customPostData: function () {
-      var _customPostData = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return dispatch(GroupActions.postData(true));
-
-              case 2:
-                // need to reset didInvalidate flag as it is set on save of group which is blocking to reloadList
-                dispatch((0, _Actions3.resetDidInvalidate)(GroupActions.GROUPS_URL));
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      function customPostData() {
-        return _customPostData.apply(this, arguments);
-      }
-
-      return customPostData;
-    }(),
     cancelGroupEntry: function cancelGroupEntry() {
       dispatch(GroupEntryActions.hideDetails(false));
     }

package/Screens/Login/Reducers/Actions.js

@@ -88,10 +88,11 @@ var errorHandler = function errorHandler(dispatch) {
 
 var postLoginData = function postLoginData(username, password) {
   return function (dispatch) {
-    return (0, _Helpers.dispatchPostData)(dispatch)(LOGIN_DATA_KEY, 'login_check', {
-      username: username,
-      password: password
-    }).then(function (apiAction) {
+    var data = new _Api.ObjectFormData({
+      _username: username,
+      _password: password
+    });
+    return (0, _Helpers.dispatchPostData)(dispatch)(LOGIN_DATA_KEY, 'login_check', data).then(function (apiAction) {
       return dispatch((0, _Helpers.apiActionHandler)(apiAction, receiveHandler, errorHandler));
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.31.0",
+  "version": "1.31.1",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
@@ -29,7 +29,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.31.0",
+    "redhotmagma-visualization": "1.31.1",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Reducers/Api/Actions.js

@@ -10,18 +10,12 @@ export const POST_DATA = 'POST_DATA';
 export const DELETE_DATA = 'DELETE_DATA';
 export const CANCEL_REQUEST = 'CANCEL_REQUEST';
 export const EXPIRED_RESPONSE = 'EXPIRED_RESPONSE';
-export const RESET_DID_INVALIDATE = 'RESET_DID_INVALIDATE';
 
 export const invalidateSource = key => ({
     type: INVALIDATE_SOURCE,
     key,
 });
 
-export const resetDidInvalidate = key => ({
-    type: RESET_DID_INVALIDATE,
-    key,
-});
-
 export const requestData = (source, key) => ({
     type: REQUEST_DATA,
     source,

package/src/App/Reducers/Api/Reducer.js

@@ -7,7 +7,6 @@ import {
     DELETE_DATA,
     CANCEL_REQUEST,
     EXPIRED_RESPONSE,
-    RESET_DID_INVALIDATE,
 } from './Actions';
 
 const data = (
@@ -28,11 +27,6 @@ const data = (
                 didInvalidate: true,
                 data: null,
             };
-        case RESET_DID_INVALIDATE:
-            return {
-                ...state,
-                didInvalidate: false,
-            };
         case REQUEST_DATA:
             return {
                 ...state,
@@ -96,7 +90,6 @@ export const dataBySource = (state = {}, action) => {
         case DELETE_DATA:
         case CANCEL_REQUEST:
         case EXPIRED_RESPONSE:
-        case RESET_DID_INVALIDATE:
             return {
                 ...state,
                 [action.key]: data(state[action.key], action),

package/src/Components/DefaultForm.js

@@ -13,11 +13,10 @@ export default class DefaultForm extends Component {
             onAction,
             config,
             closeAfterSave,
-            customPostData
         } = this.props;
         const { actionButtons } = config;
 
-        const onSubmit = customPostData ? customPostData : !closeAfterSave ? postData : () => postData(true);
+        const onSubmit = !closeAfterSave ? postData : () => postData(true);
 
         return entityState.isReady ? (
             <Form

package/src/Components/TranslationFinder.js

@@ -20,7 +20,6 @@ let TranslationFinder = props => {
     const { language, data, property, fallback } = props;
     return <span>{get(find(data, { language }), property, fallback)}</span>;
 };
-
 const mapStateToProps = ({ i18n }) => ({
     language: i18n.locale.replace('-', '_'),
 });

package/src/Screens/Client/Components/TextFields.js

@@ -0,0 +1,77 @@
+import React, { Component } from 'react';
+import find from 'lodash/find';
+import TextField from '@material-ui/core/TextField/TextField';
+import Typography from '@material-ui/core/Typography/Typography';
+import { t } from '../../../App/i18n';
+
+export default class TextFields extends Component {
+    onTextChange = textId => ({ target: { value: termsAndConditionsLink } }) => {
+        const { value: texts, name, onChange } = this.props;
+
+        const newTexts = texts.map(text => {
+            if (text.id !== textId) {
+                return text;
+            }
+
+            return {
+                ...text,
+                termsAndConditionsLink,
+            };
+        });
+
+        onChange(name, newTexts);
+    };
+
+    getGroupedTexts = () => {
+        const { value } = this.props;
+
+        const groupedTexts = [];
+
+        for (const text of value) {
+            let group = find(groupedTexts, { id: text.channel.id });
+
+            if (!group) {
+                group = {
+                    id: text.channel.id,
+                    identifier: text.channel.identifier,
+                    texts: [],
+                };
+
+                groupedTexts.push(group);
+            }
+
+            group.texts.push({
+                id: text.id,
+                language: text.language,
+                termsAndConditionsLink: text.termsAndConditionsLink,
+            });
+        }
+
+        return groupedTexts;
+    };
+
+    render() {
+        const groupedTexts = this.getGroupedTexts();
+
+        return groupedTexts.length ? (
+            <div>
+                <Typography>{t('Texts')}</Typography>
+                {groupedTexts.map((group, groupIndex) => (
+                    <React.Fragment key={groupIndex}>
+                        <Typography variant="overline">{group.identifier}</Typography>
+                        {group.texts.map((text, textIndex) => (
+                            <TextField
+                                key={textIndex}
+                                label={`${t('termsAndConditionsLink')} ${text.language}`}
+                                onChange={this.onTextChange(text.id)}
+                                value={text.termsAndConditionsLink || ''}
+                                fullWidth
+                                margin="normal"
+                            />
+                        ))}
+                    </React.Fragment>
+                ))}
+            </div>
+        ) : null;
+    }
+}

package/src/Screens/Client/Containers/Edit.js

@@ -1,6 +1,7 @@
 import Actions, { REDUCER_NAME } from '../Reducers/Actions';
 import SimpleNestedData from '../../../Components/FormFragments/SimpleNestedData';
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
+import TextFields from '../Components/TextFields';
 import ColorTextField from '../Components/ColorTextField';
 import { t } from '../../../App/i18n';
 import React from 'react';
@@ -138,22 +139,8 @@ const formFields = [
         dynamicDefaultLabel: false
     },
     {
+        type: TextFields,
         name: 'texts',
-        label: 'termsAndConditionsLink',
-        type: 'intl',
-        intl: {
-            name: 'termsAndConditionsLink',
-            type: 'text',
-        },
-    },
-    {
-        name: 'texts',
-        label: 'dataPrivacyLink',
-        type: 'intl',
-        intl: {
-            name: 'dataPrivacyLink',
-            type: 'text',
-        },
     },
     {
         name: 'channels',

package/src/Screens/Client/Translations.js

@@ -5,7 +5,6 @@ require('../../App/i18n').use(
             Users: 'Users',
             'Theme - Highlight color': 'Theme - Highlight color',
             termsAndConditionsLink: 'Terms and conditions link',
-            dataPrivacyLink: 'Data privacy Link',
             themeColorError: 'Please enter a valid hex color (e.g. #0000ff)"',
             client: {
                 addButtonLabel: 'Add Client',
@@ -22,8 +21,7 @@ require('../../App/i18n').use(
             Users: 'Benutzer',
             'Theme - Highlight color': 'Theme - Highlightfarbe',
             'Theme - Font': 'Theme - Font',
-            termsAndConditionsLink: 'Link zu den Nutzungsbedingungen',
-            dataPrivacyLink: 'Link zu den Datenschutzbestimmungen',
+            termsAndConditionsLink: 'Terms and conditions link',
             'Clientname / Shopname': 'Bezeichner/ Shopname',
             'E-mail (contact)': 'E-Mail (Kontakt)',
             'Street / no': 'Straße / Hausnummer',

package/src/Screens/Creator/Components/VisualizationAndMediaData/Components/ImageEditTools.js

@@ -7,10 +7,8 @@ import { t } from '../../../../../App/i18n';
 import ConfirmDelete from './ConfirmDelete';
 import Api from '../../../../../App/Api';
 import { networkError } from '../../../../../App/Reducers/Api/Actions';
-import { showErrorMessage, cancelErrorMessage } from '../../../../../App/Reducers/Frame/Actions';
 import { useDispatch } from 'react-redux';
 import { Tooltip } from '@material-ui/core';
-import FileDrop from 'react-file-drop';
 
 const ImageEditTools = withStyles({
     root: {
@@ -19,32 +17,18 @@ const ImageEditTools = withStyles({
     fileInput: {
         display: 'none',
     },
-    fileDrop: {
-        position: 'absolute',
-        top: 0,
-        left: '50%',
-        width: 150,
-        marginLeft: -75,
-        height: 100,
-    },
 })(({ classes, className, deleteEnabled, uploadUrl, removeUrl, onUpdate }) => {
     const fileInputRef = useRef(null);
     const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
     const dispatch = useDispatch();
 
     const uploadImage = async image => {
-        const allowedFormats = ['image/jpeg', 'image/jpg', 'image/png'];
-
         if (!uploadUrl) {
             throw new Error('uploadUrl is not provided!');
         }
-        if (allowedFormats.indexOf(image.type) === -1) {
-            return dispatch(showErrorMessage(t('visualizationAndMediaData.unsupportedFileTypeError')));
-        }
         try {
             const data = new FormData();
             data.append('file', image);
-            dispatch(cancelErrorMessage());
             return await Api.request({ method: 'post', url: uploadUrl, data });
         } catch (e) {
             dispatch(networkError('image', 'image', e));
@@ -62,56 +46,47 @@ const ImageEditTools = withStyles({
     };
 
     return (
-        <FileDrop
-            className={classes.fileDrop}
-            onDrop={async files => {
-                await uploadImage(files[0]);
-                onUpdate && onUpdate();
-            }}
-            multiple={false}
-        >
-            <div className={`${classes.root} ${className}`}>
-                <input
-                    ref={fileInputRef}
-                    type="file"
-                    accept="image/jpeg, image/png"
-                    className={classes.fileInput}
-                    onChange={async evt => {
-                        if (evt.target.files.length) {
-                            await uploadImage(evt.target.files[0]);
-                            onUpdate && onUpdate();
-                        }
-                    }}
-                />
-                <label>
-                    <Tooltip title={t('visualizationAndMediaData.imageAddTooltip')}>
-                        <IconButton onClick={() => fileInputRef.current.click()}>
-                            <ImageSearchIcon />
-                        </IconButton>
-                    </Tooltip>
-                </label>
-                {deleteEnabled && (
-                    <Tooltip title={t('visualizationAndMediaData.imageDeleteTooltip')}>
-                        <IconButton onClick={() => setShowDeleteConfirm(true)}>
-                            <DeleteIcon />
-                        </IconButton>
-                    </Tooltip>
-                )}
-
-                <ConfirmDelete
-                    open={showDeleteConfirm}
-                    onCancel={() => setShowDeleteConfirm(false)}
-                    onConfirm={async () => {
-                        await removeImage();
-                        setShowDeleteConfirm(false);
+        <div className={`${classes.root} ${className}`}>
+            <input
+                ref={fileInputRef}
+                type="file"
+                accept="image/jpeg, image/png"
+                className={classes.fileInput}
+                onChange={async evt => {
+                    if (evt.target.files.length) {
+                        await uploadImage(evt.target.files[0]);
                         onUpdate && onUpdate();
-                    }}
-                    title={t('visualizationAndMediaData.imageDeleteConfirm.title')}
-                    message={t('visualizationAndMediaData.imageDeleteConfirm.message')}
-                />
-            </div>
-        </FileDrop>
+                    }
+                }}
+            />
+            <label>
+                <Tooltip title={t('visualizationAndMediaData.imageAddTooltip')}>
+                    <IconButton onClick={() => fileInputRef.current.click()}>
+                        <ImageSearchIcon />
+                    </IconButton>
+                </Tooltip>
+            </label>
+            {deleteEnabled && (
+                <Tooltip title={t('visualizationAndMediaData.imageDeleteTooltip')}>
+                    <IconButton onClick={() => setShowDeleteConfirm(true)}>
+                        <DeleteIcon />
+                    </IconButton>
+                </Tooltip>
+            )}
+
+            <ConfirmDelete
+                open={showDeleteConfirm}
+                onCancel={() => setShowDeleteConfirm(false)}
+                onConfirm={async () => {
+                    await removeImage();
+                    setShowDeleteConfirm(false);
+                    onUpdate && onUpdate();
+                }}
+                title={t('visualizationAndMediaData.imageDeleteConfirm.title')}
+                message={t('visualizationAndMediaData.imageDeleteConfirm.message')}
+            />
+        </div>
     );
 });
 
-export default ImageEditTools;
+export default ImageEditTools;

package/src/Screens/Creator/Components/VisualizationAndMediaData/Translations.js

@@ -44,7 +44,6 @@ require('../../../../App/i18n').use(
                     title: 'Delete image',
                     message: 'Do you really want to delete this image?',
                 },
-                unsupportedFileTypeError: 'Unsupported file format',
             },
         },
         de: {
@@ -93,7 +92,6 @@ require('../../../../App/i18n').use(
                     title: 'Bild löschen',
                     message: 'Möchtest du dieses Bild wirklich löschen?',
                 },
-                unsupportedFileTypeError: 'Nicht unterstütztes Dateiformat',
             },
         },
     },

package/src/Screens/Creator/Components/VisualizationAndMediaData/VisualizationAndMediaData.js

@@ -70,7 +70,6 @@ const ImageTile = withStyles(theme => ({
     return (
         <div className={classes.imageTile}>
             {expectedSrc ? <PathStructure path={expectedSrc} /> : <Image src={src} />}
-
             {uploadUrl && removeUrl && (
                 <ImageEditTools
                     className={classes.imageEditTools}

package/src/Screens/Creator/Components/VisualizationAndMediaData/VisualizationAndMediaData.test.js

@@ -3,7 +3,6 @@ import { act } from 'react-dom/test-utils';
 import { VisualizationAndMediaData } from './VisualizationAndMediaData';
 import { mount, render } from 'enzyme';
 import FormControl from '@material-ui/core/FormControl';
-jest.mock('react-file-drop', () => props => <div>{props.children}</div>);
 
 const mockDispatch = jest.fn();
 jest.mock('react-redux', () => ({

package/src/Screens/CurrentClient/Containers/Edit.js

@@ -1,6 +1,7 @@
 import Actions, { REDUCER_NAME } from '../Reducers/Actions';
 import SimpleNestedData from '../../../Components/FormFragments/SimpleNestedData';
 import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
+import TextFields from '../../Client/Components/TextFields';
 import { withLoadAction } from '../../../Components/withLoadAction';
 import { t } from '../../../App/i18n';
 import { CallToActionField } from '../../../Components/CallToActionField';
@@ -107,22 +108,8 @@ const formFields = [
         dynamicDefaultLabel: false
     },
     {
+        type: TextFields,
         name: 'texts',
-        label: 'termsAndConditionsLink',
-        type: 'intl',
-        intl: {
-            name: 'termsAndConditionsLink',
-            type: 'text',
-        },
-    },
-    {
-        name: 'texts',
-        label: 'Title',
-        type: 'dataPrivacyLink',
-        intl: {
-            name: 'dataPrivacyLink',
-            type: 'text',
-        },
     },
     {
         name: 'customCss',

package/src/Screens/CurrentClient/Reducers/Reducer.js

@@ -7,7 +7,7 @@ const initialState = {
     ...getDefaultEntityState(
         {
             id: null,
-            texts: { value: [] },
+            texts: { value: [], constraints: { presence: true } },
             theme: {
                 value: {},
                 schema: {

package/src/Screens/DefaultClient/Containers/Edit.js

@@ -3,6 +3,7 @@ import generateConnectedEdit from '../../../Components/DefaultConnectedForm';
 import { withLoadAction } from '../../../Components/withLoadAction';
 import SimpleNestedData from '../../../Components/FormFragments/SimpleNestedData';
 import { t, T } from '../../../App/i18n';
+import TextFields from '../../Client/Components/TextFields';
 import PdfMarkDownField from '../../Client/Components/PdfMarkdownField';
 
 const formFields = [
@@ -123,22 +124,8 @@ const formFields = [
         ],
     },
     {
+        type: TextFields,
         name: 'texts',
-        label: 'termsAndConditionsLink',
-        type: 'intl',
-        intl: {
-            name: 'termsAndConditionsLink',
-            type: 'text',
-        },
-    },
-    {
-        name: 'texts',
-        label: 'dataPrivacyLink',
-        type: 'intl',
-        intl: {
-            name: 'dataPrivacyLink',
-            type: 'text',
-        },
     },
     {
         name: 'customCss',

package/src/Screens/DefaultClient/Reducers/Reducer.js

@@ -12,7 +12,7 @@ const initialState = {
             theme: {
                 value: {},
                 schema: {
-                    highlightColor: { value: '' },
+                    highlightColor: { value: '', constraints: { presence: true } },
                     logo: { value: '' },
                     font: { value: '' },
                 },

package/src/Screens/Group/Reducers/Actions.js

@@ -7,6 +7,6 @@ import { generateDefaultActions } from '../../../App/Reducers/Entity/Actions';
 
 const actions = generateDefaultActions(LIST_KEY, DATA_KEY, REDUCER_NAME, GROUPS_URL);
 
-export const { hideDetails, loadEntity, postData } = actions;
+export const { hideDetails, loadEntity } = actions;
 
 export default actions;

package/src/Screens/Item/Components/Variants/VariantsEditor.js

@@ -8,7 +8,6 @@ import TableHead from '@material-ui/core/TableHead';
 import TableRow from '@material-ui/core/TableRow';
 import Checkbox from '@material-ui/core/Checkbox/Checkbox';
 import TablePagination from '@material-ui/core/TablePagination';
-import uniq from 'lodash/uniq';
 import { addReduxListener, removeReduxListener } from '../../../../App/ReduxListener';
 import { t } from '../../../../App/i18n';
 import Actions, { ITEM_REDUCER_NAME } from '../../Reducers/Actions';
@@ -65,7 +64,7 @@ const getGroupsFromChildren = children => {
         }
     }
 
-    return { groups, groupIdsInOrder: uniq(groupIdsInOrder) };
+    return { groups, groupIdsInOrder };
 };
 
 const prepareDataForRendering = children => {
@@ -223,7 +222,7 @@ class VariantsEditor extends Component {
 
         this.setState({
             groups,
-            groupIdsInOrder: uniq(groupIdsInOrder),
+            groupIdsInOrder,
         });
     };
 

package/src/Screens/Item/Components/Variants/VariantsEditorPopup.js

@@ -8,7 +8,6 @@ import * as GroupActions from '../../../Group/Reducers/Actions';
 import * as GroupEntryActions from '../../../GroupEntry/Reducers/Actions';
 
 import { T } from '../../../../App/i18n';
-import { resetDidInvalidate } from '../../../../App/Reducers/Api/Actions';
 
 export class VariantsEditorPopup extends React.Component {
     render() {
@@ -22,11 +21,7 @@ export class VariantsEditorPopup extends React.Component {
                     open={showGroupEditor}
                     scroll={'paper'}
                 >
-                    <GroupEdit
-                        customPostData={this.props.customPostData}
-                        onCancel={this.props.cancelGroup}
-                        closeAfterSave
-                    />
+                    <GroupEdit onCancel={this.props.cancelGroup} closeAfterSave />
                 </Dialog>
 
                 <Dialog
@@ -56,11 +51,6 @@ const renderDispatchToProps = dispatch => ({
     cancelGroup: () => {
         dispatch(GroupActions.hideDetails(false));
     },
-    customPostData: async () => {
-        await dispatch(GroupActions.postData(true));
-        // need to reset didInvalidate flag as it is set on save of group which is blocking to reloadList
-        dispatch(resetDidInvalidate(GroupActions.GROUPS_URL));
-    },
     cancelGroupEntry: () => {
         dispatch(GroupEntryActions.hideDetails(false));
     },

package/src/Screens/Login/Reducers/Actions.js

@@ -49,7 +49,11 @@ const errorHandler = dispatch => error => {
 };
 
 export const postLoginData = (username, password) => dispatch => {
-    return dispatchPostData(dispatch)(LOGIN_DATA_KEY, 'login_check', {username, password}).then(apiAction => {
+    const data = new ObjectFormData({
+        _username: username,
+        _password: password,
+    });
+    return dispatchPostData(dispatch)(LOGIN_DATA_KEY, 'login_check', data).then(apiAction => {
         return dispatch(apiActionHandler(apiAction, receiveHandler, errorHandler));
     });
 };