UI: convert to angle bracket invocation

ui/app/components/fs/breadcrumbs.js

@@ -9,7 +9,7 @@ export default Component.extend({
   'data-test-fs-breadcrumbs': true,
 
   allocation: null,
-  task: null,
+  taskState: null,
   path: null,
 
   breadcrumbs: computed('path', function() {

ui/app/components/fs/browser.js

@@ -15,14 +15,14 @@ export default Component.extend({
     }
   }),
 
-  task: computed('model', function() {
+  taskState: computed('model', function() {
     if (this.model.allocation) {
       return this.model;
     }
   }),
 
-  type: computed('task', function() {
-    if (this.task) {
+  type: computed('taskState', function() {
+    if (this.taskState) {
       return 'task';
     } else {
       return 'allocation';

ui/app/components/fs/directory-entry.js

@@ -6,7 +6,7 @@ export default Component.extend({
   tagName: '',
 
   allocation: null,
-  task: null,
+  taskState: null,
 
   pathToEntry: computed('path', 'entry.Name', function() {
     const pathWithNoLeadingSlash = this.get('path').replace(/^\//, '');

ui/app/components/fs/file.js

@@ -15,7 +15,7 @@ export default Component.extend({
   'data-test-file-viewer': true,
 
   allocation: null,
-  task: null,
+  taskState: null,
   file: null,
   stat: null, // { Name, IsDir, Size, FileMode, ModTime, ContentType }
 
@@ -48,8 +48,8 @@ export default Component.extend({
   isStreamable: equal('fileComponent', 'stream'),
   isStreaming: false,
 
-  catUrl: computed('allocation.id', 'task.name', 'file', function() {
-    const taskUrlPrefix = this.task ? `${this.task.name}/` : '';
+  catUrl: computed('allocation.id', 'taskState.name', 'file', function() {
+    const taskUrlPrefix = this.taskState ? `${this.taskState.name}/` : '';
     const encodedPath = encodeURIComponent(`${taskUrlPrefix}${this.file}`);
     return `/v1/client/fs/cat/${this.allocation.id}?path=${encodedPath}`;
   }),
@@ -78,9 +78,9 @@ export default Component.extend({
     }
   ),
 
-  fileParams: computed('task.name', 'file', 'mode', function() {
+  fileParams: computed('taskState.name', 'file', 'mode', function() {
     // The Log class handles encoding query params
-    const taskUrlPrefix = this.task ? `${this.task.name}/` : '';
+    const taskUrlPrefix = this.taskState ? `${this.taskState.name}/` : '';
     const path = `${taskUrlPrefix}${this.file}`;
 
     switch (this.mode) {

ui/app/components/fs/link.js

@@ -4,5 +4,5 @@ export default Component.extend({
   tagName: '',
 
   allocation: null,
-  task: null,
+  taskState: null,
 });

ui/app/controllers/allocations/allocation/task/fs.js

@@ -11,7 +11,7 @@ export default Controller.extend({
   sortDescending: false,
 
   path: null,
-  task: null,
+  taskState: null,
   directoryEntries: null,
   isFile: null,
   stat: null,

ui/app/routes/allocations/allocation/task/fs.js

@@ -5,31 +5,31 @@ import notifyError from 'nomad-ui/utils/notify-error';
 export default Route.extend({
   model({ path = '/' }) {
     const decodedPath = decodeURIComponent(path);
-    const task = this.modelFor('allocations.allocation.task');
-    const allocation = task.allocation;
+    const taskState = this.modelFor('allocations.allocation.task');
+    const allocation = taskState.allocation;
 
-    const pathWithTaskName = `${task.name}${decodedPath.startsWith('/') ? '' : '/'}${decodedPath}`;
+    const pathWithTaskName = `${taskState.name}${decodedPath.startsWith('/') ? '' : '/'}${decodedPath}`;
 
-    if (!task.isRunning) {
+    if (!taskState.isRunning) {
       return {
         path: decodedPath,
-        task,
+        taskState,
       };
     }
 
-    return RSVP.all([allocation.stat(pathWithTaskName), task.get('allocation.node')])
+    return RSVP.all([allocation.stat(pathWithTaskName), taskState.get('allocation.node')])
       .then(([statJson]) => {
         if (statJson.IsDir) {
           return RSVP.hash({
             path: decodedPath,
-            task,
+            taskState,
             directoryEntries: allocation.ls(pathWithTaskName).catch(notifyError(this)),
             isFile: false,
           });
         } else {
           return {
             path: decodedPath,
-            task,
+            taskState,
             isFile: true,
             stat: statJson,
           };
@@ -38,8 +38,8 @@ export default Route.extend({
       .catch(notifyError(this));
   },
 
-  setupController(controller, { path, task, directoryEntries, isFile, stat } = {}) {
+  setupController(controller, { path, taskState, directoryEntries, isFile, stat } = {}) {
     this._super(...arguments);
-    controller.setProperties({ path, task, directoryEntries, isFile, stat });
+    controller.setProperties({ path, taskState, directoryEntries, isFile, stat });
   },
 });

ui/app/templates/allocations.hbs

@@ -1,3 +1,3 @@
-{{#page-layout}}
+<PageLayout>
   {{outlet}}
-{{/page-layout}}
+</PageLayout>

ui/app/templates/allocations/allocation/fs.hbs

@@ -1,10 +1,10 @@
 {{title pathWithLeadingSlash " -  Allocation " allocation.shortId " filesystem"}}
-{{allocation-subnav allocation=allocation}}
-{{fs/browser
-  model=allocation
-  path=path
-  stat=stat
-  isFile=isFile
-  directoryEntries=directoryEntries
-  sortProperty=sortProperty
-  sortDescending=sortDescending}}
+<AllocationSubnav @allocation={{allocation}} />
+<Fs::Browser
+  @model={{allocation}}
+  @path={{path}}
+  @stat={{stat}}
+  @isFile={{isFile}}
+  @directoryEntries={{directoryEntries}}
+  @sortProperty={{sortProperty}}
+  @sortDescending={{sortDescending}} />