Skip to content

Commit

Permalink
refactor: ADR
Browse files Browse the repository at this point in the history
  • Loading branch information
rpenido committed Nov 11, 2023
1 parent cc9e697 commit fc2419b
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/taxonomy/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export { default as TaxonomyListPage } from './TaxonomyListPage';
export { default as TaxonomyLayout } from './TaxonomyLayout';
export { default as TaxonomyDetailPage } from './taxonomy-detail/TaxonomyDetailPage';
export { TaxonomyDetailPage } from './taxonomy-detail';
7 changes: 3 additions & 4 deletions src/taxonomy/tag-list/TagListTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import _ from 'lodash';
import Proptypes from 'prop-types';
import { useState } from 'react';

import messages from '../../messages';
import taxonomyMessages from '../messages';
import { useTagListDataResponse, useTagListDataStatus } from '../api/hooks/selectors';
import messages from './messages';
import { useTagListDataResponse, useTagListDataStatus } from './data/selectors';

const TagListTable = ({ taxonomyId }) => {
const intl = useIntl();
Expand Down Expand Up @@ -48,7 +47,7 @@ const TagListTable = ({ taxonomyId }) => {
initialState={options}
columns={[
{
Header: intl.formatMessage(taxonomyMessages.tagListColumnValueHeader),
Header: intl.formatMessage(messages.tagListColumnValueHeader),
accessor: 'value',
},
]}
Expand Down
1 change: 1 addition & 0 deletions src/taxonomy/tag-list/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as TagListTable } from './TagListTable'; // eslint-disable-line import/prefer-default-export
5 changes: 2 additions & 3 deletions src/taxonomy/taxonomy-detail/TaxonomyDetailMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
import PropTypes from 'prop-types';

import messages from './messages';
import taxonomyMessages from '../messages';

const TaxonomyDetailMenu = ({
id, name, disabled, onClickMenuItem,
Expand All @@ -18,11 +17,11 @@ const TaxonomyDetailMenu = ({
<DropdownButton
id={id}
title={intl.formatMessage(messages.actionsButtonLabel)}
alt={intl.formatMessage(taxonomyMessages.taxonomyMenuAlt, { name })}
alt={intl.formatMessage(messages.actionsButtonAlt, { name })}
disabled={disabled}
>
<Dropdown.Item onClick={() => onClickMenuItem('export')}>
{intl.formatMessage(taxonomyMessages.taxonomyCardExportMenu)}
{intl.formatMessage(messages.exportMenu)}
</Dropdown.Item>
</DropdownButton>
);
Expand Down
9 changes: 5 additions & 4 deletions src/taxonomy/taxonomy-detail/TaxonomyDetailPage.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// ts-check
import React, { useState } from 'react';
import { useIntl } from '@edx/frontend-platform/i18n';
import {
Expand All @@ -10,11 +11,11 @@ import { Link, useParams } from 'react-router-dom';
import ConnectionErrorAlert from '../../generic/ConnectionErrorAlert';
import Loading from '../../generic/Loading';
import SubHeader from '../../generic/sub-header/SubHeader';
import messages from './messages';
import taxonomyMessages from '../messages';
import TaxonomyDetailMenu from './TaxonomyDetailMenu';
import TaxonomyDetailSideCard from './TaxonomyDetailSideCard';
import TagListTable from './TagListTable';
import ExportModal from '../modals/ExportModal';
import { TagListTable } from '../tag-list';
import ExportModal from '../export-modal';
import { useTaxonomyDetailDataResponse, useTaxonomyDetailDataStatus } from './data/selectors';

const TaxonomyDetailPage = () => {
Expand Down Expand Up @@ -89,7 +90,7 @@ const TaxonomyDetailPage = () => {
<Container size="xl">
<Breadcrumb
links={[
{ label: intl.formatMessage(messages.headerTitle), to: '/taxonomy-list/' },
{ label: intl.formatMessage(taxonomyMessages.headerTitle), to: '/taxonomy-list/' },
]}
activeLabel={taxonomy.name}
linkAs={Link}
Expand Down
4 changes: 2 additions & 2 deletions src/taxonomy/taxonomy-detail/TaxonomyDetailPage.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { IntlProvider } from '@edx/frontend-platform/i18n';
import { AppProvider } from '@edx/frontend-platform/react';
import { fireEvent, render } from '@testing-library/react';

import { useTaxonomyDetailData } from '../api/hooks/api';
import { useTaxonomyDetailData } from './data/api';
import initializeStore from '../../store';
import TaxonomyDetailPage from './TaxonomyDetailPage';

let store;

jest.mock('../api/hooks/api', () => ({
jest.mock('./data/api', () => ({
useTaxonomyDetailData: jest.fn(),
}));
jest.mock('react-router-dom', () => ({
Expand Down
2 changes: 2 additions & 0 deletions src/taxonomy/taxonomy-detail/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// ts-check
export { default as TaxonomyDetailPage } from './TaxonomyDetailPage'; // eslint-disable-line import/prefer-default-export
9 changes: 9 additions & 0 deletions src/taxonomy/taxonomy-detail/messages.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// ts-check
import { defineMessages } from '@edx/frontend-platform/i18n';

const messages = defineMessages({
Expand All @@ -17,6 +18,14 @@ const messages = defineMessages({
id: 'course-authoring.taxonomy-detail.action.button.label',
defaultMessage: 'Actions',
},
actionsButtonAlt: {
id: 'course-authoring.taxonomy-detail.action.button.alt',
defaultMessage: '{name} actions',
},
exportMenu: {
id: 'course-authoring.taxonomy-detail.action.export',
defaultMessage: 'Export',
},
});

export default messages;

0 comments on commit fc2419b

Please sign in to comment.