[Code] apply the correct timestamp to admin page

x-pack/plugins/code/public/actions/status.ts

@@ -5,6 +5,7 @@
  */
 
 import { createAction } from 'redux-actions';
+import { RepoStatus } from '../reducers';
 
 export const loadStatus = createAction<string>('LOAD STATUS');
 export const loadStatusSuccess = createAction<any>('LOAD STATUS SUCCESS');
@@ -18,12 +19,6 @@ export const loadRepo = createAction<string>('LOAD REPO');
 export const loadRepoSuccess = createAction<any>('LOAD REPO SUCCESS');
 export const loadRepoFailed = createAction<any>('LOAD REPO FAILED');
 
-export interface RepoProgress {
-  repoUri: string;
-  progress: number;
-  cloneProgress?: any;
-}
-
-export const updateCloneProgress = createAction<RepoProgress>('UPDATE CLONE PROGRESS');
-export const updateIndexProgress = createAction<RepoProgress>('UPDATE INDEX PROGRESS');
-export const updateDeleteProgress = createAction<RepoProgress>('UPDATE DELETE PROGRESS');
+export const updateCloneProgress = createAction<RepoStatus>('UPDATE CLONE PROGRESS');
+export const updateIndexProgress = createAction<RepoStatus>('UPDATE INDEX PROGRESS');
+export const updateDeleteProgress = createAction<RepoStatus>('UPDATE DELETE PROGRESS');

x-pack/plugins/code/public/components/admin_page/project_item.tsx

@@ -53,7 +53,7 @@ class CodeProjectItem extends React.PureComponent<{
 }> {
   public render() {
     const { project, status, enableManagement } = this.props;
-    const { name, org, nextUpdateTimestamp, uri, url } = project;
+    const { name, org, uri, url } = project;
     const onClickDelete = () => this.props.deleteRepo && this.props.deleteRepo(uri);
     const onClickIndex = () => this.props.indexRepo && this.props.indexRepo(uri);
     const onClickSettings = () => this.props.openSettings && this.props.openSettings(uri, url);
@@ -65,7 +65,7 @@ class CodeProjectItem extends React.PureComponent<{
     } else if (status.state === RepoState.READY) {
       footer = (
         <Footer data-test-subj="repositoryIndexDone">
-          LAST UPDATED: {moment(nextUpdateTimestamp).fromNow()}
+          LAST UPDATED: {moment(status.timestamp).fromNow()}
         </Footer>
       );
     } else if (status.state === RepoState.DELETING) {

x-pack/plugins/code/public/components/admin_page/project_tab.tsx

@@ -25,12 +25,13 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
+import moment from 'moment';
 import React, { ChangeEvent } from 'react';
 import { connect } from 'react-redux';
 import styled from 'styled-components';
 import { Repository } from '../../../model';
 import { importRepo } from '../../actions';
-import { RootState } from '../../reducers';
+import { RepoStatus, RootState } from '../../reducers';
 import { CallOutType } from '../../reducers/repository';
 import { ProjectItem } from './project_item';
 import { ProjectSettings } from './project_settings';
@@ -47,27 +48,34 @@ enum SortOptionsValue {
   recently_added = 'recently_added',
 }
 
-const sortFunctions: { [k: string]: (a: Repository, b: Repository) => number } = {
-  [SortOptionsValue.alphabetical_asc]: (a: Repository, b: Repository) =>
-    a.name!.localeCompare(b.name!),
-  [SortOptionsValue.alphabetical_desc]: (a: Repository, b: Repository) =>
-    b.name!.localeCompare(a.name!),
-  [SortOptionsValue.updated_asc]: () => -1,
-  [SortOptionsValue.updated_desc]: () => -1,
-  [SortOptionsValue.recently_added]: () => -1,
+const sortFunctionsFactory = (status: { [key: string]: RepoStatus }) => {
+  const sortFunctions: { [k: string]: (a: Repository, b: Repository) => number } = {
+    [SortOptionsValue.alphabetical_asc]: (a: Repository, b: Repository) =>
+      a.name!.localeCompare(b.name!),
+    [SortOptionsValue.alphabetical_desc]: (a: Repository, b: Repository) =>
+      b.name!.localeCompare(a.name!),
+    [SortOptionsValue.updated_asc]: (a: Repository, b: Repository) =>
+      moment(status[b.uri].timestamp).diff(moment(status[a.uri].timestamp)),
+    [SortOptionsValue.updated_desc]: (a: Repository, b: Repository) =>
+      moment(status[a.uri].timestamp).diff(moment(status[b.uri].timestamp)),
+    [SortOptionsValue.recently_added]: () => {
+      return -1;
+    },
+  };
+  return sortFunctions;
 };
 
 const sortOptions = [
   { value: SortOptionsValue.alphabetical_asc, inputDisplay: 'A to Z' },
   { value: SortOptionsValue.alphabetical_desc, inputDisplay: 'Z to A' },
   { value: SortOptionsValue.updated_asc, inputDisplay: 'Last Updated ASC' },
   { value: SortOptionsValue.updated_desc, inputDisplay: 'Last Updated DESC' },
-  { value: SortOptionsValue.recently_added, inputDisplay: 'Recently Added' },
+  // { value: SortOptionsValue.recently_added, inputDisplay: 'Recently Added' },
 ];
 
 interface Props {
   projects: Repository[];
-  status: any;
+  status: { [key: string]: RepoStatus };
   isAdmin: boolean;
   importRepo: (repoUrl: string) => void;
   importLoading: boolean;
@@ -173,7 +181,7 @@ class CodeProjectTab extends React.PureComponent<Props, State> {
     const projectsCount = projects.length;
     const modal = this.state.showImportProjectModal && this.renderImportModal();
 
-    const sortedProjects = projects.sort(sortFunctions[this.state.sortOption]);
+    const sortedProjects = projects.sort(sortFunctionsFactory(status)[this.state.sortOption]);
 
     const repoList = sortedProjects.map((repo: Repository) => (
       <ProjectItem

x-pack/plugins/code/public/reducers/status.ts

@@ -28,9 +28,11 @@ export enum RepoState {
 }
 
 export interface RepoStatus {
-  state: RepoState;
-  progress?: number;
+  repoUri: string;
+  progress: number;
   cloneProgress?: any;
+  timestamp?: Date;
+  state?: RepoState;
 }
 
 export interface StatusState {

x-pack/plugins/code/public/sagas/project_status.ts

@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import moment from 'moment';
 import { Action } from 'redux-actions';
 import { delay } from 'redux-saga';
 import { all, call, put, takeEvery, takeLatest } from 'redux-saga/effects';
@@ -156,10 +157,11 @@ const handleRepoCloneStatusPolling = createRepoStatusPollingHandler(
     }
 
     if (status.gitStatus) {
-      const { progress, cloneProgress } = status.gitStatus;
+      const { progress, cloneProgress, timestamp } = status.gitStatus;
       yield put(
         updateCloneProgress({
           progress,
+          timestamp: moment(timestamp).toDate(),
           repoUri,
           cloneProgress,
         })
@@ -204,6 +206,7 @@ const handleRepoIndexStatusPolling = createRepoStatusPollingHandler(
       yield put(
         updateIndexProgress({
           progress: status.indexStatus.progress,
+          timestamp: moment(status.indexStatus.timestamp).toDate(),
           repoUri,
         })
       );
@@ -249,6 +252,7 @@ const handleRepoDeleteStatusPolling = createRepoStatusPollingHandler(
       yield put(
         updateDeleteProgress({
           progress: status.deleteStatus.progress,
+          timestamp: moment(status.deleteStatus.timestamp).toDate(),
           repoUri,
         })
       );