diff --git a/ui/app/components/job-page/parts/variables.js b/ui/app/components/job-page/parts/variables.js deleted file mode 100644 index 96135c87ef73..000000000000 --- a/ui/app/components/job-page/parts/variables.js +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Copyright (c) HashiCorp, Inc. - * SPDX-License-Identifier: MPL-2.0 - */ - -// @ts-check - -import Component from '@glimmer/component'; -// import { inject as service } from '@ember/service'; -import { alias } from '@ember/object/computed'; -import VariableModel from '../../../models/variable'; -import MutableArray from '@ember/array/mutable'; - -export default class Variables extends Component { - // @service system; - - @alias('args.job') job; - // constructor(a,b,c) { - // super(...arguments); - // console.log('Variables constructor', this.args.job, this.args.job.pathLinkedVariable, this.args.job.get('pathLinkedVariable')); - // } - - // #region Variables - get hasJobLevelVariables() { - return !!this.job.pathLinkedVariable; - } - - get hasGroupLevelVariables() { - return this.job.taskGroups.any((tg) => tg.pathLinkedVariable); - } - - get hasTaskLevelVariables() { - return this.job.taskGroups.any((tg) => - tg.tasks.any((task) => task.pathLinkedVariable) - ); - } - - /** - * @returns {import("../../../utils/path-tree").VariableFolder} - */ - get jobRelevantVariables() { - /** - * @type {MutableArray} - */ - let flatVariables = [ - this.job.pathLinkedVariable, - ...this.job.taskGroups.mapBy('pathLinkedVariable'), - ...this.job.taskGroups - .map((tg) => tg.tasks.mapBy('pathLinkedVariable')) - .flat(), - ].compact(); - - console.log('flatvars, then', flatVariables); - - /** - * @type {import("../../../utils/path-tree").VariableFile[]} - */ - let variableFiles = flatVariables.map((v) => { - console.log('vee', v); - return { - name: v.path, // TODO: check if this is right or if we just want the last post-/ segment - path: v.path, - absoluteFilePath: v.path, - variable: v, - }; - }); - - return { - files: variableFiles, - children: {}, - absolutePath: '', - }; - } - // #endregion Variables -} diff --git a/ui/app/models/job.js b/ui/app/models/job.js index 9ed2aa531d12..18c8f8541429 100644 --- a/ui/app/models/job.js +++ b/ui/app/models/job.js @@ -363,7 +363,6 @@ export default class Job extends Model { `nomad/jobs/${JSON.parse(this.parent.get('id'))[0]}` ); } else { - console.log('before I go hunting', this.variables); return this.variables?.findBy('path', `nomad/jobs/${this.plainId}`); } } diff --git a/ui/app/templates/components/job-page/parts/variables.hbs b/ui/app/templates/components/job-page/parts/variables.hbs index bea594cfbe11..dc815cd974fc 100644 --- a/ui/app/templates/components/job-page/parts/variables.hbs +++ b/ui/app/templates/components/job-page/parts/variables.hbs @@ -7,7 +7,6 @@ Has job level variables: {{this.hasJobLevelVariables}}
Has group level variables: {{this.hasGroupLevelVariables}}
Has task level variables: {{this.hasTaskLevelVariables}}
-{{log "ALL VARS" this.jobRelevantVariables}}