@configuratorware/configurator-admingui 1.41.1 → 1.42.1

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

@@ -1,44 +0,0 @@
-export const UPLOAD_URL = 'license/upload';
-export const UPLOAD_KEY = 'licenceupload';
-export const LICENSE_DATA_KEY = 'license';
-export const LICENSE_REDUCER_NAME = 'licenseData';
-
-import { dispatchPostData, RECEIVE_DATA } from '../../../App/Reducers/Api/Helpers';
-
-import { isString } from 'lodash';
-import { setLicense } from '../../Login/Reducers/Actions';
-
-export const saveLicense = file => dispatch => {
-    return new Promise(resolve => {
-        if (file) {
-            let license = null;
-            if (file && !isString(file)) {
-                license = {
-                    name: 'file',
-                    value: file,
-                    filename: file.name,
-                };
-            }
-            uploadLicense(license.name, license.value, license.filename, dispatch, resolve, () => {
-                // eslint-disable-next-line no-console
-                console.log('license uploaded successfully');
-            });
-        }
-    });
-};
-
-const uploadLicense = (field, value, fileName, dispatch, resolve, cb) => {
-    const files = new FormData();
-
-    files.append('license', value, fileName);
-
-    dispatchPostData(dispatch)(UPLOAD_KEY, UPLOAD_URL, files).then(uploadApiAction => {
-        if (uploadApiAction.type === RECEIVE_DATA) {
-            dispatch(setLicense(uploadApiAction.data));
-            cb();
-        } else {
-            dispatch(setLicense(null));
-            resolve(uploadApiAction); // resolve with the problem to handle
-        }
-    });
-};

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

@@ -1,35 +0,0 @@
-import { LICENSE_DATA_KEY, LICENSE_REDUCER_NAME } from './Actions';
-import { getDefaultEntityState, defaultEntityReducer } from '../../../App/Reducers/Entity/Reducer';
-import { createFeatureReducer } from '../../../App/FeatureReducers';
-import { RECEIVE_DATA, NETWORK_ERROR } from '../../../App/Reducers/Api/Actions';
-
-const initialState = {
-    ...getDefaultEntityState(
-        {
-            license: null,
-            status: null,
-        },
-        null,
-        LICENSE_DATA_KEY
-    ),
-};
-
-export const licenseData = createFeatureReducer(LICENSE_REDUCER_NAME, (state = initialState, action) => {
-    if (action.type === RECEIVE_DATA) {
-        state = {
-            ...state,
-            license: action.data.license,
-            status: action.data.success || action.data.license !== null ? 'success' : 'error',
-        };
-    } else if (action.type === NETWORK_ERROR) {
-        state = {
-            ...state,
-            license: null,
-            status: 'error',
-        };
-    }
-
-    return defaultEntityReducer(state, action, initialState);
-});
-
-export default licenseData;

package/src/Screens/License/Screen.js

@@ -1,116 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-
-import { T, t } from '../../App/i18n';
-import './Translations';
-import './Styles.scss';
-import { get } from 'lodash';
-import { Typography, IconButton } from '@material-ui/core';
-import CheckCircleIcon from '../../UIComponents/icons/CheckmarkIcon';
-import ErrorIcon from '../../UIComponents/icons/ErrorIcon';
-import CancelIcon from '@material-ui/icons/Cancel';
-import { saveLicense } from './Reducers/Actions';
-import { InputWrapper } from '../../Components/Form';
-import { useState } from 'react';
-
-const License = props => {
-    const { uploadedLicense, license, saveLicense, status } = props;
-    const [file, setFile] = useState(null);
-
-    const isCreator =
-        (uploadedLicense === null && (license === 'creator' || license === 'creator+designer')) ||
-        uploadedLicense === 'creator' ||
-        uploadedLicense === 'creator+designer';
-
-    const isDesigner =
-        (uploadedLicense === null && (license === 'designer' || license === 'creator+designer')) ||
-        uploadedLicense === 'designer' ||
-        uploadedLicense === 'creator+designer';
-    
-    const isFinder =
-        (uploadedLicense === null && license && license.indexOf('finder') !== -1) ||
-        (uploadedLicense && uploadedLicense.indexOf('finder') !== -1);
-
-    const styles = {
-        success: {
-            color: 'green',
-        },
-        hint: {
-            paddingTop: 10,
-        },
-    };
-    return (
-        <div className="license">
-            <h1>{T('licenses')}</h1>
-            {!uploadedLicense && !license && (
-                <div className="notice">
-                    <IconButton>
-                        <ErrorIcon />
-                    </IconButton>
-                    <Typography className="text">{T('license.error')}</Typography>
-                </div>
-            )}
-            <Typography variant="body1" style={styles.hint}>
-                {T('uploadHint')}
-            </Typography>
-            <InputWrapper
-                name="file"
-                label=""
-                type="file"
-                onChange={(name, value) => {
-                    setFile(value);
-                    saveLicense(value);
-                }}
-                showFileName={true}
-            />
-            {status &&
-                file &&
-                (status === 'success' ? (
-                    <Typography variant="body1" style={styles.success}>
-                        {T('uploadSuccess')}
-                    </Typography>
-                ) : (
-                    <Typography variant="body1" color="error">
-                        {T('uploadFailure')}
-                    </Typography>
-                ))}
-            <h2>{t('licenseProducts')}</h2>
-            <div>
-                <div className={isCreator ? 'row success' : 'row invalid'}>
-                    <Typography className="label" variant="body1">
-                        {T('license.creator')}
-                    </Typography>
-                    <IconButton>{isCreator ? <CheckCircleIcon /> : <CancelIcon />}</IconButton>
-                </div>
-
-                <div className={isDesigner ? 'row success' : 'row invalid'}>
-                    <Typography className="label" variant="body1">
-                        {T('license.designer')}
-                    </Typography>
-                    <IconButton>{isDesigner ? <CheckCircleIcon /> : <CancelIcon />}</IconButton>
-                </div>
-                
-                <div className={isFinder ? 'row success' : 'row invalid'}>
-                    <Typography className="label" variant="body1">
-                        {T('license.finder')}
-                    </Typography>
-                    <IconButton>{isFinder ? <CheckCircleIcon /> : <CancelIcon />}</IconButton>
-                </div>
-            </div>
-        </div>
-    );
-};
-
-const mapStateToProps = state => {
-    return {
-        license: get(state, `loginData.license`, null),
-        status: get(state, 'licenseData.status', null),
-        uploadedLicense: get(state, 'licenseData.license', null),
-    };
-};
-
-const mapDispatchToProps = dispatch => ({
-    saveLicense: file => dispatch(saveLicense(file)),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(License);

package/src/Screens/License/Styles.scss

@@ -1,35 +0,0 @@
-.license {
-    .element-wrapper {
-        button {
-            margin-left: 0;
-        }
-    }
-    .row {
-    display: flex;
-    align-items: center;
-    p {
-        padding: 12px 0;
-    }
-    button { 
-        color: green
-    }
-    &.invalid {
-        button {
-            color: red;
-        }
-    }
-}
-.notice {
-    button {
-        color: rgb(97, 26, 21);
-    }
-    margin-bottom: 10px;
-    color: rgb(97, 26, 21);
-    display: flex;
-    align-items: center;
-    z-index: 2;
-    max-width: 90vw;
-    border-radius: 4px;
-    background-color: rgb(253, 236, 234)
-}
-}

package/src/Screens/License/Translations.js

@@ -1,19 +0,0 @@
-require('../../App/i18n').use(
-    {
-        en: {
-            licenses: 'Licenses',
-            uploadSuccess: 'License valid',
-            uploadFailure: 'License invalid',
-            uploadHint: 'Please upload your license file here',
-            licenseProducts: 'Licensed products:',
-        },
-        de: {
-            licenses: 'Lizenzen',
-            uploadSuccess: 'Lizenz freigeschaltet',
-            uploadFailure: 'Lizenz ungültig',
-            uploadHint: 'Bitte lade hier Deine gültige Lizenzdatei hoch',
-            licenseProducts: 'Lizensierte Produkte:',
-        },
-    },
-    true
-);

package/src/Screens/License/__tests__/LicenseScreen.test.js

@@ -1,23 +0,0 @@
-import { render } from 'enzyme';
-import React from 'react';
-
-import License from '../Screen';
-
-import { initConnectedComponent } from '../../../App/TestHelpers';
-const ConnectedScreen = initConnectedComponent(License);
-
-// Labels to be shown
-const licenseTypes = ['creator', 'designer', 'finder'];
-
-describe('License / Screen', () => {
-    it('INTEGRATION - renders the screen', () => {
-        const tree = render(<ConnectedScreen />);
-        expect(tree).toMatchSnapshot();
-    });
-
-    it('INTEGRATION - loads the list of licenses available', () => {
-        const tree = render(<ConnectedScreen />);
-        const licenseLabels = tree.find('p.label');
-        expect(licenseLabels.length).toBe(licenseTypes.length);
-    });
-});

package/src/Screens/License/__tests__/__snapshots__/LicenseScreen.test.js.snap

@@ -1,219 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`License / Screen INTEGRATION - renders the screen 1`] = `
-<div
-  class="license"
->
-  <h1>
-    <span>
-      Licenses
-    </span>
-  </h1>
-  <div
-    class="notice"
-  >
-    <button
-      class="MuiButtonBase-root-7 MuiIconButton-root-1"
-      tabindex="0"
-      type="button"
-    >
-      <span
-        class="MuiIconButton-label-6"
-      >
-        <svg
-          aria-hidden="true"
-          class="MuiSvgIcon-root-10"
-          focusable="false"
-          role="presentation"
-          viewBox="0 0 24 24"
-        >
-          <path
-            d="M0 0h24v24H0z"
-            fill="none"
-          />
-          <path
-            d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"
-          />
-        </svg>
-      </span>
-    </button>
-    <p
-      class="MuiTypography-root-19 MuiTypography-body1-28 text"
-    >
-      <span>
-        license.error
-      </span>
-    </p>
-  </div>
-  <p
-    class="MuiTypography-root-19 MuiTypography-body1-28"
-    style="padding-top:10px"
-  >
-    <span>
-      Please upload your license file here
-    </span>
-  </p>
-  <div
-    class="form-input-wrapper "
-    id="file"
-  >
-    <div>
-      <div
-        class="MuiFormControl-root-66"
-      >
-        <div
-          class="element-wrapper File-wrapper-63"
-        >
-          <button
-            class="MuiButtonBase-root-7 MuiButton-root-71 MuiButton-contained-82 MuiButton-raised-85 File-button-55"
-            tabindex="0"
-            type="button"
-          >
-            <span
-              class="MuiButton-label-72"
-            >
-              <span>
-                <svg
-                  aria-hidden="true"
-                  class="MuiSvgIcon-root-10 File-folderIcon-58"
-                  focusable="false"
-                  role="presentation"
-                  viewBox="0 0 24 24"
-                >
-                  <path
-                    d="M10 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2h-8l-2-2z"
-                  />
-                  <path
-                    d="M0 0h24v24H0z"
-                    fill="none"
-                  />
-                </svg>
-                <span>
-                  Upload file
-                </span>
-              </span>
-              <input
-                class="File-fileInput-56"
-                type="file"
-              />
-            </span>
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-  <h2>
-    Licensed products:
-  </h2>
-  <div>
-    <div
-      class="row invalid"
-    >
-      <p
-        class="MuiTypography-root-19 MuiTypography-body1-28 label"
-      >
-        <span>
-          license.creator
-        </span>
-      </p>
-      <button
-        class="MuiButtonBase-root-7 MuiIconButton-root-1"
-        tabindex="0"
-        type="button"
-      >
-        <span
-          class="MuiIconButton-label-6"
-        >
-          <svg
-            aria-hidden="true"
-            class="MuiSvgIcon-root-10"
-            focusable="false"
-            role="presentation"
-            viewBox="0 0 24 24"
-          >
-            <path
-              d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"
-            />
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-            />
-          </svg>
-        </span>
-      </button>
-    </div>
-    <div
-      class="row invalid"
-    >
-      <p
-        class="MuiTypography-root-19 MuiTypography-body1-28 label"
-      >
-        <span>
-          license.designer
-        </span>
-      </p>
-      <button
-        class="MuiButtonBase-root-7 MuiIconButton-root-1"
-        tabindex="0"
-        type="button"
-      >
-        <span
-          class="MuiIconButton-label-6"
-        >
-          <svg
-            aria-hidden="true"
-            class="MuiSvgIcon-root-10"
-            focusable="false"
-            role="presentation"
-            viewBox="0 0 24 24"
-          >
-            <path
-              d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"
-            />
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-            />
-          </svg>
-        </span>
-      </button>
-    </div>
-    <div
-      class="row invalid"
-    >
-      <p
-        class="MuiTypography-root-19 MuiTypography-body1-28 label"
-      >
-        <span>
-          license.finder
-        </span>
-      </p>
-      <button
-        class="MuiButtonBase-root-7 MuiIconButton-root-1"
-        tabindex="0"
-        type="button"
-      >
-        <span
-          class="MuiIconButton-label-6"
-        >
-          <svg
-            aria-hidden="true"
-            class="MuiSvgIcon-root-10"
-            focusable="false"
-            role="presentation"
-            viewBox="0 0 24 24"
-          >
-            <path
-              d="M12 2C6.47 2 2 6.47 2 12s4.47 10 10 10 10-4.47 10-10S17.53 2 12 2zm5 13.59L15.59 17 12 13.41 8.41 17 7 15.59 10.59 12 7 8.41 8.41 7 12 10.59 15.59 7 17 8.41 13.41 12 17 15.59z"
-            />
-            <path
-              d="M0 0h24v24H0z"
-              fill="none"
-            />
-          </svg>
-        </span>
-      </button>
-    </div>
-  </div>
-</div>
-`;

package/src/Screens/License/index.js

@@ -1,10 +0,0 @@
-import Screen from './Screen';
-import Reducer from './Reducers/Reducer';
-import { addReducers } from '../../App/FeatureReducers';
-
-addReducers(Reducer);
-
-export default {
-    Screen,
-    credentials: ['licenses'],
-};

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

@@ -1,57 +0,0 @@
-import { browserHistory } from 'react-router';
-
-import { dispatchPostData, apiActionHandler } from '../../../App/Reducers/Api/Helpers';
-import { showErrorMessage } from '../../../App/Reducers/Frame/Actions';
-import { ObjectFormData } from '../../../App/Api';
-import { addReduxListener } from '../../../App/ReduxListener';
-import networkConfig from '../../../App/Config/network';
-import loginListener from './Listener';
-
-export const LOGIN_DATA_KEY = 'login';
-export const LOGIN_REDUCER_NAME = 'loginData';
-export const LOGIN_SET_DATA = 'LOGIN_SET_DATA';
-export const LOGIN_RESET = 'LOGIN_RESET';
-export const LOGIN_ERROR = 'LOGIN_ERROR';
-export const SET_LICENSE = 'SET_LICENSE';
-
-const setLoginData = data => ({
-    type: LOGIN_SET_DATA,
-    data,
-});
-
-export const logout = () => {
-    browserHistory.push(networkConfig.basePath); // redirect to root
-    return {
-        type: LOGIN_RESET,
-    };
-};
-
-export const loginError = error => ({
-    type: LOGIN_ERROR,
-    error,
-});
-
-export const setLicense = data => ({
-    type: SET_LICENSE,
-    data,
-});
-
-const receiveHandler = dispatch => source => {
-    if (source.isPosted) {
-        //browserHistory.push(basePath); // redirect to dashboard
-        dispatch(setLoginData(source.data));
-    }
-};
-
-const errorHandler = dispatch => error => {
-    dispatch(loginError(error.response.data.message));
-    dispatch(showErrorMessage(error.response.data.message));
-};
-
-export const postLoginData = (username, password) => dispatch => {
-    return dispatchPostData(dispatch)(LOGIN_DATA_KEY, 'login_check', {username, password}).then(apiAction => {
-        return dispatch(apiActionHandler(apiAction, receiveHandler, errorHandler));
-    });
-};
-
-addReduxListener(loginListener);

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

@@ -1,13 +0,0 @@
-import { NETWORK_ERROR } from '../../../App/Reducers/Api/Actions';
-import { logout } from './Actions';
-
-export const loginListener = {
-    [NETWORK_ERROR]: (action, dispatch) => {
-        if (action.error.response && action.error.response.status === 401) {
-            // unauthorized, should log in again
-            dispatch(logout());
-        }
-    },
-};
-
-export default loginListener;

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

@@ -1,73 +0,0 @@
-import _ from 'lodash';
-import {
-    LOGIN_DATA_KEY,
-    LOGIN_SET_DATA,
-    LOGIN_RESET,
-    LOGIN_ERROR,
-    SET_LICENSE,
-    LOGIN_REDUCER_NAME,
-} from './Actions';
-import { handleNetworkErrorAction } from '../../../App/Reducers/Api/Helpers';
-import { createFeatureReducer } from '../../../App/FeatureReducers';
-
-const initialState = {
-    credentials: [],
-    token: '',
-    isLoggedIn: false,
-    error: null,
-    license: null,
-};
-
-export const loginData = createFeatureReducer(LOGIN_REDUCER_NAME, (state = initialState, action) => {
-    switch (action.type) {
-        case LOGIN_SET_DATA: {
-            const { credentials, token, license } = action.data;
-            return {
-                ...state,
-                credentials,
-                token,
-                license,
-                isLoggedIn: true,
-                error: null,
-            };
-        }
-
-        case LOGIN_RESET: {
-            return {
-                credentials: [],
-                token: '',
-                isLoggedIn: false,
-                error: null,
-            };
-        }
-
-        case SET_LICENSE: {
-            const license = _.get(action, 'data.license', state.license);
-            const credentials = _.get(action, 'data.credentials', state.credentials);
-            return {
-                ...state,
-                license,
-                credentials,
-            };
-        }
-
-        case LOGIN_ERROR: {
-            return {
-                ...state,
-                isLoggedIn: false,
-                error: action.error,
-            };
-        }
-    }
-    if (action.key === LOGIN_DATA_KEY) {
-        handleNetworkErrorAction(action, () => {
-            if (action.error.response && _.isObject(action.error.response.data)) {
-                return true;
-            }
-            return false;
-        });
-    }
-    return state;
-});
-
-export default loginData;