Skip to content

Commit f288944

Browse files
blackbartbluesblackbartblues
committed
fix(plugin-manager): address code quality review issues
- Replace hardcoded "v" version prefix with translated key - Replace hardcoded bullet separator with translated key - Replace hardcoded radius and spacing with Style constants - Remove all ?? "" fallbacks after tr() calls, use early returns
1 parent c3dc115 commit f288944

5 files changed

Lines changed: 33 additions & 25 deletions

File tree

‎plugin-manager/AvailableTabContent.qml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,22 @@ ColumnLayout {
6060
}
6161

6262
function installPlugin(pluginMetadata) {
63-
var title = pluginApi?.tr("panel.title") ?? ""
64-
var msg = pluginApi?.tr("panel.installing") ?? ""
63+
if (!pluginApi) return;
64+
var title = pluginApi.tr("panel.title")
65+
var msg = pluginApi.tr("panel.installing")
6566
msg = msg.replace("{plugin}", pluginMetadata.name)
6667
ToastService.showNotice(title, msg);
6768

6869
PluginService.installPlugin(pluginMetadata, false, function (success, error, registeredKey) {
70+
if (!pluginApi) return;
6971
if (success) {
70-
var successMsg = pluginApi?.tr("panel.install-success") ?? ""
72+
var successMsg = pluginApi.tr("panel.install-success")
7173
successMsg = successMsg.replace("{plugin}", pluginMetadata.name)
7274
ToastService.showNotice(title, successMsg);
7375
PluginService.enablePlugin(registeredKey);
7476
} else {
75-
var errorMsg = pluginApi?.tr("panel.install-error") ?? ""
76-
errorMsg = errorMsg.replace("{error}", error || (pluginApi?.tr("panel.unknown-error") ?? ""))
77+
var errorMsg = pluginApi.tr("panel.install-error")
78+
errorMsg = errorMsg.replace("{error}", error || pluginApi.tr("panel.unknown-error"))
7779
ToastService.showError(title, errorMsg);
7880
}
7981
});
@@ -347,13 +349,13 @@ ColumnLayout {
347349
Layout.fillWidth: true
348350

349351
NText {
350-
text: "v" + modelData.version
352+
text: pluginApi?.tr("panel.version-prefix") + modelData.version
351353
font.pointSize: Style.fontSizeXS
352354
color: Color.mOnSurfaceVariant
353355
}
354356

355357
NText {
356-
text: "\u2022"
358+
text: pluginApi?.tr("panel.separator")
357359
font.pointSize: Style.fontSizeXS
358360
color: Color.mOnSurfaceVariant
359361
}

‎plugin-manager/InstalledTabContent.qml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ ColumnLayout {
6161
NHeader {
6262
label: pluginApi?.tr("panel.uninstall-dialog-title")
6363
description: {
64-
var base = pluginApi?.tr("panel.uninstall-dialog-description") ?? ""
64+
if (!pluginApi) return ""
65+
var base = pluginApi.tr("panel.uninstall-dialog-description")
6566
return base.replace("{plugin}", uninstallDialog.pluginToUninstall?.name || "")
6667
}
6768
}
@@ -107,19 +108,21 @@ ColumnLayout {
107108

108109
BarService.widgetsRevision++;
109110

110-
var title = pluginApi?.tr("panel.title") ?? ""
111-
var msg = pluginApi?.tr("panel.uninstalling") ?? ""
111+
if (!pluginApi) return;
112+
var title = pluginApi.tr("panel.title")
113+
var msg = pluginApi.tr("panel.uninstalling")
112114
msg = msg.replace("{plugin}", pluginName)
113115
ToastService.showNotice(title, msg);
114116

115117
PluginService.uninstallPlugin(pluginId, function (success, error) {
118+
if (!pluginApi) return;
116119
if (success) {
117-
var successMsg = pluginApi?.tr("panel.uninstall-success") ?? ""
120+
var successMsg = pluginApi.tr("panel.uninstall-success")
118121
successMsg = successMsg.replace("{plugin}", pluginName)
119122
ToastService.showNotice(title, successMsg);
120123
} else {
121-
var errorMsg = pluginApi?.tr("panel.uninstall-error") ?? ""
122-
errorMsg = errorMsg.replace("{error}", error || (pluginApi?.tr("panel.unknown-error") ?? ""))
124+
var errorMsg = pluginApi.tr("panel.uninstall-error")
125+
errorMsg = errorMsg.replace("{error}", error || pluginApi.tr("panel.unknown-error"))
123126
ToastService.showError(title, errorMsg);
124127
}
125128
});
@@ -380,15 +383,16 @@ ColumnLayout {
380383
updates2[pid] = false;
381384
rootRef.updatingPlugins = updates2;
382385

386+
if (!pluginApi) return;
383387
if (success) {
384-
var title = pluginApi?.tr("panel.title") ?? ""
385-
var msg = pluginApi?.tr("panel.install-success") ?? ""
388+
var title = pluginApi.tr("panel.title")
389+
var msg = pluginApi.tr("panel.install-success")
386390
msg = msg.replace("{plugin}", pname)
387391
ToastService.showNotice(title, msg);
388392
} else {
389-
var title2 = pluginApi?.tr("panel.title") ?? ""
390-
var errMsg = pluginApi?.tr("panel.install-error") ?? ""
391-
errMsg = errMsg.replace("{error}", error || (pluginApi?.tr("panel.unknown-error") ?? ""))
393+
var title2 = pluginApi.tr("panel.title")
394+
var errMsg = pluginApi.tr("panel.install-error")
395+
errMsg = errMsg.replace("{error}", error || pluginApi.tr("panel.unknown-error"))
392396
ToastService.showError(title2, errMsg);
393397
}
394398
});
@@ -429,17 +433,17 @@ ColumnLayout {
429433
NText {
430434
text: {
431435
if (modelData.updateInfo) {
432-
return "v" + modelData.version + " -> v" + modelData.updateInfo.availableVersion
436+
return pluginApi?.tr("panel.version-prefix") + modelData.version + " → " + pluginApi?.tr("panel.version-prefix") + modelData.updateInfo.availableVersion
433437
}
434-
return "v" + modelData.version;
438+
return pluginApi?.tr("panel.version-prefix") + modelData.version;
435439
}
436440
font.pointSize: Style.fontSizeXS
437441
color: modelData.updateInfo ? Color.mPrimary : Color.mOnSurfaceVariant
438442
font.weight: modelData.updateInfo ? Style.fontWeightMedium : Style.fontWeightRegular
439443
}
440444

441445
NText {
442-
text: "\u2022"
446+
text: pluginApi?.tr("panel.separator")
443447
font.pointSize: Style.fontSizeXS
444448
color: Color.mOnSurfaceVariant
445449
}

‎plugin-manager/PluginsReadmeView.qml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Item {
213213
NText {
214214
text: {
215215
var m = PluginRegistry.getPluginManifest(root.selectedPluginId)
216-
return m && m.version ? "v" + m.version : ""
216+
return m && m.version ? pluginApi?.tr("panel.version-prefix") + m.version : ""
217217
}
218218
pointSize: Style.fontSizeM
219219
color: Color.mOnSurfaceVariant
@@ -469,7 +469,7 @@ Item {
469469
Layout.preferredWidth: Math.round(3 * Style.uiScaleRatio)
470470
Layout.fillHeight: true
471471
color: Color.mPrimary
472-
radius: 1
472+
radius: Style.radiusXS
473473
}
474474

475475
NText {

‎plugin-manager/SourcesTabContent.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ColumnLayout {
3939
}
4040

4141
ColumnLayout {
42-
spacing: 2
42+
spacing: Style.marginXS
4343
Layout.fillWidth: true
4444

4545
NText {

‎plugin-manager/i18n/en.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
"cancel": "Cancel",
4040
"refresh": "Refresh",
4141
"hot-reload": "Hot reload",
42-
"unknown-error": "Unknown error"
42+
"unknown-error": "Unknown error",
43+
"version-prefix": "v",
44+
"separator": "\u2022"
4345
},
4446
"settings": {
4547
"iconColor": {

0 commit comments

Comments
 (0)