Skip to content

Commit

Permalink
[kbss-cvut#66] Refactor records to use the new messaging component.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ledsoft
ledsoft committed Jan 15, 2024
1 parent 6911e21 commit cb9a57e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 28 deletions.
15 changes: 9 additions & 6 deletions js/actions/RecordActions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@ import {axiosBackend} from "./index";
import * as Utils from "../utils/Utils";
import {loadRecords} from "./RecordsActions";
import {API_URL} from '../../config';
import {publishMessage} from "./MessageActions";
import {errorMessage, successMessage} from "../model/Message";

export function deleteRecord(record, currentUser) {
//console.log("Deleting record: ", record);
return function (dispatch) {
dispatch(deleteRecordPending(record.key));
axiosBackend.delete(`${API_URL}/rest/records/${record.key}`, {
return axiosBackend.delete(`${API_URL}/rest/records/${record.key}`, {
...record
}).then(() => {
dispatch(loadRecords(currentUser));
dispatch(deleteRecordSuccess(record, record.key));
dispatch(publishMessage(successMessage("record.delete-success")));
}).catch((error) => {
dispatch(deleteRecordError(error.response.data, record, record.key));
dispatch(publishMessage(errorMessage('record.delete-error', {error: error.response.data.message})));
});
}
}
Expand Down Expand Up @@ -48,7 +51,7 @@ export function loadRecord(key) {
//console.log("Loading record with key: ", key);
return function (dispatch) {
dispatch(loadRecordPending());
axiosBackend.get(`${API_URL}/rest/records/${key}`).then((response) => {
return axiosBackend.get(`${API_URL}/rest/records/${key}`).then((response) => {
dispatch(loadRecordSuccess(response.data));
}).catch((error) => {
dispatch(loadRecordError(error.response.data));
Expand Down Expand Up @@ -86,7 +89,7 @@ export function createRecord(record, currentUser) {
//console.log("Creating record: ", record);
return function (dispatch) {
dispatch(saveRecordPending(ACTION_FLAG.CREATE_ENTITY));
axiosBackend.post(`${API_URL}/rest/records`, {
return axiosBackend.post(`${API_URL}/rest/records`, {
...record
}).then((response) => {
const key = Utils.extractKeyFromLocationHeader(response);
Expand All @@ -102,9 +105,9 @@ export function updateRecord(record, currentUser) {
//console.log("Updating record: ", record);
return function (dispatch) {
dispatch(saveRecordPending(ACTION_FLAG.UPDATE_ENTITY));
axiosBackend.put(`${API_URL}/rest/records/${record.key}`, {
return axiosBackend.put(`${API_URL}/rest/records/${record.key}`, {
...record
}).then((response) => {
}).then(() => {
dispatch(saveRecordSuccess(record, null, ACTION_FLAG.UPDATE_ENTITY));
dispatch(loadRecords(currentUser));
}).catch((error) => {
Expand Down
11 changes: 2 additions & 9 deletions js/components/record/Records.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import {Button, Card} from "react-bootstrap";
import {injectIntl} from "react-intl";
import withI18n from "../../i18n/withI18n";
import RecordTable from "./RecordTable";
import {ACTION_STATUS, ALERT_TYPES, EXTENSION_CONSTANTS} from "../../constants/DefaultConstants";
import AlertMessage from "../AlertMessage";
import {EXTENSION_CONSTANTS} from "../../constants/DefaultConstants";
import PropTypes from "prop-types";
import {processTypeaheadOptions} from "./TypeaheadAnswer";
import {EXTENSIONS} from "../../../config";
Expand All @@ -22,7 +21,6 @@ class Records extends React.Component {
recordsLoaded: PropTypes.object,
recordDeleted: PropTypes.object,
recordsDeleting: PropTypes.array,
showAlert: PropTypes.bool.isRequired,
handlers: PropTypes.object.isRequired,
currentUser: PropTypes.object.isRequired,
formTemplatesLoaded: PropTypes.object.isRequired,
Expand Down Expand Up @@ -51,7 +49,7 @@ class Records extends React.Component {
}

render() {
const {showAlert, recordDeleted, formTemplate, recordsLoaded} = this.props;
const {formTemplate, recordsLoaded} = this.props;
const showCreateButton = STUDY_CREATE_AT_MOST_ONE_RECORD
? (!recordsLoaded.records || (recordsLoaded.records.length < 1))
: true;
Expand Down Expand Up @@ -95,11 +93,6 @@ class Records extends React.Component {
</div>
<ExportRecordsDropdown onExport={this.props.handlers.onExport} records={recordsLoaded.records}/>
</div>
{showAlert && recordDeleted.status === ACTION_STATUS.ERROR &&
<AlertMessage type={ALERT_TYPES.DANGER}
message={this.props.formatMessage('record.delete-error', {error: this.i18n(this.props.recordDeleted.error.message)})}/>}
{showAlert && recordDeleted.status === ACTION_STATUS.SUCCESS &&
<AlertMessage type={ALERT_TYPES.SUCCESS} message={this.i18n('record.delete-success')}/>}
</Card.Body>
</Card>;
}
Expand Down
12 changes: 4 additions & 8 deletions js/components/record/RecordsController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ import {trackPromise} from "react-promise-tracker";
class RecordsController extends React.Component {
constructor(props) {
super(props);
this.state = {
showAlert: false
};
}

componentDidMount() {
Expand Down Expand Up @@ -51,8 +48,7 @@ class RecordsController extends React.Component {
};

_onDeleteRecord = (record) => {
this.props.deleteRecord(record, this.props.currentUser);
this.setState({showAlert: true});
trackPromise(this.props.deleteRecord(record, this.props.currentUser), "records");
};

_onPublishRecords = async () => {
Expand All @@ -75,11 +71,11 @@ class RecordsController extends React.Component {
};

_onExportRecords = (exportType) => {
this.props.exportRecords(exportType);
trackPromise(this.props.exportRecords(exportType), "records");
};

_onImportRecords = (file) => {
return this.props.importRecords(file);
trackPromise(this.props.importRecords(file), "records");
};

render() {
Expand All @@ -96,7 +92,7 @@ class RecordsController extends React.Component {
onExport: this._onExportRecords,
onImport: this._onImportRecords
};
return <Records recordsLoaded={recordsLoaded} showAlert={this.state.showAlert} handlers={handlers}
return <Records recordsLoaded={recordsLoaded} handlers={handlers}
recordDeleted={recordDeleted} recordsDeleting={recordsDeleting} currentUser={currentUser}
formTemplate={formTemplate}
formTemplatesLoaded={formTemplatesLoaded}/>;
Expand Down
9 changes: 4 additions & 5 deletions tests/__tests__/actions/RecordActions.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
} from "../../../js/actions/RecordActions";
import {API_URL} from '../../../config';

describe('Record synchronize actions', function () {
describe('Record synchronous actions', function () {
const record = {key: 7979868757},
key = 7979868757,
error = {message: 'error'};
Expand Down Expand Up @@ -128,7 +128,7 @@ describe('Record synchronize actions', function () {
const middlewares = [thunk.withExtraArgument(axiosBackend)];
const mockStore = configureMockStore(middlewares);

describe('Record asynchronize actions', function () {
describe('Record asynchronous actions', function () {
let store,
mockApi;
const error = {
Expand Down Expand Up @@ -210,7 +210,6 @@ describe('Record asynchronize actions', function () {
{ type: ActionConstants.DELETE_RECORD_PENDING, key: record.key},
{ type: ActionConstants.LOAD_RECORDS_PENDING},
{ type: ActionConstants.DELETE_RECORD_SUCCESS, record, key: record.key},
{ type: ActionConstants.LOAD_RECORDS_SUCCESS, records},
];

mockApi.onDelete(`${API_URL}/rest/records/${record.key}`).reply(200);
Expand All @@ -219,7 +218,7 @@ describe('Record asynchronize actions', function () {
store.dispatch(deleteRecord(record, currentUser));

setTimeout(() => {
expect(store.getActions()).toEqual(expectedActions);
expect(store.getActions().slice(0, 3)).toEqual(expectedActions);
done();
}, TEST_TIMEOUT);
});
Expand All @@ -235,7 +234,7 @@ describe('Record asynchronize actions', function () {
store.dispatch(deleteRecord(record, currentUser));

setTimeout(() => {
expect(store.getActions()).toEqual(expectedActions);
expect(store.getActions().slice(0, 2)).toEqual(expectedActions);
done();
}, TEST_TIMEOUT);
});
Expand Down

0 comments on commit cb9a57e

Please sign in to comment.