Skip to content

feat: move tags grid to mui #904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
priscila-moneo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: move tags grid to mui #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 47 additions & 43 deletions src/actions/tag-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
* */

import T from "i18n-react/dist/i18n-react";
import history from "../history";
import {
getRequest,
putRequest,
Expand All @@ -26,7 +25,9 @@ import {
authErrorHandler,
escapeFilterValue
} from "openstack-uicore-foundation/lib/utils/actions";
import history from "../history";
import { getAccessTokenSafely } from "../utils/methods";
import { DEFAULT_PER_PAGE } from "../utils/constants";

export const REQUEST_TAGS = "REQUEST_TAGS";
export const RECEIVE_TAGS = "RECEIVE_TAGS";
Expand Down Expand Up @@ -54,8 +55,14 @@ export const TAG_ADDED_TO_GROUP = "TAG_ADDED_TO_GROUP";
export const TAG_REMOVED_FROM_GROUP = "TAG_REMOVED_FROM_GROUP";

export const getTags =
(term = null, page = 1, perPage = 10, order = "id", orderDir = 1) =>
async (dispatch, getState) => {
(
term = null,
page = 1,
perPage = DEFAULT_PER_PAGE,
order = "id",
orderDir = 1
) =>
async (dispatch) => {
const accessToken = await getAccessTokenSafely();
const filter = [];

Expand All @@ -69,7 +76,7 @@ export const getTags =
}

const params = {
page: page,
page,
per_page: perPage,
access_token: accessToken
};
Expand All @@ -81,21 +88,21 @@ export const getTags =
// order
if (order != null && orderDir != null) {
const orderDirSign = orderDir === 1 ? "+" : "-";
params["order"] = `${orderDirSign}${order}`;
params.order = `${orderDirSign}${order}`;
}

return getRequest(
createAction(REQUEST_TAGS),
createAction(RECEIVE_TAGS),
`${window.API_BASE_URL}/api/v1/tags`,
authErrorHandler,
{ order, orderDir, page, term }
{ order, orderDir, page, term, perPage }
)(params)(dispatch).then(() => {
dispatch(stopLoading());
});
};

export const getTag = (tagId) => async (dispatch, getState) => {
export const getTag = (tagId) => async (dispatch) => {
const accessToken = await getAccessTokenSafely();

dispatch(startLoading());
Expand All @@ -114,7 +121,7 @@ export const getTag = (tagId) => async (dispatch, getState) => {
});
};

export const deleteTag = (tagId) => async (dispatch, getState) => {
export const deleteTag = (tagId) => async (dispatch) => {
const accessToken = await getAccessTokenSafely();

dispatch(startLoading());
Expand All @@ -138,7 +145,7 @@ export const resetTagForm = () => (dispatch) => {
dispatch(createAction(RESET_TAG_FORM)({}));
};

export const saveTag = (entity) => async (dispatch, getState) => {
export const saveTag = (entity) => async (dispatch) => {
const accessToken = await getAccessTokenSafely();
dispatch(startLoading());

Expand All @@ -149,7 +156,7 @@ export const saveTag = (entity) => async (dispatch, getState) => {
const normalizedEntity = normalizeTag(entity);

if (entity.id) {
putRequest(
return putRequest(
createAction(UPDATE_TAG),
createAction(TAG_UPDATED),
`${window.API_BASE_URL}/api/v1/tags/${entity.id}`,
Expand All @@ -159,28 +166,27 @@ export const saveTag = (entity) => async (dispatch, getState) => {
)(params)(dispatch).then(() => {
dispatch(showSuccessMessage(T.translate("edit_tag.tag_saved")));
});
} else {
const success_message = {
title: T.translate("general.done"),
html: T.translate("edit_tag.tag_created"),
type: "success"
};

postRequest(
createAction(UPDATE_TAG),
createAction(TAG_ADDED),
`${window.API_BASE_URL}/api/v1/tags`,
normalizedEntity,
authErrorHandler,
entity
)(params)(dispatch).then(() => {
dispatch(
showMessage(success_message, () => {
history.push(`/app/tags`);
})
);
});
}
const success_message = {
title: T.translate("general.done"),
html: T.translate("edit_tag.tag_created"),
type: "success"
};

return postRequest(
createAction(UPDATE_TAG),
createAction(TAG_ADDED),
`${window.API_BASE_URL}/api/v1/tags`,
normalizedEntity,
authErrorHandler,
entity
)(params)(dispatch).then(() => {
dispatch(
showMessage(success_message, () => {
history.push("/app/tags");
})
);
});
};

export const getTagGroups = () => async (dispatch, getState) => {
Expand All @@ -207,7 +213,7 @@ export const getTagGroups = () => async (dispatch, getState) => {
};

export const updateTagGroupsOrder =
(tagGroups, tagGroupId, newOrder) => async (dispatch, getState) => {
(tagGroups, tagGroupId) => async (dispatch, getState) => {
const { currentSummitState } = getState();
const accessToken = await getAccessTokenSafely();
const { currentSummit } = currentSummitState;
Expand All @@ -219,7 +225,7 @@ export const updateTagGroupsOrder =
const tagGroup = tagGroups.find((tg) => tg.id === tagGroupId);
delete tagGroup.allowed_tags;

putRequest(
return putRequest(
null,
createAction(TAG_GROUP_ORDER_UPDATED)(tagGroups),
`${window.API_BASE_URL}/api/v1/summits/${currentSummit.id}/track-tag-groups/${tagGroupId}`,
Expand Down Expand Up @@ -252,7 +258,7 @@ export const getTagGroup = (tagGroupId) => async (dispatch, getState) => {
});
};

export const resetTagGroupForm = () => (dispatch, getState) => {
export const resetTagGroupForm = () => (dispatch) => {
dispatch(createAction(RESET_TAG_GROUP_FORM)({}));
};

Expand All @@ -274,7 +280,7 @@ export const saveTagGroup = (entity) => async (dispatch, getState) => {
normalizedEntity,
authErrorHandler,
entity
)(params)(dispatch).then((payload) => {
)(params)(dispatch).then(() => {
dispatch(
showSuccessMessage(T.translate("edit_tag_group.tag_group_saved"))
);
Expand Down Expand Up @@ -388,10 +394,8 @@ export const copyAllTagsToCategory =
});
};

export const createTag = (tag, callback) => async (dispatch, getState) => {
const { currentSummitState } = getState();
export const createTag = (tag, callback) => async (dispatch) => {
const accessToken = await getAccessTokenSafely();
const { currentSummit } = currentSummitState;

const params = {
access_token: accessToken
Expand All @@ -403,7 +407,7 @@ export const createTag = (tag, callback) => async (dispatch, getState) => {
null,
createAction(TAG_CREATED),
`${window.API_BASE_URL}/api/v1/tags`,
{ tag: tag },
{ tag },
authErrorHandler
)(params)(dispatch).then((payload) => {
dispatch(stopLoading());
Expand All @@ -422,9 +426,9 @@ export const removeTagFromGroup = (tagId) => (dispatch) => {
const normalizeTag = (entity) => {
const normalizedEntity = { ...entity };

delete normalizedEntity["created"];
delete normalizedEntity["updated"];
delete normalizedEntity["last_edited"];
delete normalizedEntity.created;
delete normalizedEntity.updated;
delete normalizedEntity.last_edited;

return normalizedEntity;
};
Expand Down
99 changes: 0 additions & 99 deletions src/components/forms/tag-form.js
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,8 @@
},
"tag_list": {
"tag_list": "Tag List",
"item": "item",
"items": "items",
"tags": "Tags",
"add_tag": "Add Tag",
"delete_tag_warning": "Are you sure you want to delete tag",
Expand All @@ -818,6 +820,7 @@
"edit_tag": {
"tag": "Tag",
"name": "Name",
"name_required": "Name is required.",
"tag_saved": "Tag saved successfully.",
"tag_created": "Tag created successfully."
},
Expand Down
44 changes: 14 additions & 30 deletions src/layouts/tag-layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,30 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
**/
* */

import React from "react";
import { Switch, Route, withRouter } from "react-router-dom";
import T from "i18n-react/dist/i18n-react";
import { Breadcrumb } from "react-breadcrumbs";
import Restrict from "../routes/restrict";

import EditTagPage from "../pages/tags/edit-tag-page";
import TagListPage from "../pages/tags/tag-list-page";
import NoMatchPage from "../pages/no-match-page";

class TagLayout extends React.Component {
render() {
const { match } = this.props;
return (
<div>
<Breadcrumb
data={{ title: T.translate("tag_list.tags"), pathname: match.url }}
/>

<Switch>
<Route
strict
exact
path={`${match.url}/new`}
component={EditTagPage}
/>
<Route
strict
exact
path={`${match.url}/:tag_id(\\d+)`}
component={EditTagPage}
/>
<Route strict exact path={match.url} component={TagListPage} />
<Route component={NoMatchPage} />
</Switch>
</div>
);
}
function TagLayout(props) {
const { match } = props;
return (
<div>
<Breadcrumb
data={{ title: T.translate("tag_list.tags"), pathname: match.url }}
/>
<Switch>
<Route strict exact path={match.url} component={TagListPage} />
<Route component={NoMatchPage} />
</Switch>
</div>
);
}

export default Restrict(withRouter(TagLayout), "tags");
Loading
Loading