mirror of
https://github.com/shlinkio/shlink-web-client.git
synced 2024-12-23 01:20:24 +03:00
Updated short URL tags adding real behavior
This commit is contained in:
parent
854851fefc
commit
a1eadf767e
4 changed files with 106 additions and 6 deletions
|
@ -44,6 +44,11 @@ export class ShlinkApiClient {
|
||||||
.then(resp => resp.data)
|
.then(resp => resp.data)
|
||||||
.catch(e => this._handleAuthError(e, this.getShortUrl, [shortCode]));
|
.catch(e => this._handleAuthError(e, this.getShortUrl, [shortCode]));
|
||||||
|
|
||||||
|
updateShortUrlTags = (shortCode, tags) =>
|
||||||
|
this._performRequest(`/short-codes/${shortCode}/tags`, 'PUT', {}, { tags })
|
||||||
|
.then(resp => resp.data.tags)
|
||||||
|
.catch(e => this._handleAuthError(e, this.updateShortUrlTags, [shortCode, tags]));
|
||||||
|
|
||||||
_performRequest = async (url, method = 'GET', params = {}, data = {}) => {
|
_performRequest = async (url, method = 'GET', params = {}, data = {}) => {
|
||||||
if (isEmpty(this._token)) {
|
if (isEmpty(this._token)) {
|
||||||
this._token = await this._authenticate();
|
this._token = await this._authenticate();
|
||||||
|
|
|
@ -6,6 +6,7 @@ import shortUrlsListReducer from '../short-urls/reducers/shortUrlsList';
|
||||||
import shortUrlsListParamsReducer from '../short-urls/reducers/shortUrlsListParams';
|
import shortUrlsListParamsReducer from '../short-urls/reducers/shortUrlsListParams';
|
||||||
import shortUrlCreationResultReducer from '../short-urls/reducers/shortUrlCreationResult';
|
import shortUrlCreationResultReducer from '../short-urls/reducers/shortUrlCreationResult';
|
||||||
import shortUrlVisitsReducer from '../short-urls/reducers/shortUrlVisits';
|
import shortUrlVisitsReducer from '../short-urls/reducers/shortUrlVisits';
|
||||||
|
import shortUrlTagsReducer from '../short-urls/reducers/shortUrlTags';
|
||||||
|
|
||||||
export default combineReducers({
|
export default combineReducers({
|
||||||
servers: serversReducer,
|
servers: serversReducer,
|
||||||
|
@ -13,5 +14,6 @@ export default combineReducers({
|
||||||
shortUrlsList: shortUrlsListReducer,
|
shortUrlsList: shortUrlsListReducer,
|
||||||
shortUrlsListParams: shortUrlsListParamsReducer,
|
shortUrlsListParams: shortUrlsListParamsReducer,
|
||||||
shortUrlCreationResult: shortUrlCreationResultReducer,
|
shortUrlCreationResult: shortUrlCreationResultReducer,
|
||||||
shortUrlVisits: shortUrlVisitsReducer
|
shortUrlVisits: shortUrlVisitsReducer,
|
||||||
|
shortUrlTags: shortUrlTagsReducer,
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,27 +1,57 @@
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import { connect } from 'react-redux';
|
||||||
import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
|
import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
|
||||||
import TagsSelector from '../../utils/TagsSelector';
|
import TagsSelector from '../../utils/TagsSelector';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { editShortUrlTags, shortUrlTagsType } from '../reducers/shortUrlTags';
|
||||||
|
import { pick } from 'ramda';
|
||||||
|
|
||||||
|
const propTypes = {
|
||||||
|
isOpen: PropTypes.bool.isRequired,
|
||||||
|
toggle: PropTypes.func.isRequired,
|
||||||
|
url: PropTypes.string.isRequired,
|
||||||
|
shortUrl: PropTypes.shape({
|
||||||
|
tags: PropTypes.arrayOf(PropTypes.string),
|
||||||
|
}).isRequired,
|
||||||
|
shortUrlTags: shortUrlTagsType,
|
||||||
|
};
|
||||||
|
|
||||||
|
export class EditTagsModal extends React.Component {
|
||||||
|
saveTags = () => {
|
||||||
|
const { editShortUrlTags, shortUrl, toggle } = this.props;
|
||||||
|
editShortUrlTags(shortUrl.shortCode, this.state.tags).then(toggle);
|
||||||
|
};
|
||||||
|
|
||||||
export default class EditTagsModal extends React.Component {
|
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
this.state = { tags: props.shortUrl.tags };
|
this.state = { tags: props.shortUrl.tags };
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { isOpen, toggle, url } = this.props;
|
const { isOpen, toggle, url, shortUrlTags } = this.props;
|
||||||
const changeTags = tags => this.setState({ tags });
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Modal isOpen={isOpen} toggle={toggle} centered>
|
<Modal isOpen={isOpen} toggle={toggle} centered>
|
||||||
<ModalHeader toggle={toggle}>Edit tags for <a target="_blank" href={url}>{url}</a></ModalHeader>
|
<ModalHeader toggle={toggle}>Edit tags for <a target="_blank" href={url}>{url}</a></ModalHeader>
|
||||||
<ModalBody>
|
<ModalBody>
|
||||||
<TagsSelector tags={this.state.tags} onChange={changeTags} />
|
<TagsSelector tags={this.state.tags} onChange={tags => this.setState({ tags })} />
|
||||||
</ModalBody>
|
</ModalBody>
|
||||||
<ModalFooter>
|
<ModalFooter>
|
||||||
<button className="btn btn-outline-primary" type="button">Save</button>
|
<button className="btn btn-link" onClick={toggle}>Cancel</button>
|
||||||
|
<button
|
||||||
|
className="btn btn-primary"
|
||||||
|
type="button"
|
||||||
|
onClick={this.saveTags}
|
||||||
|
disabled={shortUrlTags.saving}
|
||||||
|
>
|
||||||
|
{shortUrlTags.saving ? 'Saving tags...' : 'Save tags'}
|
||||||
|
</button>
|
||||||
</ModalFooter>
|
</ModalFooter>
|
||||||
</Modal>
|
</Modal>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EditTagsModal.propTypes = propTypes;
|
||||||
|
|
||||||
|
export default connect(pick(['shortUrlTags']), { editShortUrlTags })(EditTagsModal);
|
||||||
|
|
63
src/short-urls/reducers/shortUrlTags.js
Normal file
63
src/short-urls/reducers/shortUrlTags.js
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
import ShlinkApiClient from '../../api/ShlinkApiClient';
|
||||||
|
import { curry } from 'ramda';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { _listShortUrls } from './shortUrlsList';
|
||||||
|
|
||||||
|
export const EDIT_SHORT_URL_TAGS_START = 'shlink/shortUrlTags/EDIT_SHORT_URL_TAGS_START';
|
||||||
|
export const EDIT_SHORT_URL_TAGS_ERROR = 'shlink/shortUrlTags/EDIT_SHORT_URL_TAGS_ERROR';
|
||||||
|
export const EDIT_SHORT_URL_TAGS = 'shlink/shortUrlTags/EDIT_SHORT_URL_TAGS';
|
||||||
|
|
||||||
|
export const shortUrlTagsType = PropTypes.shape({
|
||||||
|
shortCode: PropTypes.string,
|
||||||
|
tags: PropTypes.arrayOf(PropTypes.string).isRequired,
|
||||||
|
saving: PropTypes.bool.isRequired,
|
||||||
|
error: PropTypes.bool.isRequired,
|
||||||
|
});
|
||||||
|
|
||||||
|
const defaultState = {
|
||||||
|
shortCode: null,
|
||||||
|
tags: [],
|
||||||
|
saving: false,
|
||||||
|
error: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function reducer(state = defaultState, action) {
|
||||||
|
switch (action.type) {
|
||||||
|
case EDIT_SHORT_URL_TAGS_START:
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
saving: true,
|
||||||
|
error: false,
|
||||||
|
};
|
||||||
|
case EDIT_SHORT_URL_TAGS_ERROR:
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
saving: false,
|
||||||
|
error: true,
|
||||||
|
};
|
||||||
|
case EDIT_SHORT_URL_TAGS:
|
||||||
|
return {
|
||||||
|
shortCode: action.shortCode,
|
||||||
|
tags: action.tags,
|
||||||
|
saving: false,
|
||||||
|
error: false,
|
||||||
|
};
|
||||||
|
default:
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const _editShortUrlTags = (ShlinkApiClient, shortCode, tags) => async (dispatch, getState) => {
|
||||||
|
dispatch({ type: EDIT_SHORT_URL_TAGS_START });
|
||||||
|
|
||||||
|
try {
|
||||||
|
await ShlinkApiClient.updateShortUrlTags(shortCode, tags);
|
||||||
|
dispatch({ tags, shortCode, type: EDIT_SHORT_URL_TAGS });
|
||||||
|
|
||||||
|
const { shortUrlsListParams } = getState();
|
||||||
|
await _listShortUrls(ShlinkApiClient, shortUrlsListParams)(dispatch);
|
||||||
|
} catch (e) {
|
||||||
|
dispatch({ type: EDIT_SHORT_URL_TAGS_ERROR });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
export const editShortUrlTags = curry(_editShortUrlTags)(ShlinkApiClient);
|
Loading…
Reference in a new issue