Users table refactor #7598
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,28 +2,77 @@ import React from "react"; | |
| import {createRoot} from "react-dom/client"; | ||
| import PropTypes from "prop-types"; | ||
|
|
||
| import {faPencil, faTrashCan} from "@fortawesome/free-solid-svg-icons"; | ||
| import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"; | ||
|
|
||
| import Table from "./table/table"; | ||
| import {createColumnHelper} from "@tanstack/react-table"; | ||
|
|
||
| class TATable extends React.Component { | ||
| constructor() { | ||
| super(); | ||
| this.state = { | ||
| data: [], | ||
| loading: true, | ||
| }; | ||
| this.fetchData = this.fetchData.bind(this); | ||
|
|
||
| const columnHelper = createColumnHelper(); | ||
| this.columns = [ | ||
| columnHelper.accessor("user_name", { | ||
| header: () => I18n.t("activerecord.attributes.user.user_name"), | ||
| }), | ||
| columnHelper.accessor("first_name", { | ||
| header: () => I18n.t("activerecord.attributes.user.first_name"), | ||
| }), | ||
| columnHelper.accessor("last_name", { | ||
| header: () => I18n.t("activerecord.attributes.user.last_name"), | ||
| }), | ||
| columnHelper.accessor("email", { | ||
| header: () => I18n.t("activerecord.attributes.user.email"), | ||
| }), | ||
| columnHelper.accessor("hidden", { | ||
| header: () => I18n.t("roles.active") + "?", | ||
| filterFn: "equalsString", | ||
| meta: { | ||
| filterVariant: "select", | ||
| }, | ||
| }), | ||
| columnHelper.accessor("id", { | ||
| id: "id", | ||
| enableSorting: false, | ||
| enableColumnFilter: false, | ||
| header: () => I18n.t("actions"), | ||
| cell: props => ( | ||
| <span> | ||
| <a | ||
| href={Routes.edit_course_ta_path(this.props.course_id, props.getValue())} | ||
| aria-label={I18n.t("edit")} | ||
| title={I18n.t("edit")} | ||
| > | ||
| <FontAwesomeIcon icon={faPencil} /> | ||
| </a> | ||
| | | ||
| <a | ||
| href="#" | ||
| onClick={() => this.removeTA(props.getValue())} | ||
| aria-label={I18n.t("remove")} | ||
| title={I18n.t("remove")} | ||
| > | ||
| <FontAwesomeIcon icon={faTrashCan} /> | ||
| </a> | ||
| </span> | ||
| ), | ||
| }), | ||
| ]; | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| this.fetchData().then(data => this.setState({data: this.processData(data)})); | ||
| } | ||
|
|
||
| fetchData() { | ||
| return fetch(Routes.course_tas_path(this.props.course_id), { | ||
| headers: { | ||
| Accept: "application/json", | ||
| }, | ||
|
|
@@ -33,9 +82,12 @@ class TATable extends React.Component { | |
| return response.json(); | ||
| } | ||
| }) | ||
| .then(json => json.data); | ||
| } | ||
|
|
||
| processData(data) { | ||
|
Collaborator
There was a problem hiding this comment. Add a blank line before this method |
||
| data.forEach(row => (row.hidden = I18n.t(row.hidden ? "roles.inactive" : "roles.active"))); | ||
| return data; | ||
| } | ||
|
|
||
| removeTA = ta_id => { | ||
|
|
@@ -57,89 +109,8 @@ class TATable extends React.Component { | |
| }; | ||
|
|
||
| render() { | ||
| return ( | ||
|
Collaborator
There was a problem hiding this comment. @chickenwaddle77 one other thing I forgot to mention: because this part is being deleted, you can also get rid of the |
||
| <Table data={this.state.data} columns={this.columns} noDataText={I18n.t("tas.empty_table")} /> | ||
|
Collaborator
There was a problem hiding this comment. Note that the |
||
| ); | ||
| } | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is good, but there are now unused imports that you can remove.