Skip to content

Commit 7380f46

Browse files
shalemanshaleman
committed
standardize field title
1 parent 69ff0b9 commit 7380f46

8 files changed

+44
-44
lines changed

‎app.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"properties": {
99
"appName": {
1010
"type": "string",
11-
"description": "Application Name"
11+
"title": "Application Name"
1212
},
1313
"tenantName": {
1414
"type": "string",
15-
"description": "Tenant Name"
15+
"title": "Tenant Name"
1616
}
1717
},
1818
"link-sets": {

‎client/contivModel.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ var AppModalView = React.createClass({
4444
<div className='modal-body' style={ {margin: '5%',} }>
4545

4646

47-
<Input type='text' label='' ref='appName' defaultValue={obj.appName} placeholder='' />
47+
<Input type='text' label='Application Name' ref='appName' defaultValue={obj.appName} placeholder='Application Name' />
4848

49-
<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
49+
<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
5050

5151
</div>
5252
<div className='modal-footer'>
@@ -488,7 +488,7 @@ var ServiceModalView = React.createClass({
488488
<div className='modal-body' style={ {margin: '5%',} }>
489489

490490

491-
<Input type='text' label='' ref='appName' defaultValue={obj.appName} placeholder='' />
491+
<Input type='text' label='Application Name' ref='appName' defaultValue={obj.appName} placeholder='Application Name' />
492492

493493
<Input type='text' label='' ref='command' defaultValue={obj.command} placeholder='' />
494494

@@ -506,9 +506,9 @@ var ServiceModalView = React.createClass({
506506

507507
<Input type='text' label='' ref='scale' defaultValue={obj.scale} placeholder='' />
508508

509-
<Input type='text' label='' ref='serviceName' defaultValue={obj.serviceName} placeholder='' />
509+
<Input type='text' label='Service Name' ref='serviceName' defaultValue={obj.serviceName} placeholder='Service Name' />
510510

511-
<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
511+
<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
512512

513513
<Input type='text' label='' ref='volumeProfile' defaultValue={obj.volumeProfile} placeholder='' />
514514

@@ -567,11 +567,11 @@ var ServiceInstanceModalView = React.createClass({
567567

568568
<Input type='text' label='' ref='appName' defaultValue={obj.appName} placeholder='' />
569569

570-
<Input type='text' label='' ref='instanceId' defaultValue={obj.instanceId} placeholder='' />
570+
<Input type='text' label='Service instance id' ref='instanceId' defaultValue={obj.instanceId} placeholder='Service instance id' />
571571

572572
<Input type='text' label='' ref='serviceName' defaultValue={obj.serviceName} placeholder='' />
573573

574-
<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
574+
<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
575575

576576
<Input type='text' label='' ref='volumes' defaultValue={obj.volumes} placeholder='' />
577577

@@ -693,9 +693,9 @@ var VolumeModalView = React.createClass({
693693

694694
<Input type='text' label='' ref='size' defaultValue={obj.size} placeholder='' />
695695

696-
<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
696+
<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
697697

698-
<Input type='text' label='' ref='volumeName' defaultValue={obj.volumeName} placeholder='' />
698+
<Input type='text' label='Volume Name' ref='volumeName' defaultValue={obj.volumeName} placeholder='Volume Name' />
699699

700700
</div>
701701
<div className='modal-footer'>
@@ -758,9 +758,9 @@ var VolumeProfileModalView = React.createClass({
758758

759759
<Input type='text' label='' ref='size' defaultValue={obj.size} placeholder='' />
760760

761-
<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
761+
<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
762762

763-
<Input type='text' label='' ref='volumeProfileName' defaultValue={obj.volumeProfileName} placeholder='' />
763+
<Input type='text' label='Volume profile Name' ref='volumeProfileName' defaultValue={obj.volumeProfileName} placeholder='Volume profile Name' />
764764

765765
</div>
766766
<div className='modal-footer'>

‎client/contivModelClient.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ type App struct {
122122
// every object has a key
123123
Key string `json:"key,omitempty"`
124124

125-
AppName string `json:"appName,omitempty"` //
126-
TenantName string `json:"tenantName,omitempty"` //
125+
AppName string `json:"appName,omitempty"` // Application Name
126+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
127127

128128
// add link-sets and links
129129
LinkSets AppLinkSets `json:"link-sets,omitempty"`
@@ -248,7 +248,7 @@ type Service struct {
248248
// every object has a key
249249
Key string `json:"key,omitempty"`
250250

251-
AppName string `json:"appName,omitempty"` //
251+
AppName string `json:"appName,omitempty"` // Application Name
252252
Command string `json:"command,omitempty"` //
253253
Cpu string `json:"cpu,omitempty"` //
254254
EndpointGroups []string `json:"endpointGroups,omitempty"`
@@ -257,8 +257,8 @@ type Service struct {
257257
Memory string `json:"memory,omitempty"` //
258258
Networks []string `json:"networks,omitempty"`
259259
Scale int `json:"scale,omitempty"` //
260-
ServiceName string `json:"serviceName,omitempty"` //
261-
TenantName string `json:"tenantName,omitempty"` //
260+
ServiceName string `json:"serviceName,omitempty"` // Service Name
261+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
262262
VolumeProfile string `json:"volumeProfile,omitempty"` //
263263

264264
// add link-sets and links
@@ -282,9 +282,9 @@ type ServiceInstance struct {
282282
Key string `json:"key,omitempty"`
283283

284284
AppName string `json:"appName,omitempty"` //
285-
InstanceID string `json:"instanceId,omitempty"` //
285+
InstanceID string `json:"instanceId,omitempty"` // Service instance id
286286
ServiceName string `json:"serviceName,omitempty"` //
287-
TenantName string `json:"tenantName,omitempty"` //
287+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
288288
Volumes []string `json:"volumes,omitempty"`
289289

290290
// add link-sets and links
@@ -328,8 +328,8 @@ type Volume struct {
328328
MountPoint string `json:"mountPoint,omitempty"` //
329329
PoolName string `json:"poolName,omitempty"` //
330330
Size string `json:"size,omitempty"` //
331-
TenantName string `json:"tenantName,omitempty"` //
332-
VolumeName string `json:"volumeName,omitempty"` //
331+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
332+
VolumeName string `json:"volumeName,omitempty"` // Volume Name
333333

334334
// add link-sets and links
335335
LinkSets VolumeLinkSets `json:"link-sets,omitempty"`
@@ -352,8 +352,8 @@ type VolumeProfile struct {
352352
MountPoint string `json:"mountPoint,omitempty"` //
353353
PoolName string `json:"poolName,omitempty"` //
354354
Size string `json:"size,omitempty"` //
355-
TenantName string `json:"tenantName,omitempty"` //
356-
VolumeProfileName string `json:"volumeProfileName,omitempty"` //
355+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
356+
VolumeProfileName string `json:"volumeProfileName,omitempty"` // Volume profile Name
357357

358358
// add link-sets and links
359359
LinkSets VolumeProfileLinkSets `json:"link-sets,omitempty"`

‎contivModel.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ type App struct {
1919
// every object has a key
2020
Key string `json:"key,omitempty"`
2121

22-
AppName string `json:"appName,omitempty"` //
23-
TenantName string `json:"tenantName,omitempty"` //
22+
AppName string `json:"appName,omitempty"` // Application Name
23+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
2424

2525
// add link-sets and links
2626
LinkSets AppLinkSets `json:"link-sets,omitempty"`
@@ -145,7 +145,7 @@ type Service struct {
145145
// every object has a key
146146
Key string `json:"key,omitempty"`
147147

148-
AppName string `json:"appName,omitempty"` //
148+
AppName string `json:"appName,omitempty"` // Application Name
149149
Command string `json:"command,omitempty"` //
150150
Cpu string `json:"cpu,omitempty"` //
151151
EndpointGroups []string `json:"endpointGroups,omitempty"`
@@ -154,8 +154,8 @@ type Service struct {
154154
Memory string `json:"memory,omitempty"` //
155155
Networks []string `json:"networks,omitempty"`
156156
Scale int `json:"scale,omitempty"` //
157-
ServiceName string `json:"serviceName,omitempty"` //
158-
TenantName string `json:"tenantName,omitempty"` //
157+
ServiceName string `json:"serviceName,omitempty"` // Service Name
158+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
159159
VolumeProfile string `json:"volumeProfile,omitempty"` //
160160

161161
// add link-sets and links
@@ -179,9 +179,9 @@ type ServiceInstance struct {
179179
Key string `json:"key,omitempty"`
180180

181181
AppName string `json:"appName,omitempty"` //
182-
InstanceID string `json:"instanceId,omitempty"` //
182+
InstanceID string `json:"instanceId,omitempty"` // Service instance id
183183
ServiceName string `json:"serviceName,omitempty"` //
184-
TenantName string `json:"tenantName,omitempty"` //
184+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
185185
Volumes []string `json:"volumes,omitempty"`
186186

187187
// add link-sets and links
@@ -225,8 +225,8 @@ type Volume struct {
225225
MountPoint string `json:"mountPoint,omitempty"` //
226226
PoolName string `json:"poolName,omitempty"` //
227227
Size string `json:"size,omitempty"` //
228-
TenantName string `json:"tenantName,omitempty"` //
229-
VolumeName string `json:"volumeName,omitempty"` //
228+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
229+
VolumeName string `json:"volumeName,omitempty"` // Volume Name
230230

231231
// add link-sets and links
232232
LinkSets VolumeLinkSets `json:"link-sets,omitempty"`
@@ -249,8 +249,8 @@ type VolumeProfile struct {
249249
MountPoint string `json:"mountPoint,omitempty"` //
250250
PoolName string `json:"poolName,omitempty"` //
251251
Size string `json:"size,omitempty"` //
252-
TenantName string `json:"tenantName,omitempty"` //
253-
VolumeProfileName string `json:"volumeProfileName,omitempty"` //
252+
TenantName string `json:"tenantName,omitempty"` // Tenant Name
253+
VolumeProfileName string `json:"volumeProfileName,omitempty"` // Volume profile Name
254254

255255
// add link-sets and links
256256
LinkSets VolumeProfileLinkSets `json:"link-sets,omitempty"`

‎service.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
"properties": {
99
"serviceName": {
1010
"type": "string",
11-
"description": "Service Name"
11+
"title": "Service Name"
1212
},
1313
"appName": {
1414
"type": "string",
15-
"description": "Application Name"
15+
"title": "Application Name"
1616
},
1717
"tenantName": {
1818
"type": "string",
19-
"description": "Tenant Name"
19+
"title": "Tenant Name"
2020
},
2121
"imageName": {
2222
"type": "string"

‎serviceInstance.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"properties": {
99
"instanceId": {
1010
"type": "string",
11-
"description": "Service instance id"
11+
"title": "Service instance id"
1212
},
1313
"tenantName": {
1414
"type": "string",
15-
"description": "Tenant Name"
15+
"title": "Tenant Name"
1616
},
1717
"appName": {
1818
"type": "string"

‎volume.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"properties": {
99
"volumeName": {
1010
"type": "string",
11-
"description": "Volume Name"
11+
"title": "Volume Name"
1212
},
1313
"tenantName": {
1414
"type": "string",
15-
"description": "Tenant Name"
15+
"title": "Tenant Name"
1616
},
1717
"datastoreType": {
1818
"type": "string"

‎volumeProfile.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"properties": {
99
"volumeProfileName": {
1010
"type": "string",
11-
"description": "Volume profile Name"
11+
"title": "Volume profile Name"
1212
},
1313
"tenantName": {
1414
"type": "string",
15-
"description": "Tenant Name"
15+
"title": "Tenant Name"
1616
},
1717
"datastoreType": {
1818
"type": "string"

0 commit comments

Comments
 (0)