Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ensembl-web
ensembl-client
Commits
d69cb76c
Commit
d69cb76c
authored
Mar 12, 2019
by
Andrey Azov
Browse files
Fix rootReducer type
parent
2722bfb3
Pipeline
#14633
failed with stage
in 2 minutes and 58 seconds
Changes
16
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
24 additions
and
21 deletions
+24
-21
src/ensembl/src/Root.tsx
src/ensembl/src/Root.tsx
+1
-1
src/ensembl/src/content/Content.tsx
src/ensembl/src/content/Content.tsx
+1
-1
src/ensembl/src/content/app/App.tsx
src/ensembl/src/content/app/App.tsx
+1
-1
src/ensembl/src/content/app/browser/Browser.tsx
src/ensembl/src/content/app/browser/Browser.tsx
+1
-1
src/ensembl/src/content/app/browser/browser-bar/BrowserBar.tsx
...nsembl/src/content/app/browser/browser-bar/BrowserBar.tsx
+1
-1
src/ensembl/src/content/app/browser/browser-nav/BrowserNavBar.tsx
...mbl/src/content/app/browser/browser-nav/BrowserNavBar.tsx
+1
-1
src/ensembl/src/content/app/browser/browserSelectors.ts
src/ensembl/src/content/app/browser/browserSelectors.ts
+1
-1
src/ensembl/src/content/app/browser/drawer/Drawer.tsx
src/ensembl/src/content/app/browser/drawer/Drawer.tsx
+1
-1
src/ensembl/src/content/app/browser/track-panel/TrackPanel.tsx
...nsembl/src/content/app/browser/track-panel/TrackPanel.tsx
+1
-1
src/ensembl/src/content/home/Home.tsx
src/ensembl/src/content/home/Home.tsx
+1
-1
src/ensembl/src/globalSelectors.ts
src/ensembl/src/globalSelectors.ts
+1
-1
src/ensembl/src/header/account/Account.tsx
src/ensembl/src/header/account/Account.tsx
+1
-1
src/ensembl/src/header/headerSelectors.ts
src/ensembl/src/header/headerSelectors.ts
+1
-1
src/ensembl/src/header/launchbar/LaunchbarContainer.tsx
src/ensembl/src/header/launchbar/LaunchbarContainer.tsx
+1
-1
src/ensembl/src/rootReducer.ts
src/ensembl/src/rootReducer.ts
+2
-5
src/ensembl/src/store.ts
src/ensembl/src/store.ts
+8
-2
No files found.
src/ensembl/src/Root.tsx
View file @
d69cb76c
...
...
@@ -14,7 +14,7 @@ import PrivacyBanner from './shared/privacy-banner/PrivacyBanner';
import
{
updateBreakpointWidth
}
from
'
./globalActions
'
;
import
{
getBreakpointWidth
}
from
'
./globalSelectors
'
;
import
{
RootState
}
from
'
./
rootReducer
'
;
import
{
RootState
}
from
'
./
store
'
;
import
{
BreakpointWidth
,
getBreakpoint
}
from
'
./globalConfig
'
;
import
styles
from
'
./Root.scss
'
;
...
...
src/ensembl/src/content/Content.tsx
View file @
d69cb76c
...
...
@@ -3,7 +3,7 @@ import { Route, withRouter } from 'react-router-dom';
import
{
RouteComponentProps
}
from
'
react-router
'
;
import
{
connect
}
from
'
react-redux
'
;
import
{
RootState
}
from
'
../
rootReducer
'
;
import
{
RootState
}
from
'
../
store
'
;
import
{
getLaunchbarExpanded
}
from
'
../header/headerSelectors
'
;
import
Home
from
'
./home/Home
'
;
...
...
src/ensembl/src/content/app/App.tsx
View file @
d69cb76c
...
...
@@ -15,7 +15,7 @@ import { connect } from 'react-redux';
import
{
changeCurrentApp
}
from
'
src/header/headerActions
'
;
import
{
getCurrentApp
}
from
'
src/header/headerSelectors
'
;
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
import
AppBar
from
'
./AppBar
'
;
...
...
src/ensembl/src/content/app/browser/Browser.tsx
View file @
d69cb76c
...
...
@@ -13,7 +13,7 @@ import BrowserNavBar from './browser-nav/BrowserNavBar';
import
TrackPanel
from
'
./track-panel/TrackPanel
'
;
import
Drawer
from
'
./drawer/Drawer
'
;
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
import
{
BrowserOpenState
,
BrowserNavStates
,
...
...
src/ensembl/src/content/app/browser/browser-bar/BrowserBar.tsx
View file @
d69cb76c
...
...
@@ -22,7 +22,7 @@ import {
getObjectInfo
,
getTrackPanelModalOpened
}
from
'
../browserSelectors
'
;
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
import
BrowserReset
from
'
../browser-reset/BrowserReset
'
;
import
BrowserGenomeSelector
from
'
../browser-genome-selector/BrowserGenomeSelector
'
;
...
...
src/ensembl/src/content/app/browser/browser-nav/BrowserNavBar.tsx
View file @
d69cb76c
...
...
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
import
{
browserNavConfig
,
BrowserNavItem
}
from
'
../browserConfig
'
;
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
import
{
getBrowserNavStates
}
from
'
../browserSelectors
'
;
import
{
BrowserNavStates
}
from
'
../browserState
'
;
...
...
src/ensembl/src/content/app/browser/browserSelectors.ts
View file @
d69cb76c
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
import
{
BrowserOpenState
,
BrowserNavStates
,
...
...
src/ensembl/src/content/app/browser/drawer/Drawer.tsx
View file @
d69cb76c
import
React
,
{
FunctionComponent
}
from
'
react
'
;
import
{
connect
}
from
'
react-redux
'
;
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
import
{
toggleDrawer
}
from
'
../browserActions
'
;
import
{
getDrawerView
,
getObjectInfo
}
from
'
../browserSelectors
'
;
...
...
src/ensembl/src/content/app/browser/track-panel/TrackPanel.tsx
View file @
d69cb76c
...
...
@@ -10,7 +10,7 @@ import TrackPanelBar from './track-panel-bar/TrackPanelBar';
import
TrackPanelList
from
'
./track-panel-list/TrackPanelList
'
;
import
TrackPanelModal
from
'
./track-panel-modal/TrackPanelModal
'
;
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
import
{
toggleDrawer
,
...
...
src/ensembl/src/content/home/Home.tsx
View file @
d69cb76c
...
...
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
import
styles
from
'
./Home.scss
'
;
import
{
fetchExampleObjectsData
}
from
'
../app/browser/browserActions
'
;
import
{
getExampleObjects
}
from
'
../app/browser/browserSelectors
'
;
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
type
StateProps
=
{
exampleObjects
:
{};
...
...
src/ensembl/src/globalSelectors.ts
View file @
d69cb76c
import
{
RootState
}
from
'
./
rootReducer
'
;
import
{
RootState
}
from
'
./
store
'
;
import
{
BreakpointWidth
}
from
'
./globalConfig
'
;
export
const
getBreakpointWidth
=
(
state
:
RootState
):
BreakpointWidth
=>
...
...
src/ensembl/src/header/account/Account.tsx
View file @
d69cb76c
...
...
@@ -2,7 +2,7 @@ import React, { FunctionComponent, ReactNode } from 'react';
import
SlideDown
from
'
react-slidedown
'
;
import
{
connect
}
from
'
react-redux
'
;
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
import
{
getAccountExpanded
}
from
'
../headerSelectors
'
;
import
styles
from
'
./Account.scss
'
;
...
...
src/ensembl/src/header/headerSelectors.ts
View file @
d69cb76c
import
{
RootState
}
from
'
../
rootReducer
'
;
import
{
RootState
}
from
'
../
store
'
;
export
const
getAccountExpanded
=
(
state
:
RootState
):
boolean
=>
state
.
header
.
accountExpanded
;
...
...
src/ensembl/src/header/launchbar/LaunchbarContainer.tsx
View file @
d69cb76c
import
React
,
{
FunctionComponent
,
memo
}
from
'
react
'
;
import
{
connect
}
from
'
react-redux
'
;
import
{
RootState
}
from
'
src/
rootReducer
'
;
import
{
RootState
}
from
'
src/
store
'
;
import
{
changeCurrentApp
}
from
'
../headerActions
'
;
import
Launchbar
from
'
./Launchbar
'
;
import
{
getCurrentApp
,
getLaunchbarExpanded
}
from
'
../headerSelectors
'
;
...
...
src/ensembl/src/rootReducer.ts
View file @
d69cb76c
import
{
combineReducers
}
from
'
redux
'
;
import
{
connectRouter
}
from
'
connected-react-router
'
;
import
{
StateType
}
from
'
typesafe-actions
'
;
import
global
from
'
./globalReducer
'
;
import
header
from
'
./header/headerReducer
'
;
...
...
@@ -8,12 +7,10 @@ import browser from './content/app/browser/browserReducer';
const
rootReducer
=
(
history
:
any
)
=>
combineReducers
({
ro
uter
:
connectRouter
(
history
)
,
b
ro
wser
,
global
,
header
,
b
ro
wser
ro
uter
:
connectRouter
(
history
)
});
export
type
RootState
=
StateType
<
typeof
rootReducer
>
;
export
default
rootReducer
;
src/ensembl/src/store.ts
View file @
d69cb76c
...
...
@@ -3,7 +3,9 @@ import thunk from 'redux-thunk';
import
{
composeWithDevTools
}
from
'
redux-devtools-extension
'
;
import
{
createBrowserHistory
}
from
'
history
'
;
import
{
routerMiddleware
,
LOCATION_CHANGE
}
from
'
connected-react-router
'
;
import
rootReducer
from
'
./rootReducer
'
;
import
{
StateType
}
from
'
typesafe-actions
'
;
import
createRootReducer
from
'
./rootReducer
'
;
import
GoogleAnalyticsTracking
from
'
./services/analytics-service
'
;
...
...
@@ -34,9 +36,13 @@ const googleAnalyticsMiddleWare = (store: any) => (next: any) => (
export
const
history
=
createBrowserHistory
();
const
composeEnhancers
=
composeWithDevTools
({});
const
rootReducer
=
createRootReducer
(
history
);
export
type
RootState
=
StateType
<
typeof
rootReducer
>
;
export
default
function
configureStore
(
preloadedState
?:
any
)
{
const
store
=
createStore
(
rootReducer
(
history
),
// root reducer with router state
rootReducer
,
preloadedState
,
composeEnhancers
(
applyMiddleware
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment