From dec6a68ca4d13ec5e2ab98ea9e04bf4b3749a88d Mon Sep 17 00:00:00 2001
From: Jai Bhagat <jaybhagat841@gmail.com>
Date: Mon, 3 Jan 2022 09:57:39 -0500
Subject: [PATCH] refact:  remove unused backing component classes and extend
 periodic and param-child to use Glimmer

---
 ui/app/components/job-page/abstract.js        | 32 -----------------
 ui/app/components/job-page/batch.js           |  5 ---
 .../job-page/parameterized-child.js           | 15 ++------
 ui/app/components/job-page/parameterized.js   |  5 ---
 ui/app/components/job-page/periodic-child.js  | 34 -------------------
 ui/app/components/job-page/periodic.js        | 26 +++-----------
 ui/app/components/job-page/service.js         |  5 ---
 ui/app/components/job-page/sysbatch.js        | 15 --------
 ui/app/components/job-page/system.js          | 15 --------
 9 files changed, 7 insertions(+), 145 deletions(-)
 delete mode 100644 ui/app/components/job-page/abstract.js
 delete mode 100644 ui/app/components/job-page/batch.js
 delete mode 100644 ui/app/components/job-page/parameterized.js
 delete mode 100644 ui/app/components/job-page/periodic-child.js
 delete mode 100644 ui/app/components/job-page/service.js
 delete mode 100644 ui/app/components/job-page/sysbatch.js
 delete mode 100644 ui/app/components/job-page/system.js

diff --git a/ui/app/components/job-page/abstract.js b/ui/app/components/job-page/abstract.js
deleted file mode 100644
index 29beaa6aa..000000000
--- a/ui/app/components/job-page/abstract.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Component from '@ember/component';
-import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import classic from 'ember-classic-decorator';
-
-@classic
-export default class Abstract extends Component {
-  @service system;
-
-  job = null;
-
-  // Provide a value that is bound to a query param
-  sortProperty = null;
-  sortDescending = null;
-
-  // Provide actions that require routing
-  gotoTaskGroup() {}
-  gotoJob() {}
-
-  // Set to a { title, description } to surface an error
-  errorMessage = null;
-
-  @action
-  clearErrorMessage() {
-    this.set('errorMessage', null);
-  }
-
-  @action
-  handleError(errorObject) {
-    this.set('errorMessage', errorObject);
-  }
-}
diff --git a/ui/app/components/job-page/batch.js b/ui/app/components/job-page/batch.js
deleted file mode 100644
index 3aa31786c..000000000
--- a/ui/app/components/job-page/batch.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import AbstractJobPage from './abstract';
-import classic from 'ember-classic-decorator';
-
-@classic
-export default class Batch extends AbstractJobPage {}
diff --git a/ui/app/components/job-page/parameterized-child.js b/ui/app/components/job-page/parameterized-child.js
index daf0e4183..70eb063bc 100644
--- a/ui/app/components/job-page/parameterized-child.js
+++ b/ui/app/components/job-page/parameterized-child.js
@@ -1,14 +1,9 @@
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
-import { inject as service } from '@ember/service';
-import PeriodicChildJobPage from './periodic-child';
-import classic from 'ember-classic-decorator';
-import jobClientStatus from 'nomad-ui/utils/properties/job-client-status';
+import Component from '@glimmer/component';
 
-@classic
-export default class ParameterizedChild extends PeriodicChildJobPage {
+export default class ParameterizedChild extends Component {
   @alias('job.decodedPayload') payload;
-  @service store;
 
   @computed('payload')
   get payloadJSON() {
@@ -20,10 +15,4 @@ export default class ParameterizedChild extends PeriodicChildJobPage {
     }
     return json;
   }
-
-  @jobClientStatus('nodes', 'job') jobClientStatus;
-
-  get nodes() {
-    return this.store.peekAll('node');
-  }
 }
diff --git a/ui/app/components/job-page/parameterized.js b/ui/app/components/job-page/parameterized.js
deleted file mode 100644
index cf69268ae..000000000
--- a/ui/app/components/job-page/parameterized.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import AbstractJobPage from './abstract';
-import classic from 'ember-classic-decorator';
-
-@classic
-export default class Parameterized extends AbstractJobPage {}
diff --git a/ui/app/components/job-page/periodic-child.js b/ui/app/components/job-page/periodic-child.js
deleted file mode 100644
index d581d88dc..000000000
--- a/ui/app/components/job-page/periodic-child.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import AbstractJobPage from './abstract';
-import { computed } from '@ember/object';
-import { inject as service } from '@ember/service';
-import classic from 'ember-classic-decorator';
-import jobClientStatus from 'nomad-ui/utils/properties/job-client-status';
-
-@classic
-export default class PeriodicChild extends AbstractJobPage {
-  @service store;
-
-  @computed('job.{name,id}', 'job.parent.{name,id}')
-  get breadcrumbs() {
-    const job = this.job;
-    const parent = this.get('job.parent');
-
-    return [
-      { label: 'Jobs', args: ['jobs'] },
-      {
-        label: parent.get('name'),
-        args: ['jobs.job', parent],
-      },
-      {
-        label: job.get('trimmedName'),
-        args: ['jobs.job', job],
-      },
-    ];
-  }
-
-  @jobClientStatus('nodes', 'job') jobClientStatus;
-
-  get nodes() {
-    return this.store.peekAll('node');
-  }
-}
diff --git a/ui/app/components/job-page/periodic.js b/ui/app/components/job-page/periodic.js
index 8a3783bb7..d744836f1 100644
--- a/ui/app/components/job-page/periodic.js
+++ b/ui/app/components/job-page/periodic.js
@@ -1,27 +1,11 @@
-import AbstractJobPage from './abstract';
-import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import classic from 'ember-classic-decorator';
-import messageForError from 'nomad-ui/utils/message-from-adapter-error';
-
-@classic
-export default class Periodic extends AbstractJobPage {
-  @service store;
-
-  errorMessage = null;
+import Component from '@glimmer/component';
 
+export default class Periodic extends Component {
   @action
-  forceLaunch() {
-    this.job.forcePeriodic().catch((err) => {
-      this.set('errorMessage', {
-        title: 'Could Not Force Launch',
-        description: messageForError(err, 'submit jobs'),
-      });
+  forceLaunch(setError) {
+    this.args.job.forcePeriodic().catch((err) => {
+      setError(err);
     });
   }
-
-  @action
-  clearErrorMessage() {
-    this.set('errorMessage', null);
-  }
 }
diff --git a/ui/app/components/job-page/service.js b/ui/app/components/job-page/service.js
deleted file mode 100644
index 0cb58e90c..000000000
--- a/ui/app/components/job-page/service.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import AbstractJobPage from './abstract';
-import classic from 'ember-classic-decorator';
-
-@classic
-export default class Service extends AbstractJobPage {}
diff --git a/ui/app/components/job-page/sysbatch.js b/ui/app/components/job-page/sysbatch.js
deleted file mode 100644
index 0819ed494..000000000
--- a/ui/app/components/job-page/sysbatch.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import AbstractJobPage from './abstract';
-import classic from 'ember-classic-decorator';
-import { inject as service } from '@ember/service';
-import jobClientStatus from 'nomad-ui/utils/properties/job-client-status';
-
-@classic
-export default class Sysbatch extends AbstractJobPage {
-  @service store;
-
-  @jobClientStatus('nodes', 'job') jobClientStatus;
-
-  get nodes() {
-    return this.store.peekAll('node');
-  }
-}
diff --git a/ui/app/components/job-page/system.js b/ui/app/components/job-page/system.js
deleted file mode 100644
index 5909c8f16..000000000
--- a/ui/app/components/job-page/system.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import AbstractJobPage from './abstract';
-import classic from 'ember-classic-decorator';
-import { inject as service } from '@ember/service';
-import jobClientStatus from 'nomad-ui/utils/properties/job-client-status';
-
-@classic
-export default class System extends AbstractJobPage {
-  @service store;
-
-  @jobClientStatus('nodes', 'job') jobClientStatus;
-
-  get nodes() {
-    return this.store.peekAll('node');
-  }
-}