-
Notifications
You must be signed in to change notification settings - Fork 803
React string cleanup #9407
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
React string cleanup #9407
Conversation
WalkthroughThis PR contains 19 user-facing text updates across multiple components. Changes include grammar corrections, capitalization adjustments, spelling fixes, and message rewording in error dialogs, validation alerts, UI labels, and notification messages. No control flow or functional logic is modified. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Notes:
Pre-merge checks and finishing touches❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✨ Finishing touches
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 0
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/dbms_schedules/static/js/dbms_schedule.ui.js (1)
70-87: Validation message is fine; consider guarding against null start timeThe updated message (“Start time must be less than end time.”) is fine and consistent with other messages.
However, ifstate.jsscendis set whilestate.jsscstartis stillnull,start_time = state.jsscstartfollowed bystart_time.split(' ')can raise at runtime. Consider short‑circuiting whenisEmptyString(state.jsscstart)is true, or validatingjsscstartbefore splitting to make this more robust.
🧹 Nitpick comments (10)
web/pgadmin/dashboard/__init__.py (2)
100-106: CPU stats refresh label looks good; optional micro‑tweakThe updated label is clear and consistent with nearby refresh‑rate labels. If you want to shave a word, you could consider “CPU usage per mode refresh rate” or “CPU usage by mode refresh rate,” but current wording is perfectly serviceable.
202-209: Tooltip help text is fine; consider trimming repetition (optional)The sentence is clear and correct. If you want slightly tighter wording, you could use:
“If set to True, a tooltip will appear when hovering over the graph lines, showing the data point details.”
Not required; current text is valid.web/pgadmin/static/js/Explain/index.jsx (1)
508-510: String cleanup is correct; optional micro-phrasing tweaksThe updated default
emptyMessageimproves capitalization and punctuation and is safe from a behavioral standpoint. If you want to polish further, you might consider:
- Dropping the redundancy in “Alternatively, you can also execute …” → e.g., “Alternatively, execute …”
- Potentially clarifying “Explain/Explain Analyze button” as “Explain or Explain Analyze buttons” if that matches how the UI labels are usually referenced.
Both are purely editorial; current text is acceptable as-is.
web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx (1)
355-357: Script header warning reads fine; consider splitting into two full sentencesThe updated warning is clear and accurate, and keeping it in the header is useful context for the generated script. As a tiny polish, you could avoid the mid‑sentence line break and trailing spaces by making it two complete sentences:
- scriptHeader += gettext('-- Due to circular dependencies, the order in which Schema Diff writes objects may not be optimal \n'); - scriptHeader += gettext('-- and manual changes to the script may be required to ensure changes are applied in the correct order.\n'); + scriptHeader += gettext('-- Due to circular dependencies, the order in which Schema Diff writes objects may not be optimal.\n'); + scriptHeader += gettext('-- Manual changes to the script may be required to ensure changes are applied in the correct order.\n');Not required, just a minor readability tweak.
web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx (1)
98-115: Import error title capitalization is consistent; optional UX tweakChanging the notifier title to “Import Error” aligns with other dialog titles and doesn’t affect behavior.
Note:onSavecallsonClose()unconditionally, so the wizard closes even if the import fails in the catch block. If you’d prefer users to correct issues and retry without reopening the dialog, consider movingonClose()into the success paths only.web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py (1)
192-196:_init_is never called; consider renaming or removing
CastViewdefines_init_instead of__init__, so this method is never used and the base constructor runs instead. If custom initialization is needed, rename to__init__; otherwise, consider removing_init_as dead code.web/pgadmin/tools/backup/static/js/backup.ui.js (1)
743-748: Objects help message is correct but could be a bit tighterThe current text is understandable; if you want it slightly crisper, consider something like:
- helpMessage: gettext('If Schema(s) is selected then it will take the backup of the selected schema(s) only.'), + helpMessage: gettext('If Schema(s) is selected, only the selected schema(s) will be backed up.'),web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js (1)
492-525: Host validation message fix is better, could be slightly simplifiedChanging to “Either Host name or Address must be specified.” fixes the previous grammatical issue.
If you want it to align more closely with the field label (“Host name/address”), consider:- errmsg = gettext('Either Host name or Address must be specified.'); + errmsg = gettext('Host name/address must be specified.');web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx (1)
85-111: Clipboard permission alerts are clear and consistentThe updated titles and messages for both clipboard write/read permissions are clear, consistently capitalized, and correctly punctuated. If you want to be extra pedantic stylistically, you could change “on the PSQL terminal” to “in the PSQL terminal,” but the current wording is perfectly understandable.
web/pgadmin/static/js/Dialogs/index.jsx (1)
90-96: Improved migration failure message; consider matching success textThe revised failure message is now grammatically correct (“cannot”, proper article placement, final period) and reads well.
For consistency with Line 92, you may optionally tweak the success case (Line 95) to:
- gettext(`Passwords previously saved are re-encrypted using encryption key stored in the ${res.data.data.keyring_name}.`)); + gettext(`Passwords previously saved have been re-encrypted using the encryption key stored in the ${res.data.data.keyring_name}.`));
📜 Review details
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (56)
web/pgadmin/authenticate/mfa/views.py(1 hunks)web/pgadmin/browser/register_browser_preferences.py(9 hunks)web/pgadmin/browser/register_editor_preferences.py(1 hunks)web/pgadmin/browser/server_groups/servers/__init__.py(1 hunks)web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py(1 hunks)web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/dbms_jobs/static/js/dbms_job.ui.js(1 hunks)web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/dbms_schedules/static/js/dbms_schedule.ui.js(1 hunks)web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py(1 hunks)web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py(1 hunks)web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py(1 hunks)web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js(2 hunks)web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js(4 hunks)web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.ui.js(1 hunks)web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js(1 hunks)web/pgadmin/browser/server_groups/servers/roles/__init__.py(1 hunks)web/pgadmin/browser/server_groups/servers/roles/static/js/role.ui.js(1 hunks)web/pgadmin/browser/server_groups/servers/roles/static/js/roleReassign.js(4 hunks)web/pgadmin/browser/static/js/withCheckPermission.js(1 hunks)web/pgadmin/browser/templates/browser/js/messages.js(1 hunks)web/pgadmin/dashboard/__init__.py(2 hunks)web/pgadmin/dashboard/static/js/Dashboard.jsx(1 hunks)web/pgadmin/misc/bgprocess/processes.py(2 hunks)web/pgadmin/misc/cloud/static/js/CloudWizard.jsx(1 hunks)web/pgadmin/misc/cloud/static/js/aws_schema.ui.js(1 hunks)web/pgadmin/misc/cloud/static/js/azure.js(1 hunks)web/pgadmin/misc/cloud/static/js/azure_schema.ui.js(1 hunks)web/pgadmin/misc/cloud/static/js/google.js(1 hunks)web/pgadmin/misc/cloud/static/js/google_schema.ui.js(1 hunks)web/pgadmin/misc/workspaces/static/js/WorkspaceWelcomePage.jsx(1 hunks)web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx(1 hunks)web/pgadmin/preferences/static/js/components/RightPreference.jsx(1 hunks)web/pgadmin/static/js/Dialogs/index.jsx(1 hunks)web/pgadmin/static/js/Explain/index.jsx(1 hunks)web/pgadmin/static/js/SchemaView/utils/createFieldControls.jsx(2 hunks)web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx(1 hunks)web/pgadmin/tools/backup/static/js/backup.ui.js(2 hunks)web/pgadmin/tools/backup/static/js/backupGlobal.ui.js(1 hunks)web/pgadmin/tools/debugger/__init__.py(1 hunks)web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx(1 hunks)web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx(1 hunks)web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx(1 hunks)web/pgadmin/tools/erd/static/js/erd_tool/dialogs/OneToOneDialog.js(1 hunks)web/pgadmin/tools/import_export/__init__.py(2 hunks)web/pgadmin/tools/import_export/static/js/import_export.ui.js(4 hunks)web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx(1 hunks)web/pgadmin/tools/maintenance/__init__.py(1 hunks)web/pgadmin/tools/maintenance/static/js/maintenance.ui.js(1 hunks)web/pgadmin/tools/psql/static/js/PsqlModule.js(1 hunks)web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx(2 hunks)web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx(2 hunks)web/pgadmin/tools/sqleditor/static/js/show_view_data.js(1 hunks)web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py(12 hunks)web/pgadmin/tools/user_management/__init__.py(2 hunks)web/pgadmin/tools/user_management/static/js/RoleDialog.jsx(1 hunks)web/pgadmin/tools/user_management/static/js/UserDialog.jsx(1 hunks)web/pgadmin/utils/__init__.py(1 hunks)
🧰 Additional context used
🧬 Code graph analysis (42)
web/pgadmin/misc/cloud/static/js/aws_schema.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx (2)
web/pgadmin/static/js/SecurityPages/BasePage.jsx (1)
BasePage(61-93)web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/preferences/static/js/components/RightPreference.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/user_management/static/js/UserDialog.jsx (5)
web/pgadmin/dashboard/static/js/Dashboard.jsx (1)
pgAdmin(311-311)web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx (1)
pgAdmin(119-119)web/pgadmin/tools/user_management/static/js/RoleDialog.jsx (1)
pgAdmin(40-40)web/pgadmin/tools/user_management/static/js/Users.jsx (1)
pgAdmin(88-88)web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/sqleditor/static/js/show_view_data.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/static/js/Explain/index.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/psql/static/js/PsqlModule.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/dbms_schedules/static/js/dbms_schedule.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/misc/cloud/static/js/CloudWizard.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/misc/cloud/static/js/google.js (3)
web/pgadmin/misc/cloud/static/js/azure.js (1)
_eventBus(26-26)web/pgadmin/static/js/components/FormComponents.jsx (2)
MESSAGE_TYPE(82-88)MESSAGE_TYPE(82-88)web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/templates/browser/js/messages.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/dashboard/static/js/Dashboard.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/static/js/Dialogs/index.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/maintenance/__init__.py (1)
web/pgadmin/static/js/api_instance.js (1)
errormsg(35-35)
web/pgadmin/browser/server_groups/servers/roles/__init__.py (1)
web/pgadmin/utils/ajax.py (1)
gone(153-159)
web/pgadmin/browser/server_groups/servers/roles/static/js/role.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/backup/static/js/backupGlobal.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/misc/cloud/static/js/azure_schema.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py (1)
web/pgadmin/utils/ajax.py (1)
gone(153-159)
web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/dbms_jobs/static/js/dbms_job.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/user_management/static/js/RoleDialog.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py (1)
web/pgadmin/utils/ajax.py (1)
gone(153-159)
web/pgadmin/tools/debugger/__init__.py (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/static/js/withCheckPermission.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/maintenance/static/js/maintenance.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/server_groups/servers/roles/static/js/roleReassign.js (3)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)web/pgadmin/browser/static/js/node.js (1)
errmsg(606-606)web/pgadmin/static/js/validators.js (1)
isEmptyString(57-59)
web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/import_export/__init__.py (1)
web/pgadmin/utils/ajax.py (1)
bad_request(126-132)
web/pgadmin/misc/workspaces/static/js/WorkspaceWelcomePage.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/erd/static/js/erd_tool/dialogs/OneToOneDialog.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js (2)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)web/pgadmin/browser/static/js/node.js (1)
errmsg(606-606)
web/pgadmin/misc/cloud/static/js/google_schema.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/backup/static/js/backup.ui.js (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js (2)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)web/pgadmin/static/js/validators.js (1)
isEmptyString(57-59)
web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py (3)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)web/pgadmin/utils/preferences.py (2)
preference(469-481)register(406-467)web/pgadmin/utils/__init__.py (1)
register(58-83)
🔇 Additional comments (85)
web/pgadmin/browser/templates/browser/js/messages.js (1)
29-29: LGTM: punctuation-only refinement for INVALID_MIN_MAXThe updated message text is consistent with neighboring messages (all end with periods) and doesn’t affect behavior or keys. Safe, clarity-improving change.
web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx (1)
35-35: String cleanup improves clarity and grammar.The note string has been updated with better grammar ("settings" → "setting"), more natural phrasing ("is to" → "is used to"), and consistent capitalization ("Show/Hide" → "show/hide", "object explorer" → "Object Explorer"). The string remains properly wrapped in
gettext()for internationalization support.web/pgadmin/preferences/static/js/components/RightPreference.jsx (1)
49-49: Updated helper text is clearer and remains i18n-safeThe revised copy (“Select an item below to view or edit its preferences.”) is clearer and more natural than the previous wording, and it keeps the same gettext usage pattern (no new placeholders or formatting concerns), so it’s a safe, non-breaking UX improvement.
web/pgadmin/tools/maintenance/static/js/maintenance.ui.js (1)
270-270: LGTM!The addition of a period to the
buffer_usage_limithelp message improves consistency in help text punctuation and aligns well with the PR's text cleanup objective.web/pgadmin/misc/workspaces/static/js/WorkspaceWelcomePage.jsx (2)
92-92: LGTM! Text improved for clarity and conciseness.The rewording from "select the existing servers or create a completely new ad-hoc connection" to "connect to existing servers or create an ad-hoc connection" is more natural and removes redundancy (ad-hoc already implies new). The string remains properly wrapped in
gettext()for i18n support.
98-98: LGTM! Consistent text improvement in PSQL variant.The same refinement is correctly applied to the PSQL workspace branch, maintaining consistency across workspace modes and adhering to the PR's string cleanup objectives.
web/pgadmin/tools/psql/static/js/PsqlModule.js (1)
94-94: Consistent text correction: "Pql Tool" → "PSQL Tool".This change corrects the disabled-state menu message to use the proper capitalization of "PSQL Tool," improving consistency with other references in the file (e.g., line 91's menu label, and error messages at lines 135, 143, 152). The string is correctly wrapped in
gettext()for internationalization.web/pgadmin/utils/__init__.py (1)
351-353: Good text cleanup—grammar improvement.Updating the error message from "can not" to "cannot" is the correct English form and improves consistency with standard grammar conventions. This is a safe, user-facing text improvement with no functional impact.
web/pgadmin/tools/import_export/static/js/import_export.ui.js (4)
138-138: Grammar fix: possessive form.Changed "column's input value" for clarity and consistency. The help message reads well and accurately describes the on_error behavior.
274-274: Punctuation cleanup: added terminal period.The help message for 'default_string' now consistently ends with a period, matching the style of other help messages in the file.
320-320: Clarified help message for query field.The help message is concise and accurately describes the accepted SQL commands for the Export Data Query.
410-410: Standardized contraction: "can not" → "cannot".Updated the validation error message to use the standard modern English contraction, improving consistency with the rest of the codebase.
web/pgadmin/dashboard/static/js/Dashboard.jsx (1)
870-872: Improved log-disabled message looks goodThe revised text on Line 871 is clearer and grammatically correct, while preserving the original intent of guiding users to enable logging or verify the log file. No behavioral impact on the surrounding logic.
web/pgadmin/dashboard/__init__.py (1)
194-200: Graph point‑style help text is clear and grammaticalThe revised help string reads naturally and correctly explains the behavior (“different style on each graph line”) and matches the option label.
web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx (1)
16-16: LGTM! Grammatical correction improves consistency.The title correction from "Forget" to "Forgot" is grammatically correct and now aligns with the component name (
ForgotPasswordPage) and image filename (forgot_password.svg).web/pgadmin/misc/cloud/static/js/CloudWizard.jsx (1)
415-416: Text cleanups improve user-facing messaging.Both string adjustments enhance readability and grammar:
- Line 415: Removing "the" before "pgAdmin" follows standard English usage ("authenticate pgAdmin" rather than "authenticate the pgAdmin").
- Line 416: Reordering to "the button below" provides proper word order compared to "the below button."
The changes are correctly wrapped with
gettext()for translation support, so the i18n system will properly extract and manage the updated strings.web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py (11)
57-61: LGTM!The capitalization fix for "WAL" (Write-Ahead Logging) is correct and improves consistency with the PostgreSQL community's standard terminology.
102-142: LGTM!The help text refinements in the Options category appear to improve clarity and consistency in phrasing (e.g., "on Query Tool exit", "on data grid exit", "on Query Tool exit" for transaction handling, and "from the main window"). These minor wording adjustments enhance the user-facing documentation without altering functionality.
165-173: LGTM!The help text improvement for the View/Edit Data Promotion Warning preference clarifies the dialog behavior with improved phrasing ("promote to Query Tool when the query is edited" is clearer than the previous wording).
176-185: LGTM!The help text refinements for the underline query cursor preference improve readability with consistent phrasing around the Query Tool's parsing and underline behavior.
187-197: LGTM!The help text improvements for the underlined query execute warning preference enhance clarity by explicitly mentioning the "Execute Query button" and the condition for warning display.
292-305: LGTM!The help text refinement for "Columns sized by" improves clarity by better explaining the behavior when set to 'Column data' vs. 'Column name', making the preference's impact more transparent to users.
307-315: LGTM!The help text improvement for "Maximum column width" provides clearer context by referencing the related 'Columns sized by' preference setting.
317-326: LGTM!The help text refinement for "Data result rows per page" improves clarity by better explaining the impact of changing this value and its relationship to the config file setting.
328-334: LGTM!The help text improvement for "Striped rows?" clarifies the visual effect with better phrasing about the alternating background colors.
336-342: LGTM!The help text refinement for "Max column data display length" provides clearer context about what gets truncated in data cells.
743-749: LGTM!The help text improvement for "Keywords in uppercase" preference clarifies that the setting applies to the autocomplete suggestions with better phrasing.
web/pgadmin/browser/server_groups/servers/roles/static/js/roleReassign.js (6)
57-57: Good punctuation consistency.The help message now ends with a period, improving consistency across all help text in the form.
99-99: Clear and consistent help text.The addition of a period maintains punctuation consistency across all help messages in the schema.
131-131: Informative warning message.The CASCADE warning is clear and properly punctuated, helping users understand the implications of this option.
137-137: Clear field description.The help message effectively explains the purpose of the database selection field with proper punctuation.
164-167: Consistent error messaging.The validation error message is properly formatted with escaped quotes for field label clarity and ends with a period for consistency.
170-173: Clear validation error.The error message properly identifies the field with escaped quotes and maintains punctuation consistency across all validation messages.
web/pgadmin/tools/debugger/__init__.py (1)
212-228: String casing aligned with other shortcut labelsChanging the shortcut label to
gettext('Switch panel')matches the sentence-style capitalization used by the other debugger keyboard shortcut labels and keeps behavior unchanged.web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx (1)
224-231: NotConnected alert message wording improvedThe updated text (“Not connected to the server or the connection to the server has been closed.”) is clearer and grammatically correct, with no functional impact.
web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx (1)
430-435: Error message text refinedThe revised string (“Unable to fetch the arguments from the server.”) is grammatically polished and consistent with other error messages; behavior is unchanged.
web/pgadmin/misc/bgprocess/processes.py (2)
696-697: LGTM! Error message text improved.The rewording from passive to active voice improves readability, and the change aligns with the PR's string cleanup objectives.
905-906: LGTM! Punctuation consistency improved.The addition of a trailing period ensures consistent punctuation across logging messages.
web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx (1)
650-652: LGTM! Punctuation fixes improve text quality.The removal of extra spaces before question marks in the confirmation dialog strings is correct per English grammar conventions. These changes enhance the professionalism of user-facing messages without affecting functionality or translation capabilities.
web/pgadmin/misc/cloud/static/js/aws_schema.ui.js (1)
104-104: LGTM! Clear help message improvement.The updated help message clearly explains when the AWS session token is required, improving user guidance.
web/pgadmin/misc/cloud/static/js/azure_schema.ui.js (1)
723-723: LGTM! Punctuation consistency improvement.Adding a period at the end of the error message improves consistency with other user-facing messages.
web/pgadmin/misc/cloud/static/js/azure.js (1)
34-34: LGTM! HTML formatting improvement.Adding proper spacing between the sentence and the image tag improves the readability of the loading message.
web/pgadmin/misc/cloud/static/js/google_schema.ui.js (1)
508-508: LGTM! Proper sentence spacing fix.Adding a space after the period between the two sentences improves readability and follows proper grammar conventions.
web/pgadmin/misc/cloud/static/js/google.js (1)
35-35: LGTM! HTML formatting improvement.Adding proper spacing between the sentence and the image tag improves the readability of the loading message, consistent with the similar change in azure.js.
web/pgadmin/tools/user_management/__init__.py (2)
599-600: Uniqueness error message wording is clearer and more preciseThe updated text (“User email or username must be unique for each authentication source.”) reads naturally and keeps the original intent without altering behavior. Looks good.
721-721: Non-editable field message now uses more natural phrasingThe change to “'{0}' cannot be modified.” is grammatically correct and user-friendly, with no impact on the surrounding logic.
web/pgadmin/tools/user_management/static/js/RoleDialog.jsx (1)
50-50: Role save success message aligns with standardized styleThe updated notifier text (“Role saved successfully.”) uses sentence case and proper punctuation, matching the broader string cleanup without changing behavior.
web/pgadmin/tools/user_management/static/js/UserDialog.jsx (1)
203-203: User save success message standardized and clarifiedThe new text (“User saved successfully.”) is grammatically correct, in sentence case, and consistent with the RoleDialog message, with no change to control flow.
web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx (1)
831-836: Info banner copy looks consistent and clearer nowThe revised strings (“servers” plural, lower‑cased “click”, explicit source/target guidance) read well and match the surrounding UI patterns. No further changes needed here.
web/pgadmin/tools/backup/static/js/backupGlobal.ui.js (1)
94-98: Globals note punctuation change is fineThe added period in the
globals_notetext is consistent with other help/notes and has no behavioral impact.web/pgadmin/authenticate/mfa/views.py (1)
173-177: MFA already-registered flash text looks goodThe corrected message string (
'{}' is already registered.) and explicit success category are appropriate; no behavior change.web/pgadmin/browser/server_groups/servers/__init__.py (1)
2044-2047: Improved pgpass error log wordingThe updated log message “Unable to fetch pgpass status” improves clarity and leaves behavior unchanged.
web/pgadmin/browser/server_groups/servers/roles/static/js/role.ui.js (1)
99-108: Account-expiry help text improvement looks goodThe revised helpMessage (“if you leave this field blank, then the password will never expire”) is grammatically clearer and matches the existing behavior of
rolvaliduntil.web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py (1)
713-723: Reverse‑engineered SQL error messages updated correctlyBoth error paths now say “reverse‑engineered SQL for the cast”/“cast node,” which is clearer and consistent; behavior is unchanged.
web/pgadmin/browser/server_groups/servers/roles/__init__.py (1)
905-916: Reverse‑engineered role SQL error text is clearer nowThe updated messages (“reverse‑engineered query for the role”) improve wording and are consistent across both error paths, with no change in logic.
web/pgadmin/tools/sqleditor/static/js/show_view_data.js (1)
64-67: Data filter validation message grammar update is fineChanging the message to “Data filter cannot be empty.” is grammatically correct and does not affect validation behavior.
web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js (1)
222-227: Improved “On error” validation text looks goodThe updated message “Please select a valid on error option.” improves readability without changing validation semantics.
web/pgadmin/tools/maintenance/__init__.py (1)
176-182: Server-not-found error message wording is consistent and safeUpdating the message to “Could not find the specified server.” is a harmless clarity improvement; response format and codes remain unchanged.
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py (1)
875-897: FTS parser reverse‑engineered SQL error messages updated correctlySwitching to “Could not generate reverse-engineered query …” in both error paths improves terminology consistency without affecting control flow.
web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/dbms_jobs/static/js/dbms_job.ui.js (1)
165-179: DBMS job end-time validation message punctuation is fineAdding the trailing period in “Start time must be less than end time.” is a cosmetic improvement only; date comparison logic is untouched.
web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.ui.js (1)
245-259: PgAgent schedule end-time validation message aligned with other UIsThe updated text “Start time must be less than end time.” matches related scheduler messages and does not change validation behavior.
web/pgadmin/browser/register_editor_preferences.py (1)
329-335: Expression width help text rewording is clear and non-breakingThe new help text (“Maximum number of characters in parenthesized expressions to be kept on a single line.”) improves clarity while leaving the preference behavior unchanged.
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py (1)
935-955: FTS configuration reverse‑engineered SQL messages updated consistentlyUsing “Could not generate reverse-engineered query …” in both error branches standardizes terminology with other FTS components without altering error handling behavior.
web/pgadmin/browser/register_browser_preferences.py (9)
58-59: Hide-shared-servers help text is clear and correctThe updated wording and punctuation read naturally and accurately describe the preference behavior.
78-79: Confirm-on-refresh help text improvement looks goodThe sentence now clearly states that the confirmation is about intentional closure/refresh; punctuation is correct.
115-118: pgAgent history help text punctuation is consistentThe sentence now ends cleanly with a period and matches the tone of nearby help texts.
413-415: Dynamic tab size help text is understandableThe description of tabs taking full size based on title and applying to already-open tabs is accurate and grammatically correct.
423-426: Query Tool tab title help text aligns with placeholder behaviorThe placeholder list, “with or without placeholders” phrasing, and fallback-to-default sentence are all clear.
435-439: View/Edit data tab title help text is clear and consistentThe expanded placeholder list and “blank title will revert to the default” sentence are concise and correct.
447-452: Debugger tab title help text reads wellHyphenation and punctuation are consistent with the other tab title help strings; behavior description is unchanged and clear.
471-475: Open-in-new-tab help text accurately lists optionsThe sentence is grammatically correct and clearly ties the dropdown selection to opening the chosen module in a new tab.
493-497: PSQL tab title help text consistent with other placeholdersThe wording is parallel to the other tab-title descriptions, with correct punctuation and behavior explanation.
web/pgadmin/tools/erd/static/js/erd_tool/dialogs/OneToOneDialog.js (1)
73-79: Primary-key validation message grammar fix is correctAdding “a” (“select a different constraint”) fixes the grammar without changing meaning.
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py (1)
754-767: FTS Template reverse‑engineered query messages correctedThe change to “reverse-engineered query” in both error messages fixes the wording and keeps the intent and context intact.
web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js (2)
410-416: Range subtype validation message punctuation aligned“Subtype cannot be empty.” now matches the style of neighboring validation messages.
812-824: External type input/output validation messages standardizedAdding periods to “Input function cannot be empty.” and “Output function cannot be empty.” improves consistency without changing meaning.
web/pgadmin/tools/backup/static/js/backup.ui.js (1)
597-603: Server backup note punctuation is now consistent“The backup format will be PLAIN.” is clear and matches other note styles.
web/pgadmin/tools/import_export/__init__.py (2)
295-302: Server-not-found error message clarification looks good“Could not find the specified server.” is grammatically correct and more precise than the previous wording.
335-343: File validation error messages now consistentBoth branches now use “Please specify a valid file.” with a trailing period, improving consistency with other bad_request messages.
web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js (4)
185-190: Publication refresh help text punctuation fixedAdding the period (“Click the refresh button to get the publications.”) is correct and consistent with the rest of the UI.
314-329: Create-slot help text is much clearer and matches behaviorThe new description correctly explains slot creation, the same-database special case, and the risk of hanging; it also aligns with the depChange logic that forces
create_slotfalse for same-DB connections.
331-337: Enabled help text grammar improvement is correct“Just set up” is the right verb form here; the sentence now reads naturally while preserving meaning.
482-488: Failover help text punctuation alignedAdding a final period keeps this explanation consistent with neighboring help messages; wording remains accurate.
web/pgadmin/browser/static/js/withCheckPermission.js (1)
22-25: Permission-denied message grammar and punctuation look goodThe updated string is grammatically correct, clearly actionable, and the apostrophe escaping is appropriate for the JS literal. No behavior change introduced.
web/pgadmin/static/js/SchemaView/utils/createFieldControls.jsx (1)
58-116: I'm unable to clone the repository to verify the claim directly. However, based on the code snippet provided in the review comment itself, I can perform a logical analysis:From the provided code:
- Line 58:
let inlineGroup = null;— initialized as a variable that will hold eithernullor an object- Lines 85-100:
inlineGroup = currentGroup.inlineGroups[inlineGroupId] = { control: View('InlineView'), ... }— assigned an object structure- Line 67:
if(field.type === 'group')— shows thatfield.typeholds string values- Lines 75 & 110:
if (field.type === inlineGroup)— compares a string to a variable holdingnullor an objectThe logic issue is confirmed: The conditions at lines 75 and 110 will always be falsy because:
field.typeis a string (e.g.,'group','inline-group')inlineGroupis eithernullor an object, never a string- A string can never strictly equal
nullor an objectThe reviewer's suggestion to use the string literal
'inline-group'is logically sound and appears to be the intended check.
Correct inline-group type checking
The comparisons
field.type === inlineGroupat lines 75 and 110 are logic errors. SinceinlineGroupholds an object ornullandfield.typeis a string, these conditions are unreachable. Use the string literal instead:if (field.isFullTab) { - if (field.type === inlineGroup) + if (field.type === 'inline-group') throw new Error('Inline group cannot be a full tab control.'); } // ... - if (field.type === inlineGroup) { + if (field.type === 'inline-group') { // inline-group handling... }
|
Can you please resolve conflicts |
171180a to
1a1f0c6
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 0
🧹 Nitpick comments (2)
web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx (1)
83-92: Clipboard permission alerts are clearer and aligned with actionsThe updated write/read permission alerts clearly explain why permission is needed and reference the PSQL terminal explicitly, which should help users understand browser prompts.
If you want to tighten the copy further, consider “paste data into the PSQL terminal” instead of “on the PSQL terminal,” but the current wording is perfectly acceptable.
Also applies to: 99-112
web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx (1)
351-358: Schema Diff script header now better communicates circular dependency caveatThe new header clearly warns that object order may not be optimal due to circular dependencies and that manual adjustments may be needed, plus it encourages reporting issues. That’s a useful improvement for users inspecting the script.
Optionally, you could merge the two middle lines into a single sentence to reduce string fragmentation for translators, e.g. “Due to circular dependencies, the order in which Schema Diff writes objects may not be optimal, and manual changes to the script may be required to ensure changes are applied in the correct order.”
📜 Review details
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (20)
web/pgadmin/dashboard/static/js/Dashboard.jsx(1 hunks)web/pgadmin/dashboard/static/js/SystemStats/Summary.jsx(2 hunks)web/pgadmin/misc/cloud/static/js/CloudWizard.jsx(1 hunks)web/pgadmin/misc/workspaces/static/js/WorkspaceWelcomePage.jsx(1 hunks)web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx(1 hunks)web/pgadmin/preferences/static/js/components/RightPreference.jsx(1 hunks)web/pgadmin/static/js/Dialogs/index.jsx(1 hunks)web/pgadmin/static/js/Explain/index.jsx(1 hunks)web/pgadmin/static/js/SchemaView/utils/createFieldControls.jsx(2 hunks)web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx(1 hunks)web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx(1 hunks)web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx(1 hunks)web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx(1 hunks)web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx(1 hunks)web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx(2 hunks)web/pgadmin/tools/schema_diff/static/js/components/Results.jsx(1 hunks)web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx(2 hunks)web/pgadmin/tools/user_management/static/js/RoleDialog.jsx(1 hunks)web/pgadmin/tools/user_management/static/js/Roles.jsx(1 hunks)web/pgadmin/tools/user_management/static/js/UserDialog.jsx(1 hunks)
✅ Files skipped from review due to trivial changes (1)
- web/pgadmin/preferences/static/js/components/RightPreference.jsx
🚧 Files skipped from review as they are similar to previous changes (12)
- web/pgadmin/misc/cloud/static/js/CloudWizard.jsx
- web/pgadmin/static/js/Explain/index.jsx
- web/pgadmin/static/js/SchemaView/utils/createFieldControls.jsx
- web/pgadmin/tools/schema_diff/static/js/components/Results.jsx
- web/pgadmin/tools/user_management/static/js/RoleDialog.jsx
- web/pgadmin/misc/workspaces/static/js/WorkspaceWelcomePage.jsx
- web/pgadmin/dashboard/static/js/Dashboard.jsx
- web/pgadmin/static/js/Dialogs/index.jsx
- web/pgadmin/tools/debugger/static/js/components/DebuggerArgumentComponent.jsx
- web/pgadmin/tools/user_management/static/js/Roles.jsx
- web/pgadmin/dashboard/static/js/SystemStats/Summary.jsx
- web/pgadmin/static/js/SecurityPages/ForgotPasswordPage.jsx
🧰 Additional context used
🧬 Code graph analysis (7)
web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/psql/static/js/components/PsqlComponent.jsx (1)
web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
web/pgadmin/tools/user_management/static/js/UserDialog.jsx (5)
web/pgadmin/dashboard/static/js/Dashboard.jsx (1)
pgAdmin(311-311)web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx (1)
pgAdmin(119-119)web/pgadmin/tools/user_management/static/js/RoleDialog.jsx (1)
pgAdmin(40-40)web/pgadmin/tools/user_management/static/js/Users.jsx (1)
pgAdmin(88-88)web/regression/javascript/fake_gettext.js (1)
gettext(40-42)
🔇 Additional comments (6)
web/pgadmin/preferences/static/js/components/PreferencesHelper.jsx (1)
34-36: Reworded note string is clear and consistentThe updated sentence is grammatically correct, concise, and uses the proper "Object Explorer" naming. No functional or i18n concerns from this change.
web/pgadmin/tools/user_management/static/js/UserDialog.jsx (1)
198-205: Success notification copy change looks goodThe updated message
"User saved successfully."is grammatically correct, matches the singular resource, and keeps behavior intact (still usingpgAdmin.Browser.notifier.successin the same success path).web/pgadmin/tools/erd/static/js/erd_tool/components/ERDTool.jsx (1)
648-653: Confirmation text punctuation cleanup looks goodRemoving the extra spaces before the question marks in the confirmation dialog improves readability without changing behavior or parameters.
web/pgadmin/tools/debugger/static/js/components/DebuggerComponent.jsx (1)
227-231: Reworded “NotConnected” alert is clear and grammatically correctThe updated message reads naturally, is unambiguous, and keeps behavior unchanged. Looks good.
web/pgadmin/tools/import_export_servers/static/js/ImportExportServers.jsx (1)
109-111: Import error title capitalization is now consistentUsing “Import Error” matches “Export Error” and other notifier titles, improving UI consistency without changing behavior.
web/pgadmin/tools/schema_diff/static/js/components/SchemaDiffCompare.jsx (1)
831-837: Empty-state instructions are clearer and grammatically correct
- “database servers” pluralization is correct and matches the constraint being described.
- Using lowercase “click” is consistent with typical UI copy.
- The Database/Schema Compare instructions read naturally and unambiguously describe the required selections and action.
No further changes needed.
This patch cleans up some of the React strings.
Summary by CodeRabbit
✏️ Tip: You can customize this high-level summary in your review settings.