Rename NIC/Disk Name to just Name. kubevirt#103

rawagner · Jan 29, 2019 · 4df7a7f · 4df7a7f
1 parent ae972cb
commit 4df7a7f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/src/components/CreateNicRow/CreateNicRow.js b/src/components/CreateNicRow/CreateNicRow.js
@@ -6,7 +6,7 @@ import { CreateDeviceRow } from '../CreateDeviceRow';
 import { getName, getNetworks, getInterfaces } from '../../utils/selectors';
 import { validateDNS1123SubdomainValue } from '../../utils/validations';
 import { POD_NETWORK } from '../../constants';
-import { HEADER_NIC_NAME, HEADER_MAC, SELECT_NETWORK } from '../Wizard/CreateVmWizard/strings';
+import { HEADER_NAME, HEADER_MAC, SELECT_NETWORK } from '../Wizard/CreateVmWizard/strings';
 import { NETWORK_TYPE_POD, NETWORK_TYPE_MULTUS } from '../Wizard/CreateVmWizard/constants';
 import { Loading } from '../Loading';
 import { settingsValue } from '../../k8s/selectors';
@@ -85,7 +85,7 @@ const getNicColumns = (nic, networks, LoadingComponent) => {
       id: 'nic-name',
       validate: validateDNS1123SubdomainValue,
       required: true,
-      title: HEADER_NIC_NAME,
+      title: HEADER_NAME,
       disabled: nic.creating,
     },
     model: {

diff --git a/src/components/CreateNicRow/tests/__snapshots__/CreateNicRow.test.js.snap b/src/components/CreateNicRow/tests/__snapshots__/CreateNicRow.test.js.snap
@@ -27,7 +27,7 @@ exports[`<CreateNicRow /> renders correctly 1`] = `
         "disabled": undefined,
         "id": "nic-name",
         "required": true,
-        "title": "NIC Name",
+        "title": "Name",
         "validate": [Function],
       },
       "network": Object {

diff --git a/src/components/Wizard/CreateVmWizard/NetworksTab.js b/src/components/Wizard/CreateVmWizard/NetworksTab.js
@@ -21,7 +21,7 @@ import {
   ERROR_NETWORK_NOT_FOUND,
   PXE_NIC,
   HEADER_MAC,
-  HEADER_NIC_NAME,
+  HEADER_NAME,
   HEADER_NETWORK,
 } from './strings';
 
@@ -210,7 +210,7 @@ export class NetworksTab extends React.Component {
   getColumns = () => [
     {
       header: {
-        label: HEADER_NIC_NAME,
+        label: HEADER_NAME,
         props: {
           style: {
             width: '32%',

diff --git a/src/components/Wizard/CreateVmWizard/StorageTab.js b/src/components/Wizard/CreateVmWizard/StorageTab.js
@@ -28,7 +28,7 @@ import {
   ERROR_EMPTY_ENTITY,
   ERROR_POSITIVE_SIZE,
   ERROR_DISK_NOT_FOUND,
-  HEADER_DISK_NAME,
+  HEADER_NAME,
   HEADER_SIZE,
   HEADER_STORAGE_CLASS,
   REMOVE_DISK_BUTTON,
@@ -367,7 +367,7 @@ export class StorageTab extends React.Component {
   getColumns = () => [
     {
       header: {
-        label: HEADER_DISK_NAME,
+        label: HEADER_NAME,
         props: {
           style: {
             width: '50%',

diff --git a/src/components/Wizard/CreateVmWizard/strings.js b/src/components/Wizard/CreateVmWizard/strings.js
@@ -23,6 +23,8 @@ export const HELP_FLAVOR =
   'The combination of processing power and memory that will be provided to the virtual machine.';
 export const HELP_WORKLOAD = 'The category of work that this virtual machine will be used for.';
 
+export const HEADER_NAME = 'Name';
+
 // NetworksTab
 export const SELECT_NETWORK = '--- Select Network Definition ---';
 export const REMOVE_NIC_BUTTON = 'Remove NIC';
@@ -31,7 +33,6 @@ export const PXE_INFO = 'Pod network is not PXE bootable';
 export const SELECT_PXE_NIC = '--- Select PXE NIC ---';
 export const PXE_NIC = 'PXE NIC';
 export const PXE_NIC_NOT_FOUND_ERROR = 'A PXE-capable NIC could not be found';
-export const HEADER_NIC_NAME = 'NIC Name';
 export const HEADER_MAC = 'MAC Address';
 export const HEADER_NETWORK = 'Network Configuration';
 export const ERROR_NETWORK_NOT_FOUND = 'Network config not found';
@@ -44,7 +45,6 @@ export const ERROR_NO_STORAGE_CLASS_SELECTED = 'Storage Class not selected';
 export const ERROR_NO_STORAGE_SELECTED = 'No storage is selected';
 export const ERROR_STORAGE_NOT_VALID = 'Selected storage is not valid';
 export const ERROR_DISK_NOT_FOUND = 'Disk configuration not found';
-export const HEADER_DISK_NAME = 'Disk Name';
 export const HEADER_SIZE = 'Size (GB)';
 export const HEADER_STORAGE_CLASS = 'Storage Class';
 export const REMOVE_DISK_BUTTON = 'Remove Disk';

diff --git a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/NetworksTab.test.js.snap b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/NetworksTab.test.js.snap
@@ -18,7 +18,7 @@ exports[`<NetworksTab /> renders correctly 1`] = `
       Array [
         Object {
           "header": Object {
-            "label": "NIC Name",
+            "label": "Name",
             "props": Object {
               "style": Object {
                 "width": "32%",

diff --git a/src/components/Wizard/CreateVmWizard/tests/__snapshots__/StorageTab.test.js.snap b/src/components/Wizard/CreateVmWizard/tests/__snapshots__/StorageTab.test.js.snap
@@ -25,7 +25,7 @@ exports[`<StorageTab /> renders correctly 1`] = `
       Array [
         Object {
           "header": Object {
-            "label": "Disk Name",
+            "label": "Name",
             "props": Object {
               "style": Object {
                 "width": "50%",