Unverified Commit 9d92de8c authored by Tamika Tannis's avatar Tamika Tannis Committed by GitHub

Update inconvenient relative imports + move config into 'js' (#95)

parent d0994cae
......@@ -9,10 +9,10 @@ import { bindActionCreators } from 'redux';
// TODO: Use css-modules instead of 'import'
import './styles.scss';
import { GlobalState } from "../../ducks/rootReducer";
import { AnnouncementsGetRequest } from "../../ducks/announcements/types";
import { announcementsGet } from '../../ducks/announcements/reducer';
import { AnnouncementPost } from "./types";
import { GlobalState } from 'ducks/rootReducer';
import { AnnouncementsGetRequest } from 'ducks/announcements/types';
import { announcementsGet } from 'ducks/announcements/reducer';
import { AnnouncementPost } from './types';
interface AnnouncementPageState {
posts: AnnouncementPost[];
......
......@@ -5,14 +5,14 @@ import { bindActionCreators } from 'redux';
import './styles.scss';
import AppConfig from '../../../config/config';
import LoadingSpinner from '../common/LoadingSpinner';
import TagInfo from "../Tags/TagInfo";
import { Tag } from "../Tags/types";
import { GlobalState } from "../../ducks/rootReducer";
import { getAllTags } from '../../ducks/allTags/reducer';
import { GetAllTagsRequest } from "../../ducks/allTags/types";
import AppConfig from 'config/config';
import LoadingSpinner from 'components/common/LoadingSpinner';
import TagInfo from 'components/Tags/TagInfo';
import { Tag } from 'components/Tags/types';
import { GlobalState } from 'ducks/rootReducer';
import { getAllTags } from 'ducks/allTags/reducer';
import { GetAllTagsRequest } from 'ducks/allTags/types';
export interface StateFromProps {
allTags: Tag[];
......
......@@ -4,8 +4,8 @@ import { bindActionCreators } from 'redux';
import AbstractFeedbackForm, { DispatchFromProps, StateFromProps } from '../../FeedbackForm';
import { GlobalState } from "../../../../ducks/rootReducer";
import { submitFeedback, resetFeedback } from '../../../../ducks/feedback/reducer';
import { GlobalState } from 'ducks/rootReducer';
import { submitFeedback, resetFeedback } from 'ducks/feedback/reducer';
export class BugReportFeedbackForm extends AbstractFeedbackForm {
constructor(props) {
......
......@@ -4,8 +4,8 @@ import { bindActionCreators } from 'redux';
import AbstractFeedbackForm, { DispatchFromProps, StateFromProps } from '../../FeedbackForm';
import { GlobalState } from "../../../../ducks/rootReducer";
import { submitFeedback, resetFeedback } from '../../../../ducks/feedback/reducer';
import { GlobalState } from 'ducks/rootReducer';
import { submitFeedback, resetFeedback } from 'ducks/feedback/reducer';
export class RatingFeedbackForm extends AbstractFeedbackForm {
constructor(props) {
......
......@@ -4,8 +4,8 @@ import { bindActionCreators } from 'redux';
import AbstractFeedbackForm, { DispatchFromProps, StateFromProps } from '../../FeedbackForm';
import { GlobalState } from "../../../../ducks/rootReducer";
import { submitFeedback, resetFeedback } from '../../../../ducks/feedback/reducer';
import { GlobalState } from 'ducks/rootReducer';
import { submitFeedback, resetFeedback } from 'ducks/feedback/reducer';
export class RequestFeedbackForm extends AbstractFeedbackForm {
......
import * as React from 'react';
import LoadingSpinner from '../../common/LoadingSpinner';
import LoadingSpinner from 'components/common/LoadingSpinner';
// TODO: Use css-modules instead of 'import'
import './styles.scss';
import { ResetFeedbackRequest, SubmitFeedbackRequest } from "../../../ducks/feedback/types";
import { ResetFeedbackRequest, SubmitFeedbackRequest } from 'ducks/feedback/types';
import { SendingState } from '../types';
......
......@@ -4,9 +4,9 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
// TODO: Use css-modules instead of 'import'
import './styles.scss';
import { GlobalState } from "../../ducks/rootReducer";
import { getLastIndexed } from "../../ducks/tableMetadata/reducer";
import { GetLastIndexedRequest } from "../../ducks/tableMetadata/types";
import { GlobalState } from 'ducks/rootReducer';
import { getLastIndexed } from 'ducks/tableMetadata/reducer';
import { GetLastIndexedRequest } from 'ducks/tableMetadata/types';
// Props
interface StateFromProps {
......
......@@ -4,10 +4,10 @@ import { Link, NavLink, withRouter } from 'react-router-dom';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import AppConfig from '../../../config/config';
import { GlobalState } from "../../ducks/rootReducer";
import { getLoggedInUser } from "../../ducks/user/reducer";
import { LoggedInUser, GetLoggedInUserRequest } from "../../ducks/user/types";
import AppConfig from 'config/config';
import { GlobalState } from 'ducks/rootReducer';
import { getLoggedInUser } from 'ducks/user/reducer';
import { LoggedInUser, GetLoggedInUserRequest } from 'ducks/user/types';
import './styles.scss';
......
......@@ -4,7 +4,7 @@ import * as DocumentTitle from 'react-document-title';
// TODO: Use css-modules instead of 'import'
import './styles.scss';
import Breadcrumb from "../common/Breadcrumb";
import Breadcrumb from 'components/common/Breadcrumb';
const NotFoundPage: React.SFC<any> = () => {
return (
......
......@@ -4,15 +4,15 @@ import Avatar from 'react-avatar';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import LoadingSpinner from '../common/LoadingSpinner';
import LoadingSpinner from 'components/common/LoadingSpinner';
import { GlobalState } from "../../ducks/rootReducer";
import { getUserById } from "../../ducks/user/reducer";
import { LoggedInUser, GetUserRequest } from "../../ducks/user/types";
import { GlobalState } from 'ducks/rootReducer';
import { getUserById } from 'ducks/user/reducer';
import { LoggedInUser, GetUserRequest } from 'ducks/user/types';
import Breadcrumb from "../common/Breadcrumb";
import Flag from "../common/Flag";
import Tabs from "../common/Tabs";
import Breadcrumb from 'components/common/Breadcrumb';
import Flag from 'components/common/Flag';
import Tabs from 'components/common/Tabs';
import './styles.scss';
......@@ -89,7 +89,7 @@ class ProfilePage extends React.Component<ProfilePageProps, ProfilePageState> {
}
/* TODO: Add support to direct to 404 page for edgecase of someone typing in
or pasting in a bad url. This would be consistent with TableDetail page behavior */
or pasting in a bad url. This would be consistent with TableDetail page behavior */
render() {
const user = this.state.user;
return (
......
import * as React from 'react';
import ResourceListItem from '../../common/ResourceListItem';
import { Resource } from "../../common/ResourceListItem/types";
import ResourceListItem from 'components/common/ResourceListItem';
import { Resource } from 'components/common/ResourceListItem/types';
interface SearchListProps {
......
......@@ -7,11 +7,13 @@ import Pagination from 'react-js-pagination';
import SearchBar from './SearchBar';
import SearchList from './SearchList';
import InfoButton from '../common/InfoButton';
import { ResourceType, TableResource } from "../common/ResourceListItem/types";
import { GlobalState } from "../../ducks/rootReducer";
import { searchAll, searchResource } from '../../ducks/search/reducer';
import InfoButton from 'components/common/InfoButton';
import { ResourceType, TableResource } from 'components/common/ResourceListItem/types';
import TabsComponent from 'components/common/Tabs';
import { GlobalState } from 'ducks/rootReducer';
import { searchAll, searchResource } from 'ducks/search/reducer';
import {
DashboardSearchResults,
SearchAllOptions,
......@@ -19,13 +21,12 @@ import {
SearchResourceRequest,
TableSearchResults,
UserSearchResults
} from "../../ducks/search/types";
import { getPopularTables } from '../../ducks/popularTables/reducer';
import { GetPopularTablesRequest } from '../../ducks/popularTables/types';
} from 'ducks/search/types';
import { getPopularTables } from 'ducks/popularTables/reducer';
import { GetPopularTablesRequest } from 'ducks/popularTables/types';
// TODO: Use css-modules instead of 'import'
import './styles.scss';
import TabsComponent from "../common/Tabs";
const RESULTS_PER_PAGE = 10;
......
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { GlobalState } from "../../../ducks/rootReducer";
import { getColumnDescription, updateColumnDescription } from '../../../ducks/tableMetadata/reducer';
import { GlobalState } from 'ducks/rootReducer';
import { getColumnDescription, updateColumnDescription } from 'ducks/tableMetadata/reducer';
import EditableText, { ComponentProps, DispatchFromProps, StateFromProps } from '../../../components/common/EditableText';
import EditableText, { ComponentProps, DispatchFromProps, StateFromProps } from 'components/common/EditableText';
interface ContainerOwnProps {
columnIndex: number;
......
......@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
import { Button, Modal, OverlayTrigger, Popover, Table } from 'react-bootstrap';
import Linkify from 'react-linkify'
import { GlobalState } from "../../../ducks/rootReducer";
import { GlobalState } from 'ducks/rootReducer';
import { PreviewData } from '../types';
// TODO: Use css-modules instead of 'import'
......
import * as React from 'react';
import moment from 'moment-timezone';
import ColumnDescEditableText from '../../ColumnDescEditableText';
import { TableColumn } from '../../types';
import ColumnDescEditableText from 'components/TableDetail/ColumnDescEditableText';
import { TableColumn } from 'components/TableDetail/types';
// TODO: Use css-modules instead of 'import'
import './styles.scss';
......
......@@ -5,8 +5,8 @@ import { bindActionCreators } from 'redux';
import ReactDOM from 'react-dom';
import serialize from 'form-serialize';
import AvatarLabel, { AvatarLabelProps } from '../../common/AvatarLabel';
import LoadingSpinner from '../../common/LoadingSpinner';
import AvatarLabel, { AvatarLabelProps } from 'components/common/AvatarLabel';
import LoadingSpinner from 'components/common/LoadingSpinner';
import { Modal } from 'react-bootstrap';
import { UpdateMethod } from './types';
......@@ -15,8 +15,8 @@ import './styles.scss';
const DEFAULT_ERROR_TEXT = 'There was a problem with the request, please reload the page.';
import { GlobalState } from "../../../ducks/rootReducer";
import { updateTableOwner } from '../../../ducks/tableMetadata/owners/reducer';
import { GlobalState } from 'ducks/rootReducer';
import { updateTableOwner } from 'ducks/tableMetadata/owners/reducer';
export interface DispatchFromProps {
onUpdateList: (updateArray: { method: UpdateMethod; id: string; }[], onSuccess?: () => any, onFailure?: () => any) => void;
......
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { GlobalState } from "../../../ducks/rootReducer";
import { getTableDescription, updateTableDescription } from '../../../ducks/tableMetadata/reducer';
import { GlobalState } from 'ducks/rootReducer';
import { getTableDescription, updateTableDescription } from 'ducks/tableMetadata/reducer';
import EditableText, { ComponentProps, DispatchFromProps, StateFromProps } from '../../../components/common/EditableText';
import EditableText, { ComponentProps, DispatchFromProps, StateFromProps } from 'components/common/EditableText';
export const mapStateToProps = (state: GlobalState) => {
return {
......
......@@ -5,20 +5,21 @@ import { bindActionCreators } from 'redux';
import * as DocumentTitle from 'react-document-title';
import * as qs from 'simple-query-string';
import { GlobalState } from "../../ducks/rootReducer";
import { getPreviewData, getTableData } from '../../ducks/tableMetadata/reducer';
import { GetTableDataRequest } from '../../ducks/tableMetadata/types';
import { GlobalState } from 'ducks/rootReducer';
import { getPreviewData, getTableData } from 'ducks/tableMetadata/reducer';
import { GetTableDataRequest } from 'ducks/tableMetadata/types';
import AppConfig from 'config/config';
import AvatarLabel from 'components/common/AvatarLabel';
import Breadcrumb from 'components/common/Breadcrumb';
import EntityCard from 'components/common/EntityCard';
import LoadingSpinner from 'components/common/LoadingSpinner';
import TagInput from 'components/Tags/TagInput';
import AppConfig from '../../../config/config';
import AvatarLabel from '../common/AvatarLabel';
import Breadcrumb from "../common/Breadcrumb";
import DataPreviewButton from './DataPreviewButton';
import DetailList from './DetailList';
import EntityCard from '../common/EntityCard';
import LoadingSpinner from '../common/LoadingSpinner';
import OwnerEditor from './OwnerEditor';
import TableDescEditableText from './TableDescEditableText';
import TagInput from '../Tags/TagInput';
import WatermarkLabel from "./WatermarkLabel";
import Avatar from 'react-avatar';
......
import { Tag } from '../Tags/types';
import { Tag } from 'components/Tags/types';
interface PartitionData {
is_partitioned: boolean;
......
......@@ -8,11 +8,11 @@ import Select, { components } from 'react-select';
import CreatableSelect from 'react-select/lib/Creatable';
import makeAnimated from 'react-select/lib/animated';
import { GlobalState } from "../../../ducks/rootReducer";
import { getAllTags } from '../../../ducks/allTags/reducer';
import { GetAllTagsRequest } from '../../../ducks/allTags/types';
import { updateTags } from '../../../ducks/tableMetadata/tags/reducer';
import { UpdateTagsRequest } from '../../../ducks/tableMetadata/types';
import { GlobalState } from 'ducks/rootReducer';
import { getAllTags } from 'ducks/allTags/reducer';
import { GetAllTagsRequest } from 'ducks/allTags/types';
import { updateTags } from 'ducks/tableMetadata/tags/reducer';
import { UpdateTagsRequest } from 'ducks/tableMetadata/types';
import TagInfo from "../TagInfo";
import { Tag, UpdateTagMethod, UpdateTagData } from '../types';
......
// This file should be used to add new config variables or overwrite defaults from config-default.ts
import { AppConfigCustom } from './config.types';
import { AppConfigCustom } from './config-types';
const configCustom: AppConfigCustom = {
browse: {
......
import { AppConfig } from "./config.types";
import { AppConfig } from './config-types';
const configDefault: AppConfig = {
browse: {
......
import { AppConfig } from './config.types';
import { AppConfig } from './config-types';
import configDefault from './config-default';
import configCustom from './config-custom';
......
......@@ -2,7 +2,7 @@ import axios, { AxiosResponse, AxiosError } from 'axios';
import { AllTagsResponse } from '../types';
import { sortTagsAlphabetical } from '../../utilMethods';
import { sortTagsAlphabetical } from 'ducks/utilMethods';
export function metadataAllTags() {
return axios.get('/api/metadata/v0/tags').then((response: AxiosResponse<AllTagsResponse>) => {
......
import { Tag } from '../../components/Tags/types';
import { Tag } from 'components/Tags/types';
export { Tag };
/* API */
......
import { AnnouncementPost } from '../../components/AnnouncementPage/types';
import { AnnouncementPost } from 'components/AnnouncementPage/types';
export { AnnouncementPost }
/* API */
......
import { SendingState } from '../../components/Feedback/types';
import { SendingState } from 'components/Feedback/types';
import {
ResetFeedback, ResetFeedbackRequest,
......
import { TableResource } from '../../components/common/ResourceListItem/types';
import { TableResource } from 'components/common/ResourceListItem/types';
export { TableResource };
/* API */
......
......@@ -10,7 +10,7 @@ import {
TableSearchResults,
UserSearchResults,
} from './types';
import { ResourceType } from "../../components/common/ResourceListItem/types";
import { ResourceType } from 'components/common/ResourceListItem/types';
export type SearchReducerAction = SearchAllResponse | SearchResourceResponse;
......
......@@ -4,7 +4,7 @@ import {
DashboardResource,
TableResource,
UserResource,
} from "../../components/common/ResourceListItem/types";
} from 'components/common/ResourceListItem/types';
import { SearchReducerState } from './reducer';
interface SearchResults<T extends Resource> {
......
import { GetTableDataRequest, TableMetadata, TableDataResponse, Tag, User } from '../../tableMetadata/types';
import { GetTableDataRequest, TableMetadata, TableDataResponse, Tag, User } from 'ducks/tableMetadata/types';
import { filterFromObj, sortTagsAlphabetical } from '../../utilMethods';
import { filterFromObj, sortTagsAlphabetical } from 'ducks/utilMethods';
/**
* Generates the query string parameters needed for requests that act on a particular table resource.
......
......@@ -5,7 +5,7 @@ import {
DescriptionResponse, LastIndexedResponse, PreviewDataResponse, TableDataResponse,
GetPreviewDataRequest, GetTableDataRequest, UpdateTableOwnerRequest, UpdateTagsRequest,
PreviewData, TableMetadata, User, Tag
} from '../../tableMetadata/types';
} from 'ducks/tableMetadata/types';
const API_PATH = '/api/metadata/v0';
......
import { PreviewData, PreviewQueryParams, TableMetadata, User } from '../../components/TableDetail/types';
import { UpdateTagData, Tag } from '../../components/Tags/types';
import { UpdateMethod } from '../../components/TableDetail/OwnerEditor/types';
import { PreviewData, PreviewQueryParams, TableMetadata, User } from 'components/TableDetail/types';
import { UpdateTagData, Tag } from 'components/Tags/types';
import { UpdateMethod } from 'components/TableDetail/OwnerEditor/types';
export { PreviewData, PreviewQueryParams, TableMetadata, Tag, User, UpdateMethod, UpdateTagData };
type MessageResponse = { msg: string };
......
import { Tag } from '../components/Tags/types';
import { Tag } from 'components/Tags/types';
export function sortTagsAlphabetical(a: Tag, b: Tag): number {
return a.tag_name.localeCompare(b.tag_name);
......
......@@ -18,6 +18,7 @@
"baseUrl": "js",
"paths": {
"components/*": [ "components/*" ],
"config/*": [ "config/*" ],
"ducks/*": [ "ducks/*" ],
}
},
......
......@@ -3,7 +3,7 @@ import * as webpack from 'webpack';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
import appConfig from './config/config';
import appConfig from './js/config/config';
const config: webpack.Configuration = {
entry: {
......@@ -17,6 +17,7 @@ const config: webpack.Configuration = {
resolve: {
alias: {
components: path.join(__dirname, '/js/components'),
config: path.join(__dirname, '/js/config'),
ducks: path.join(__dirname, '/js/ducks'),
},
extensions: ['.tsx', '.ts', '.js', '.jsx', '.css', '.scss'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment