fix(code/frontend): fix button group not match path type (#38530)

elastic · Jun 11, 2019 · c7349fe · c7349fe
1 parent 9d31076
commit c7349fe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/x-pack/plugins/code/public/reducers/file.ts b/x-pack/plugins/code/public/reducers/file.ts
@@ -46,7 +46,6 @@ export interface FileState {
   opendir?: FileTree;
   isNotFound: boolean;
   treeCommits: { [path: string]: CommitInfo[] };
-  currentPath: string;
   loadingCommits: boolean;
   commitsFullyLoaded: { [path: string]: boolean };
   fileTreeLoadingPaths: string[];
@@ -67,7 +66,6 @@ const initialState: FileState = {
   commits: [],
   treeCommits: {},
   isNotFound: false,
-  currentPath: '',
   loadingCommits: false,
   commitsFullyLoaded: {},
 };
@@ -112,7 +110,6 @@ export const file = handleActions(
   {
     [String(fetchRepoTree)]: (state: FileState, action: any) =>
       produce(state, draft => {
-        draft.currentPath = action.payload.path;
         draft.fileTreeLoadingPaths.push(action.payload!.path);
       }),
     [String(fetchRepoTreeSuccess)]: (state: FileState, action: Action<RepoTreePayload>) =>

diff --git a/x-pack/plugins/code/public/sagas/editor.ts b/x-pack/plugins/code/public/sagas/editor.ts
@@ -173,7 +173,6 @@ function* handleMainRouteChange(action: Action<Match>) {
   yield put(fetchRepoBranches({ uri: repoUri }));
   if (file) {
     if ([PathTypes.blob, PathTypes.blame].includes(pathType as PathTypes)) {
-      yield call(handleFile, repoUri, file, revision);
       yield put(revealPosition(position));
       const { tab, refUrl } = queryParams;
       if (tab === 'references' && refUrl) {
@@ -182,6 +181,7 @@ function* handleMainRouteChange(action: Action<Match>) {
         yield put(closeReferences(false));
       }
     }
+    yield call(handleFile, repoUri, file, revision);
     const commits = yield select((state: RootState) => state.file.treeCommits[file]);
     if (commits === undefined) {
       yield put(fetchTreeCommits({ revision, uri: repoUri, path: file }));

diff --git a/x-pack/plugins/code/public/sagas/file.ts b/x-pack/plugins/code/public/sagas/file.ts
@@ -43,8 +43,7 @@ import {
   fetchRootRepoTreeFailed,
   dirNotFound,
 } from '../actions';
-import { RootState } from '../reducers';
-import { treeCommitsSelector } from '../selectors';
+import { treeCommitsSelector, currentPathSelector } from '../selectors';
 import { repoRoutePattern } from './patterns';
 import { FileTree } from '../../model';
 
@@ -143,7 +142,7 @@ function* handleFetchCommits(action: Action<FetchRepoPayloadWithRevision>) {
 
 function* handleFetchMoreCommits(action: Action<string>) {
   try {
-    const path = yield select((state: RootState) => state.file.currentPath);
+    const path = yield select(currentPathSelector);
     const commits = yield select(treeCommitsSelector);
     const revision = commits.length > 0 ? commits[commits.length - 1].id : 'head';
     const uri = action.payload;

diff --git a/x-pack/plugins/code/public/selectors/index.ts b/x-pack/plugins/code/public/selectors/index.ts
@@ -43,8 +43,10 @@ export const statusSelector = (state: RootState, repoUri: RepositoryUri) => {
 
 export const allStatusSelector = (state: RootState) => state.status.status;
 
+export const currentPathSelector = (state: RootState) => state.route.match.params.path;
+
 export const treeCommitsSelector = (state: RootState) => {
-  const path = state.file.currentPath;
+  const path = currentPathSelector(state);
   if (path === '') {
     return state.file.commits;
   } else {
@@ -53,7 +55,7 @@ export const treeCommitsSelector = (state: RootState) => {
 };
 
 export const hasMoreCommitsSelector = (state: RootState) => {
-  const path = state.file.currentPath;
+  const path = currentPathSelector(state);
   const isLoading = state.file.loadingCommits;
   if (isLoading) {
     return false;
@@ -86,7 +88,7 @@ function find(tree: FileTree, paths: string[]): FileTree | null {
 
 export const currentTreeSelector = (state: RootState) => {
   const tree = getTree(state);
-  const path = state.file.currentPath;
+  const path = currentPathSelector(state) || '';
   return find(tree, path.split('/'));
 };