polish: Fix some inconsistencies in object names and messages #10856

abh1sar · 2025-05-13T11:25:54Z

Description

This PR fixes some inconsistencies in object names and messages.
doc pr : apache/cloudstack-documentation#506

ACL Lists

Replace ACL Lists with ACLs as Access Control List Lists doesn't make sense
Replace Add ACL with Add ACL rule wherever a rule is being added

Before:

After:

Before:

After:

User data

Following industry conventions, User data should be written as two words
The term "User Data" used in the main menu creates some confusion, whether it is singular or plural. So renamed it to "User Data Library" where users can register new User Data.
User data should not be followed by "a"

Before:

After:

Before:

After:

Use Title Case in main menu and create new * buttons

List of all changes done:
TitleCase.txt

Before:

After:

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
build/CI
test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

…blic/locales

…ue and AclRulesTab.vue

…ister user data form.

codecov · 2025-05-13T11:34:07Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 16.15%. Comparing base (8f2735a) to head (f1b573b).
Report is 3 commits behind head on 4.20.

Additional details and impacted files

@@             Coverage Diff              @@
##               4.20   #10856      +/-   ##
============================================
- Coverage     16.15%   16.15%   -0.01%     
- Complexity    13273    13277       +4     
============================================
  Files          5657     5657              
  Lines        497898   497939      +41     
  Branches      60374    60386      +12     
============================================
+ Hits          80435    80441       +6     
- Misses       408505   408532      +27     
- Partials       8958     8966       +8

Flag	Coverage Δ
uitests	`4.00% <ø> (-0.01%)`	⬇️
unittests	`17.00% <ø> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

sureshanaparti · 2025-05-23T15:56:13Z

ui/public/locales/en.json

-"label.add.intermediate.certificate": "Add intermediate certificate",
+"label.add.host": "Add Host",
+"label.add.ingress.rule": "Add Ingress rule",
+"label.add.intermediate.certifrcate": "Add intermediate certificate",


Suggested change

"label.add.intermediate.certifrcate": "Add intermediate certificate",

"label.add.intermediate.certificate": "Add intermediate certificate",

sureshanaparti · 2025-05-23T15:58:40Z

ui/public/locales/en.json

+"label.userdataname": "User data name",
+"label.userdatadetails": "User data details",
+"label.userdataparams": "User data parameters",
+"label.userdatapolicy": "User data link policy",


update label keys as well -label.user.data.id|name|details|...

abh1sar · 2025-06-05T10:01:32Z

@blueorangutan ui

blueorangutan · 2025-06-05T10:02:03Z

@abh1sar a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2025-06-05T10:19:57Z

UI build: ✔️
Live QA URL: https://qa.cloudstack.cloud/simulator/pr/10856 (QA-JID-639)

sureshanaparti · 2025-06-09T12:02:00Z

api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java

-                    "Using HTTP POST (via POST body), you can send up to 1MB of data after base64 encoding. " +
-                    "You also need to change vm.userdata.max.length value",
+                    "Using HTTP POST (via POST body), you can send up to 32KB of data after base64 encoding, " +
+                    "which can be increased upto 1MB using the vm.userdata.max.length setting",


should we change setting 'vm.userdata.max.length' => 'vm.user.data.max.length' as well?

I think we should avoid changing the name of any setting in case anyone is already using it.

sureshanaparti · 2025-06-09T12:03:47Z

ui/public/locales/ar.json

@@ -924,7 +924,7 @@
 "label.remove.vpc.offering": "Remove VPC offering",
 "label.removing": "Removing",
 "label.replace.acl": "Replace ACL",
-"label.replace.acl.list": "Replace ACL List",
+"label.replace.acl.list": "Replace ACL",


Suggested change

"label.replace.acl.list": "Replace ACL",

"label.replace.acl": "Replace ACL",

update other locale jsons wherever applicable

replaced label.replace.acl.list with label.replace.acl at all usages and removed the label.

ui/public/locales/ca.json

sureshanaparti · 2025-06-09T12:10:01Z

ui/public/locales/en.json

-"label.affinity.groups": "Affinity groups",
-"label.affinitygroup": "Affinity group",
+"label.affinity.groups": "Affinity Groups",
+"label.affinitygroup": "Affinity Group",


Suggested change

"label.affinitygroup": "Affinity Group",

"label.affinity.group": "Affinity Group",

sureshanaparti · 2025-06-09T12:10:30Z

ui/public/locales/en.json

 "label.backup.repository": "Backup Repository",
 "label.backup.restore": "Restore Instance backup",
-"label.backupofferingid": "Backup offering",
-"label.backupofferingname": "Backup offering",
+"label.backupofferingid": "Backup Offering",


Suggested change

"label.backupofferingid": "Backup Offering",

"label.backup.offering.id": "Backup Offering",

sureshanaparti · 2025-06-09T12:14:40Z

ui/public/locales/en.json

@@ -996,7 +995,7 @@
 "label.firewall": "Firewall",
 "label.firewall.policy": "Firewall Policy",
 "label.firewallpolicy": "Firewall Policy",
-"label.firewallrule": "Firewall rule",
+"label.firewallrule": "Firewall Rule",
 "label.firewallruleuuid": "Firewall Rule",


Suggested change

"label.firewallruleuuid": "Firewall Rule",

"label.firewall.rule.uuid": "Firewall Rule",

sureshanaparti · 2025-06-09T12:15:10Z

ui/public/locales/en.json

-"label.networkofferingdisplaytext": "Network offering",
-"label.networkofferingid": "Network offering",
-"label.networkofferingname": "Network offering",
+"label.networkofferingdisplaytext": "Network Offering",


Suggested change

"label.networkofferingdisplaytext": "Network Offering",

"label.network.offering,displaytext": "Network Offering",

sureshanaparti · 2025-06-09T12:15:30Z

ui/public/locales/en.json

@@ -1524,9 +1523,9 @@
 "label.networklimit": "Network limits",
 "label.networkmode": "Network Mode",
 "label.networkname": "Network name",


network.* ?

sureshanaparti · 2025-06-09T12:15:51Z

ui/public/locales/en.json

-"label.networkofferingname": "Network offering",
+"label.networkofferingdisplaytext": "Network Offering",
+"label.networkofferingid": "Network Offering",
+"label.networkofferingname": "Network Offering",


network.offering.*

sureshanaparti · 2025-06-09T12:16:35Z

ui/public/locales/en.json

@@ -1605,7 +1604,7 @@
 "label.of.month": "of month",
 "label.offerha": "Offer HA",
 "label.offeringid": "Offering ID",
-"label.offeringtype": "Compute offering type",
+"label.offeringtype": "Compute Offering type",


offering.id & offering.type ?

sureshanaparti · 2025-06-09T12:17:07Z

ui/public/locales/en.json

+"label.primary.storage.allocated": "Primary Storage allocated",
+"label.primary.storage.used": "Primary Storage used",
+"label.primarystoragelimit": "Primary Storage limits (GiB)",
+"label.primarystoragetotal": "Primary Storage",


primary.storage.*

sureshanaparti · 2025-06-09T12:18:14Z

ui/public/locales/en.json

 "label.removed": "Removed",
 "label.removing": "Removing",
 "label.replace.acl": "Replace ACL",
-"label.replace.acl.list": "Replace ACL list",
+"label.replace.acl.list": "Replace ACL",


Suggested change

"label.replace.acl.list": "Replace ACL",

"label.replace.acl": "Replace ACL",

sureshanaparti · 2025-06-09T12:18:36Z

ui/public/locales/en.json

 "label.secondaryips": "Secondary IPs",
-"label.secondarystoragelimit": "Secondary storage limits (GiB)",
+"label.secondarystoragelimit": "Secondary Storage limits (GiB)",


secondary.storage.*

sureshanaparti · 2025-06-09T12:18:54Z

ui/public/locales/en.json

-"label.serviceofferingid": "Compute offering",
-"label.serviceofferingname": "Compute offering",
+"label.serviceofferingid": "Compute Offering",
+"label.serviceofferingname": "Compute Offering",


service.offering.*

sureshanaparti · 2025-06-09T12:19:17Z

ui/public/locales/en.json

 "label.storage.traffic": "Storage traffic",
-"label.storageid": "Primary storage",
+"label.storageid": "Primary Storage",


Suggested change

"label.storageid": "Primary Storage",

"label.storage.id": "Primary Storage",

sureshanaparti · 2025-06-09T12:19:56Z

ui/public/locales/en.json

-"label.vpcoffering": "VPC offering",
-"label.vpcofferingid": "VPC offering",
+"label.vpcoffering": "VPC Offering",
+"label.vpcofferingid": "VPC Offering",


Suggested change

"label.vpcofferingid": "VPC Offering",

"label.vpc.offering.id": "VPC Offering",

sureshanaparti · 2025-06-09T12:20:08Z

ui/public/locales/en.json

 "label.vpc.virtual.router": "VPC virtual router",
 "label.vpc.restart.required": "VPC restart required",
 "label.vpcid": "VPC",
 "label.vpclimit": "VPC limits",
 "label.vpcname": "VPC",
-"label.vpcoffering": "VPC offering",
-"label.vpcofferingid": "VPC offering",
+"label.vpcoffering": "VPC Offering",


Suggested change

"label.vpcoffering": "VPC Offering",

"label.vpc.offering": "VPC Offering",

github-actions · 2025-06-10T10:41:49Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

abh1sar · 2025-06-18T10:33:32Z

@sureshanaparti to keep the scope of this PR manageable, I'll create a new PR later to handle all suggested label changes.

abh1sar · 2025-06-18T13:56:42Z

@blueorangutan ui

sureshanaparti · 2025-06-24T11:45:37Z

@blueorangutan ui

blueorangutan · 2025-06-24T11:46:04Z

@sureshanaparti a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2025-06-24T12:04:01Z

UI build: ✔️
Live QA URL: https://qa.cloudstack.cloud/simulator/pr/10856 (QA-JID-653)

sureshanaparti · 2025-06-24T12:33:13Z

@blueorangutan package

blueorangutan · 2025-06-24T12:34:03Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

ui/src/views/offering/AddNetworkOffering.vue

blueorangutan · 2025-06-24T13:59:04Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 13899

Co-authored-by: Suresh Kumar Anaparti <[email protected]>

sureshanaparti

changes lgtm

abh1sar added 10 commits April 30, 2025 15:50

Replace ACL list with ACL and related changes to the json files in pu…

4334097

…blic/locales

Replace ACL list with ACL and related changes to network.js, VpcTab.v…

afab814

…ue and AclRulesTab.vue

Replace Export ACLs with Export ACL rules

41eee1f

standardize the term user data everywhere. fix the placeholder in reg…

0519d76

…ister user data form.

Convert resource names in main menu and action buttons to Title case

6c987c8

Use special icon for sharedfs instance and prefix for sharedfs volumes

8252d53

Give custom icon precedence over shared fs icon

64462e8

Merge remote-tracking branch 'upstream/4.20' into ui-polish

d980cd0

Fixed some issues with public/locale files

ff30b6f

Revert sharedfsvm changes

a75802a

boring-cyborg bot added component:api component:UI labels May 13, 2025

Added label.add.acl.name to en.json which was incorrectly removed

c55630f

DaanHoogland changed the title ~~Polish: Fix some inconsistencies in object names and messages~~ polish: Fix some inconsistencies in object names and messages May 13, 2025

abh1sar mentioned this pull request May 19, 2025

polish: Fix some inconsistencies in object names and messages apache/cloudstack-documentation#506

Draft

abh1sar requested a review from sureshanaparti May 20, 2025 15:01

sureshanaparti reviewed May 23, 2025

View reviewed changes

replace all *userdata* labels to *user.data* in public json files.

285b64c

abh1sar requested a review from sureshanaparti June 5, 2025 08:52

sureshanaparti added this to the 4.20.2 milestone Jun 5, 2025

sureshanaparti reviewed Jun 9, 2025

View reviewed changes

ui/public/locales/ca.json Outdated Show resolved Hide resolved

sureshanaparti reviewed Jun 9, 2025

View reviewed changes

sureshanaparti mentioned this pull request Jun 10, 2025

CKS Enhancements #9102

Merged

22 tasks

github-actions bot added the status:has-conflicts label Jun 10, 2025

abh1sar added 2 commits June 18, 2025 13:18

remove redundant labels label.user.data.l2 and label.replace.acl.list

d1b22df

Merge remote-tracking branch 'upstream/4.20' into ui-polish

05ed3e0

github-actions bot removed the status:has-conflicts label Jun 18, 2025

abh1sar requested a review from sureshanaparti June 18, 2025 13:56

sureshanaparti reviewed Jun 24, 2025

View reviewed changes

ui/src/views/offering/AddNetworkOffering.vue Outdated Show resolved Hide resolved

Update ui/src/views/offering/AddNetworkOffering.vue

f1b573b

Co-authored-by: Suresh Kumar Anaparti <[email protected]>

sureshanaparti approved these changes Jun 25, 2025

View reviewed changes

	"label.add.intermediate.certifrcate": "Add intermediate certificate",
	"label.add.intermediate.certificate": "Add intermediate certificate",

	"label.replace.acl.list": "Replace ACL",
	"label.replace.acl": "Replace ACL",

	"label.affinitygroup": "Affinity Group",
	"label.affinity.group": "Affinity Group",

	"label.backupofferingid": "Backup Offering",
	"label.backup.offering.id": "Backup Offering",

	"label.firewallruleuuid": "Firewall Rule",
	"label.firewall.rule.uuid": "Firewall Rule",

	"label.networkofferingdisplaytext": "Network Offering",
	"label.network.offering,displaytext": "Network Offering",

	"label.storageid": "Primary Storage",
	"label.storage.id": "Primary Storage",

	"label.vpcofferingid": "VPC Offering",
	"label.vpc.offering.id": "VPC Offering",

	"label.vpcoffering": "VPC Offering",
	"label.vpc.offering": "VPC Offering",

polish: Fix some inconsistencies in object names and messages #10856

Are you sure you want to change the base?

polish: Fix some inconsistencies in object names and messages #10856

Uh oh!

Conversation

abh1sar commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

ACL Lists

User data

Use Title Case in main menu and create new * buttons

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

codecov bot commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sureshanaparti May 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abh1sar commented Jun 5, 2025

Uh oh!

blueorangutan commented Jun 5, 2025

Uh oh!

blueorangutan commented Jun 5, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Jun 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abh1sar Jun 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Jun 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abh1sar commented May 13, 2025 •

edited

Loading

codecov bot commented May 13, 2025 •

edited

Loading

sureshanaparti May 23, 2025 •

edited

Loading

sureshanaparti Jun 9, 2025 •

edited

Loading

abh1sar Jun 18, 2025 •

edited

Loading

sureshanaparti Jun 9, 2025 •

edited

Loading