Flatten hooks folder (#186)

Author: MonicaOlejniczak

src/__tests__/integration/test.tsx src/__tests__/integration.test.tsxsrc/__tests__/integration/test.tsx renamed to src/__tests__/integration.test.tsx

@@ -3,15 +3,15 @@ import * as historyHelper from 'history';
 import React from 'react';
 import { defaultRegistry } from 'react-sweet-state';
 
-import { mockRoute } from '../../common/mocks';
-import { ResourceStore } from '../../controllers/resource-store';
+import { mockRoute } from '../common/mocks';
+import { ResourceStore } from '../controllers/resource-store';
 import {
   RouteComponent,
   Router,
   RouterActions,
   RouterActionsType,
   StaticRouter,
-} from '../../index';
+} from '../index';
 
 const mockLocation = {
   pathname: '/projects/123/board/456',

src/common/utils/create-legacy-history/test.ts

@@ -2,7 +2,7 @@ import { createLegacyHistory } from './index';
 
 type NodeChangeCallback = () => void;
 
-describe('createLegacyHistory', () => {
+describe('createLegacyHistory()', () => {
   let onNodeChanges: NodeChangeCallback = () => {};
 
   const triggerLocationChange = async (location: string, push = true) => {

src/common/utils/generate-path/test.ts

@@ -4,7 +4,7 @@
 
 import { generatePath } from './index';
 
-describe('generatePath', () => {
+describe('generatePath()', () => {
   describe('tests covering cases for PROJECT_SETTINGS_ISSUE_TYPES_ROUTE', () => {
     const PROJECT_SETTINGS_ISSUE_TYPES_ROUTE =
       '/projects/:projectKey/settings/issuetypes/:issueTypeId?';

src/common/utils/match-route/test.ts

@@ -7,7 +7,7 @@ const Noop = () => null;
 const DEFAULT_QUERY_PARAMS = {};
 const { parse } = qs;
 
-describe('matchRoute', () => {
+describe('matchRoute()', () => {
   beforeEach(() => {
     matchRouteCache.cache.clear();
   });

src/common/utils/router-context/test.tsx

@@ -17,7 +17,7 @@ const mockLocation = {
   hash: '',
 };
 
-describe('Router findRouterContext util', () => {
+describe('findRouterContext()', () => {
   it('should return the route match', () => {
     const context = findRouterContext(mockRoutes, { location: mockLocation });
 
@@ -50,7 +50,7 @@ describe('Router findRouterContext util', () => {
   });
 });
 
-describe('Router createRouterContext util', () => {
+describe('createRouterContext()', () => {
   it('should return the context for provided route', () => {
     const route = {
       path: '/foo/:page',

src/controllers/hooks/index.ts

@@ -1,25 +1,17 @@
-export {
-  useResource,
-  useRouter,
-  useRouterActions,
-  useQueryParam,
-  usePathParam,
-  useTimeout,
-} from './hooks';
-
-export { Router } from './router';
-export { RouterActions } from './router-actions';
-export { RouterSubscriber } from './router-subscriber';
 export { MemoryRouter } from './memory-router';
 export { Redirect } from './redirect';
 export { ResourceSubscriber } from './resource-subscriber';
+export { Router } from './router';
+export { RouterActions } from './router-actions';
+export { RouterSubscriber } from './router-subscriber';
 export { StaticRouter } from './static-router';
 
 export {
   createResource,
   useResourceStoreContext,
   ResourceDependencyError,
 } from './resource-store';
+
 export type {
   CreateResourceArgBase,
   CreateResourceArgSync,
@@ -31,4 +23,10 @@ export {
   createRouterSelector,
 } from './router-store';
 
+export { usePathParam } from './use-path-param';
+export { useQueryParam } from './use-query-param';
+export { useResource } from './use-resource';
+export { useRouter } from './use-router';
+export { useRouterActions } from './use-router-actions';
+
 export { withRouter } from './with-router';

src/controllers/hooks/router-store/index.tsx

@@ -4,9 +4,8 @@ import React, { Component } from 'react';
 import { Location, MatchParams, Query, Route } from '../../common/types';
 import { generateLocationFromPath } from '../../common/utils';
 
-import { useRouter } from '../hooks';
-
 import { RouterActionsType, RouterState } from '../router-store/types';
+import { useRouter } from '../use-router';
 
 export type RedirectProps = {
   to: Location | Route | string;

src/controllers/index.ts

@@ -1,13 +1,11 @@
-/* eslint-disable prefer-destructuring */
-/* eslint-disable prefer-promise-reject-errors */
 import { mount } from 'enzyme';
 import React from 'react';
 import { BoundActions, defaultRegistry } from 'react-sweet-state';
 
 import { ResourceType, RouteResourceResponse } from '../../common/types';
 
-import { useResource } from '../hooks';
 import * as routerStoreModule from '../router-store';
+import { useResource } from '../use-resource';
 
 import { getResourceStore, ResourceDependencyError } from './index';
 import { getSliceForResource } from './selectors';