From 4bb56cf41034c113aa6842849bf9ef814dec5025 Mon Sep 17 00:00:00 2001
From: Dragos <cojocaru.dragos@gmail.com>
Date: Mon, 7 Jun 2021 12:08:57 +0300
Subject: [PATCH] TRIX-32 fix afinity issue

---
 .../affinity-rule-editor/affinity-rule-editor.component.ts  | 6 +++---
 .../machines/machine-wizard/machine-wizard.component.html   | 2 +-
 app/src/assets/i18n/machines/en.json                        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.ts b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.ts
index da57a0f..d41fb6d 100644
--- a/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.ts
+++ b/app/src/app/components/affinity-rule-editor/affinity-rule-editor.component.ts
@@ -70,15 +70,15 @@ export class AffinityRuleEditorComponent implements OnInit, OnDestroy
 
     let rule: string;
 
-    if (this.editorForm.get('target').value === 'machine')
-      rule = `machine${this.editorForm.get('operator').value}${this.editorForm.get('strict').value}${this.editorForm.get('value').value}`;
+    if (this.editorForm.get('target').value === 'instance')
+      rule = `instance${this.editorForm.get('operator').value}${this.editorForm.get('strict').value}${this.editorForm.get('value').value}`;
     else
       rule = `${this.editorForm.get('tagName').value}${this.editorForm.get('operator').value}${this.editorForm.get('strict').value}${this.editorForm.get('value').value}`;
 
     this.saved.emit({
       strict: this.editorForm.get('strict').value === '=',
       closeTo: this.editorForm.get('operator').value === '=',
-      targetMachine: this.editorForm.get('target').value === 'machine',
+      targetMachine: this.editorForm.get('target').value === 'instance',
       tagName: this.editorForm.get('tagName').value,
       value: this.editorForm.get('value').value,
       rule
diff --git a/app/src/app/machines/machine-wizard/machine-wizard.component.html b/app/src/app/machines/machine-wizard/machine-wizard.component.html
index b3b36da..d69438e 100644
--- a/app/src/app/machines/machine-wizard/machine-wizard.component.html
+++ b/app/src/app/machines/machine-wizard/machine-wizard.component.html
@@ -238,7 +238,7 @@
 
               <div class="row mb-3 gx-3">
                 <div class="col-sm-6">
-                  <h5 class="text-truncate"><b>Tags</b> make it easier to lookup an machine</h5>
+                  <h5 class="text-truncate"><b>Tags</b> make it easier to lookup a machine</h5>
                   <div class="row">
                     <div class="col-sm">
                       <div class="select-list list-group select-list p-0 mb-2 py-2" tabindex="0">
diff --git a/app/src/assets/i18n/machines/en.json b/app/src/assets/i18n/machines/en.json
index 1dd599a..ca0f388 100644
--- a/app/src/assets/i18n/machines/en.json
+++ b/app/src/assets/i18n/machines/en.json
@@ -209,7 +209,7 @@
       "volumeReadOnly": "Read only",
       "volumesDisabled": "Volumes are disabled for KVM packages",
       "noVolumes": "You don't have any volumes defined",
-      "tagsHint": "<b>Tags</b> make it easier to lookup an machine",
+      "tagsHint": "<b>Tags</b> make it easier to lookup a machine",
       "addTag": "Add a new tag",
       "removeTag": "Remove this tag",
       "metadataHint": "<b>Metadata</b> makes it easier to find a machine",