aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmclaugh...@apache.org
Subject [01/36] aurora git commit: Remove the old UI and serve the new UI instead
Date Wed, 25 Oct 2017 17:15:30 GMT
Repository: aurora
Updated Branches:
  refs/heads/master f2755e1cd -> 96c834a24


http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/Breadcrumb.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/Breadcrumb.js b/ui/src/main/js/components/Breadcrumb.js
index 4cd7506..76c6270 100644
--- a/ui/src/main/js/components/Breadcrumb.js
+++ b/ui/src/main/js/components/Breadcrumb.js
@@ -6,28 +6,28 @@ function url(...args) {
 }
 
 export default function Breadcrumb({ cluster, role, env, name, instance, update }) {
-  const crumbs = [<Link key='cluster' to='/beta/scheduler'>{cluster}</Link>];
+  const crumbs = [<Link key='cluster' to='/scheduler'>{cluster}</Link>];
   if (role) {
     crumbs.push(<span key='role-divider'>/</span>);
-    crumbs.push(<Link key='role' to={`/beta/scheduler/${url(role)}`}>{role}</Link>);
+    crumbs.push(<Link key='role' to={`/scheduler/${url(role)}`}>{role}</Link>);
   }
   if (env) {
     crumbs.push(<span key='env-divider'>/</span>);
-    crumbs.push(<Link key='env' to={`/beta/scheduler/${url(role, env)}`}>{env}</Link>);
+    crumbs.push(<Link key='env' to={`/scheduler/${url(role, env)}`}>{env}</Link>);
   }
   if (name) {
     crumbs.push(<span key='name-divider'>/</span>);
-    crumbs.push(<Link key='name' to={`/beta/scheduler/${url(role, env, name)}`}>{name}</Link>);
+    crumbs.push(<Link key='name' to={`/scheduler/${url(role, env, name)}`}>{name}</Link>);
   }
   if (instance) {
     crumbs.push(<span key='instance-divider'>/</span>);
-    crumbs.push(<Link key='instance' to={`/beta/scheduler/${url(role, env, name, instance)}`}>
+    crumbs.push(<Link key='instance' to={`/scheduler/${url(role, env, name, instance)}`}>
       {instance}
     </Link>);
   }
   if (update) {
     crumbs.push(<span key='update-divider'>/</span>);
-    crumbs.push(<Link key='update' to={`/beta/scheduler/${url(role, env, name, 'update',
update)}`}>
+    crumbs.push(<Link key='update' to={`/scheduler/${url(role, env, name, 'update', update)}`}>
       {update}
     </Link>);
   }

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/InstanceViz.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/InstanceViz.js b/ui/src/main/js/components/InstanceViz.js
index c8402e1..467ad5b 100644
--- a/ui/src/main/js/components/InstanceViz.js
+++ b/ui/src/main/js/components/InstanceViz.js
@@ -11,7 +11,7 @@ export default function InstanceViz({ instances, jobKey }) {
     {instances.map((i) => {
       return (<Link
         key={i.instanceId}
-        to={`/beta/scheduler/${role}/${environment}/${name}/${i.instanceId}`}>
+        to={`/scheduler/${role}/${environment}/${name}/${i.instanceId}`}>
         <li className={i.className} title={i.title} />
       </Link>);
     })}

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/JobListItem.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/JobListItem.js b/ui/src/main/js/components/JobListItem.js
index eccd227..c9228f0 100644
--- a/ui/src/main/js/components/JobListItem.js
+++ b/ui/src/main/js/components/JobListItem.js
@@ -20,7 +20,7 @@ export default function JobListItem(props) {
   const {job: {job: { cronSchedule, key: {role, name, environment}, taskConfig }, stats}}
= props;
 
   const envLink = (props.env) ? null : (<td className='job-list-env'>
-    <Link to={`/beta/scheduler/${role}/${environment}`}>{environment}</Link>
+    <Link to={`/scheduler/${role}/${environment}`}>{environment}</Link>
   </td>);
 
   return (<tr key={`${environment}/${name}`}>
@@ -30,7 +30,7 @@ export default function JobListItem(props) {
     {envLink}
     <td className='job-list-name' value={name}>
       <h4>
-        <Link to={`/beta/scheduler/${role}/${environment}/${name}`}>
+        <Link to={`/scheduler/${role}/${environment}/${name}`}>
           {name}
           {taskConfig.production ? <Icon name='star' /> : ''}
         </Link>

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/Navigation.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/Navigation.js b/ui/src/main/js/components/Navigation.js
index f9f3694..50881a9 100644
--- a/ui/src/main/js/components/Navigation.js
+++ b/ui/src/main/js/components/Navigation.js
@@ -6,12 +6,12 @@ export default function Navigation({ fluid }) {
     <nav className='navbar'>
       <div className={fluid ? 'container-fluid' : 'container'}>
         <div className='navbar-header'>
-          <Link className='navbar-brand' to='/beta/scheduler'>
+          <Link className='navbar-brand' to='/scheduler'>
             <img alt='Brand' src='/assets/images/aurora_logo_white.png' />
           </Link>
         </div>
         <ul className='nav navbar-nav navbar-right'>
-          <li><Link to='/beta/updates'>updates</Link></li>
+          <li><Link to='/updates'>updates</Link></li>
         </ul>
       </div>
     </nav>

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/RoleList.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/RoleList.js b/ui/src/main/js/components/RoleList.js
index 177640a..2bdae8e 100644
--- a/ui/src/main/js/components/RoleList.js
+++ b/ui/src/main/js/components/RoleList.js
@@ -26,7 +26,7 @@ export default class RoleList extends React.Component {
 
   _renderRow(r) {
     return (<tr key={r.role}>
-      <td><Link to={`/beta/scheduler/${r.role}`}>{r.role}</Link></td>
+      <td><Link to={`/scheduler/${r.role}`}>{r.role}</Link></td>
       <td>{r.jobCount}</td>
       <td>{r.cronJobCount}</td>
     </tr>);

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/TaskList.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/TaskList.js b/ui/src/main/js/components/TaskList.js
index 4a4b8d3..e1685ce 100644
--- a/ui/src/main/js/components/TaskList.js
+++ b/ui/src/main/js/components/TaskList.js
@@ -30,7 +30,7 @@ export class TaskListItem extends React.Component {
       <td>
         <div className='task-list-item-instance'>
           <Link
-            to={`/beta/scheduler/${role}/${environment}/${name}/${task.assignedTask.instanceId}`}>
+            to={`/scheduler/${role}/${environment}/${name}/${task.assignedTask.instanceId}`}>
             {task.assignedTask.instanceId}
           </Link>
         </div>

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/TaskNeighbors.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/TaskNeighbors.js b/ui/src/main/js/components/TaskNeighbors.js
index 72d49bb..4722c89 100644
--- a/ui/src/main/js/components/TaskNeighbors.js
+++ b/ui/src/main/js/components/TaskNeighbors.js
@@ -9,7 +9,7 @@ export function NeighborTaskItem({ assignedTask }) {
   return (
     <div>
       <span className='task-neighbors-task-key'>
-        <Link to={`/beta/scheduler/${taskKey}`}>
+        <Link to={`/scheduler/${taskKey}`}>
           {taskKey}
         </Link>
       </span>

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/UpdateInstanceEvents.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/UpdateInstanceEvents.js b/ui/src/main/js/components/UpdateInstanceEvents.js
index f0dfae2..8351f2c 100644
--- a/ui/src/main/js/components/UpdateInstanceEvents.js
+++ b/ui/src/main/js/components/UpdateInstanceEvents.js
@@ -55,7 +55,7 @@ export class InstanceEvent extends React.Component {
       <div className='update-instance-event' onClick={(e) => this.expand()}>
         {icon}
         <span className='update-instance-event-id'>
-          <Link to={`/beta/scheduler/${role}/${environment}/${name}/${instanceId}`}>
+          <Link to={`/scheduler/${role}/${environment}/${name}/${instanceId}`}>
             #{instanceId}
           </Link>
         </span>

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/UpdateList.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/UpdateList.js b/ui/src/main/js/components/UpdateList.js
index 464c59d..377dbe8 100644
--- a/ui/src/main/js/components/UpdateList.js
+++ b/ui/src/main/js/components/UpdateList.js
@@ -20,7 +20,7 @@ function UpdateListItem({ summary, titleFn }) {
       <span className='update-list-item-status'>
         <Link
           className='update-list-job'
-          to={`/beta/scheduler/${role}/${environment}/${name}/update/${id}`}>
+          to={`/scheduler/${role}/${environment}/${name}/update/${id}`}>
           {title(summary)}
         </Link> &bull; <span className='update-list-status'>
           {UPDATE_STATUS[summary.state.status]}
@@ -45,7 +45,7 @@ function JobUpdateListItem({ update }) {
       <span>
         <Link
           className='job-update-list-id'
-          to={`/beta/scheduler/${role}/${environment}/${name}/update/${id}`}>
+          to={`/scheduler/${role}/${environment}/${name}/update/${id}`}>
           {id}
         </Link> &bull; <span className='job-update-list-status'>
           {UPDATE_STATUS[summary.state.status]}

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/UpdatePreview.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/UpdatePreview.js b/ui/src/main/js/components/UpdatePreview.js
index 73dd487..6bb1194 100644
--- a/ui/src/main/js/components/UpdatePreview.js
+++ b/ui/src/main/js/components/UpdatePreview.js
@@ -14,7 +14,7 @@ export default function UpdatePreview({ update }) {
       <div
         className={`update-preview ${getClassForUpdateStatus(update.update.summary.state.status)}`}>
         <Link
-          to={`/beta/scheduler/${role}/${environment}/${name}/update/${id}`}>
+          to={`/scheduler/${role}/${environment}/${name}/update/${id}`}>
          Update In Progress
         </Link>
         <span className='update-preview-details'>

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/components/__tests__/Breadcrumb-test.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/components/__tests__/Breadcrumb-test.js b/ui/src/main/js/components/__tests__/Breadcrumb-test.js
index 0a9ad4b..47f7afb 100644
--- a/ui/src/main/js/components/__tests__/Breadcrumb-test.js
+++ b/ui/src/main/js/components/__tests__/Breadcrumb-test.js
@@ -8,25 +8,25 @@ import Breadcrumb from '../Breadcrumb';
 describe('Breadcrumb', () => {
   it('Should render cluster crumb', () => {
     const el = shallow(<Breadcrumb cluster='devcluster' />);
-    expect(el.contains(<Link to='/beta/scheduler'>devcluster</Link>)).toBe(true);
+    expect(el.contains(<Link to='/scheduler'>devcluster</Link>)).toBe(true);
     expect(el.find(Link).length).toBe(1);
   });
 
   it('Should render role crumb', () => {
     const el = shallow(<Breadcrumb cluster='devcluster' role='www-data' />);
-    expect(el.contains(<Link to='/beta/scheduler/www-data'>www-data</Link>)).toBe(true);
+    expect(el.contains(<Link to='/scheduler/www-data'>www-data</Link>)).toBe(true);
     expect(el.find(Link).length).toBe(2);
   });
 
   it('Should render env crumb', () => {
     const el = shallow(<Breadcrumb cluster='devcluster' env='prod' role='www-data' />);
-    expect(el.contains(<Link to='/beta/scheduler/www-data/prod'>prod</Link>)).toBe(true);
+    expect(el.contains(<Link to='/scheduler/www-data/prod'>prod</Link>)).toBe(true);
     expect(el.find(Link).length).toBe(3);
   });
 
   it('Should render name crumb', () => {
     const el = shallow(<Breadcrumb cluster='devcluster' env='prod' name='hello' role='www-data'
/>);
-    expect(el.contains(<Link to='/beta/scheduler/www-data/prod/hello'>hello</Link>)).toBe(true);
+    expect(el.contains(<Link to='/scheduler/www-data/prod/hello'>hello</Link>)).toBe(true);
     expect(el.find(Link).length).toBe(4);
   });
 });

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/index.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/index.js b/ui/src/main/js/index.js
index 8cb4490..9f94d4b 100644
--- a/ui/src/main/js/index.js
+++ b/ui/src/main/js/index.js
@@ -21,19 +21,19 @@ const SchedulerUI = () => (
   <Router>
     <div>
       <Navigation />
-      <Route component={injectApi(Home)} exact path='/beta/scheduler' />
-      <Route component={injectApi(Jobs)} exact path='/beta/scheduler/:role' />
-      <Route component={injectApi(Jobs)} exact path='/beta/scheduler/:role/:environment'
/>
-      <Route component={injectApi(Job)} exact path='/beta/scheduler/:role/:environment/:name'
/>
+      <Route component={injectApi(Home)} exact path='/scheduler' />
+      <Route component={injectApi(Jobs)} exact path='/scheduler/:role' />
+      <Route component={injectApi(Jobs)} exact path='/scheduler/:role/:environment' />
+      <Route component={injectApi(Job)} exact path='/scheduler/:role/:environment/:name'
/>
       <Route
         component={injectApi(Instance)}
         exact
-        path='/beta/scheduler/:role/:environment/:name/:instance' />
+        path='/scheduler/:role/:environment/:name/:instance' />
       <Route
         component={injectApi(Update)}
         exact
-        path='/beta/scheduler/:role/:environment/:name/update/:uid' />
-      <Route component={injectApi(Updates)} exact path='/beta/updates' />
+        path='/scheduler/:role/:environment/:name/update/:uid' />
+      <Route component={injectApi(Updates)} exact path='/updates' />
     </div>
   </Router>
 );

http://git-wip-us.apache.org/repos/asf/aurora/blob/96c834a2/ui/src/main/js/pages/Job.js
----------------------------------------------------------------------
diff --git a/ui/src/main/js/pages/Job.js b/ui/src/main/js/pages/Job.js
index 591d097..2f96e23 100644
--- a/ui/src/main/js/pages/Job.js
+++ b/ui/src/main/js/pages/Job.js
@@ -108,12 +108,12 @@ export default class Job extends React.Component {
 
   setJobView(tabId) {
     const {match: {params: {role, environment, name}}} = this.props;
-    this.props.history.push(`/beta/scheduler/${role}/${environment}/${name}?jobView=${tabId}`);
+    this.props.history.push(`/scheduler/${role}/${environment}/${name}?jobView=${tabId}`);
   }
 
   setTaskView(tabId) {
     const {match: {params: {role, environment, name}}} = this.props;
-    this.props.history.push(`/beta/scheduler/${role}/${environment}/${name}?taskView=${tabId}`);
+    this.props.history.push(`/scheduler/${role}/${environment}/${name}?taskView=${tabId}`);
   }
 
   render() {


Mime
View raw message