fix: Fix the exception of some 1pctl commands

[ssongliu]

No description provided.

[f2c-ci-robot]

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[wanghe-fit2cloud]

There are several improvements and optimizations that can be made to the code snippet you provided:

1. Simplify Version Helper Text:

   • Combine versionHelper, rollbackLocalHelper, etc., into a single explanation if they share similar content.

2. Consistency in Upgrade Messages:

   • Ensure consistency between upgradeCheck and other messages related to upgrades.
   • Simplify or remove redundant text about upgrade notes unless necessary.

3. Optimize About Section:

   • Refactor the "About" section to improve readability and reduce redundancy, if applicable.

4. Consider Adding Default Values or Null Checks:

   • In functions like switchNode, add default values for options or null checks.

Here's an optimized version of the code snippets with comments for clarity:

const message = {
    // ... existing properties ...

    versionHelper: `
        Name rules: [major version].[functional version].[bug fix version],
        as shown in the following examples:
        v1.0.1 -> Bug fix after v1.0.0
        v1.1.0 -> Feature release after v1.0.0
    `,
    
    /*
        The primary node does not support direct rollback. Please manually execute the [1pctl restore] command to rollback!
        
        Example usage:
        ```
        sudo 1pctl restore <previous_version>
        ```
    */
    
    upgradeCheck: 'Check for Updates',
    upgradeNotes: 'Release Note',
    upgradeNow: 'Upgrade Now',
    source: 'Download Source',

    hasNewVersion: 'New Version Available', // Consider renaming to something more specific
    versionHigher: (
        'Detected that node {0} version is higher than the main node, '
        + 'switching is not supported at this time. '
        + 'Please upgrade the main node system version and try again!'
    ),
    versionLower: (
        'Detected that node {0} version is lower than the main node, '
        + 'switching is not supported at this time. '
        + 'Please upgrade the system version of this node and try again!'
    ),

    /* 
       The current node's version does not match the primary node's version,
       switch is unsupported until resolved.
       
       To resolve this issue:
       1. Check the primary node version.
       2. Update the local node.
    */  
      
    versionNotSame: 'The version of this node does not match the primary node. ', 

    versionCompare: (
        'Detected that node {0} is already at the latest upgradable version. '
        + 'Please check the primary node version and try again!'
    ),    

    about: `
        Software Information:
        Project Address: https://example.com
        
        Version: v1.x.x (Updated on YYYY-MM-DD)
    `,
};

// ... rest of the code ...

Key Changes/Updates Summary:

• Combined related version helper text under one key.
• Added clear examples in the versionHelper.
• Used formatted strings (\n) and backticks (``) for multi-line string handling.
• Simplified version logic and error messages where possible.
• Provided context in the "about" section regarding software information and version status.

[wanghe-fit2cloud]

The only potential issue is with how you're comparing versions without using the full compareVersion function from @/utils/version. It's missing a comparison operator that checks if two versions are different (!==). Here's an updated version of the code:

if (item.version !== props.version) {
    MsgError(i18n.global.t('setting.versionNotSame'));
}

Additionally, this line should also be indented properly to maintain consistency in formatting.

[wanghe-fit2cloud]

The provided code snippet seems to contain several inconsistencies, potential issues, or optimization suggestions:

1. Version Helper Updates:

   • The comments have been updated regarding how versions are named (e.g., major.minor.patch).
   • A new helper rollbackLocalHelper was added for explaining that local upgrades are unsupported and users need to manually restore with 1pctl restore.

2. Update Messages:

   • There is a minor mistake in "hasNewVersion" which refers to having a new release instead of just checking.

3. Version Check Issues:

   • The logic for determining whether to allow switching between nodes based on version should be consistent across conditions (version higher/low/ not same). It's suggested to clarify these cases.

4. Optimization Suggestions:

   • Consider replacing hard-coded messages with dynamic ones if they can vary depending on user input or context.

To address these points more effectively, it would help to gather additional details about the broader functionality and intended use case before making further changes.

[wanghe-fit2cloud]

The provided code snippet contains several changes and minor adjustments aimed at improving clarity and robustness:

Changes and Adjustments:

1. Removal of versionHelper1 and versionHelper2:

   • These helper strings are no longer needed due to the introduction of better version management features.

2. Replacement of hasNewVersion with a more descriptive prompt:

   • The message "Have New Version Available" is replaced with a clearer one indicating available upgrades, which makes it more actionable.

3. Introduction of rollbackLocalHelper:

   • A new error message specific to local rollbacks when the primary node does not support it has been added. This provides guidance on how to proceed.

4. Clarification of versionHigher, versionLower, and improvements in versionNotSame:

   • Updated messages for version comparison situations while clarifying conditions under which switching between nodes is unsupported.

5. Revised versionCompare:

   • Corrected the phrase to indicate that the current node is already at its latest upgradable version, suggesting checking with the primary node for further instructions.

Summary of Changes:

• Removed unnecessary helper text.
• Renamed hasNewVersion to improve user understanding.
• Added a comprehensive error message for local rollbacks.
• Clarified messages related to version comparisons and restrictions on switching.

These changes ensure that the interface remains intuitive and maintainable, addressing both usability and operational efficiency.

[wanghe-fit2cloud]

The changes made to the changeNode function have improved clarity and readability by removing unnecessary checks and simplifying the logic. However, here are a few minor adjustments that could be made:

1. The message now specifies "version does not match" instead of just stating it's different.

2. Remove the unused variable compareItem.

Here is the updated code snippet with these suggested changes:

@@ -57,7 +57,6 @@
 import { GlobalStore, MenuStore } from '@/store';
 import { DropdownInstance } from 'element-plus';
 import { countExecutingTask } from '@/api/modules/log';
-import { compareVersion } from '@/utils/version';
 import { MsgError, MsgSuccess } from '@/utils/message';
 import i18n from '@/lang';
 import { listNodeOptions } from '@/api/modules/setting';

@@ -125,9 +124,7 @@ const changeNode = (command: string) => {
                 location.reload();
                 return;
             }
-            // let compareItem = compareVersion(item.version, props.version);
-            // if (compareItem) {
-            //     MsgError(i18n.global.t('setting.versionHigher', [command]));
+            if (item.version !== props.version) {
+                MsgError(i18n.global.t('setting.versionNotMatch'));
                 return;
-            // }

These improvements will make the code more straightforward and easier to understand.

[wanghe-fit2cloud]

Code Differences Analysis:

1. versionHigher translation change

• Old: "檢測到節點 {0} 版本高於主節點"
• New: "檢测到节点 {0} 的版本高于主节点"

Explanation:
This suggests that there might be an issue with how the phrase is translated or formatted.

2. versionLower translation change

• Old: "檢測到節點 {0} 版本低於主節點"
• New: "检测到节点 {0} 的版本低于主节点"

Explanation:
Similarly, this indicates a potential mismatched translation or incorrect formatting.

3. New entries:

• rollbackLocalHelper: Provides guidance on not rolling back directly from nodes.
• versionHigher, versionLower, and versionNotSame now contain error messages related to node versions being inconsistent, which seems like they should align more closely with each other regarding context.

---

Potential Issues:

• Mismatched translations between versionHigher/versionLower and versionNotSame.
• Inconsistent naming conventions (e.g., different formats in multiple places).

These discrepancies could potentially lead to user confusion and errors when using the application.

[wanghe-fit2cloud]

The changes you've made appear to be consistent with the intended functionality of the application. However, there are a few points noted:

1. rollbackLocalHelper Change: The helper text for local rollbacks is clear and concise.

2. Consistency in Version Messages:

   • In versionCompare, it mentions "primary node version" twice, which should only reference one instance based on context unless it's meant to imply both nodes sharing the same version.

3. Error Messages: Ensure that error messages like versionLower and versionHigher are correctly formatted and handle edge cases where the versions are equal (e.g., when they don't need to switch).

4. Optimization Suggestions:

   • Since you're working within a development phase, consider using more descriptive and comprehensive comments to aid future maintenance.
   • If the app will have multiple instances interacting with each other in a scalable manner, ensure that the error handling can manage network latency or intermittent failures gracefully.

Overall, the logic seems sound, but adding some additional detail or validation could improve robustness and maintainability.

[wanghe-fit2cloud]

The code difference seems to suggest a change in how version validation is handled. The original comparison logic used compareVersion function, while the current implementation directly checks if the item's version is not equal to the provided property version.

Potential Issues:

• Performance: Direct string comparison of versions might be less efficient than parsing and comparing numerical values.

  Optimization Suggestions:

1. Parse Version Strings: Consider converting both version strings to comparable numbers before comparing them to avoid unnecessary operations and ensure accurate comparisons.

2. Remove Redundant Code: If compareVersion returns truthy/falsey based on comparison results, you could potentially simplify it further without using additional variables like MsgError, i18n.global.t, etc.

Here is an optimized version with these suggestions:

const compareNode = (command: string) => {
    const { item, props } = command; // Assuming each element in 'command' has properties 'item' and 'props'
    if (location.href.indexOf(props.pathName.value) !== -1 && props.pathName.value.includes(`/node/${item.id}`)) {
        location.reload();
        return;
    }

    let parsedItemVersion, parsedPropsVersion;

    try {
        parsedItemVersion = parseVersion(item.version);
        parsedPropsVersion = parseVersion(props.version);

        if (item.version !== props.version) {
            console.error("Versions do not match:", item.version, props.version); // Log error instead of msg/error to keep UI clean
            return;
        }
    } catch (e) {
        console.error("Failed to parse version number", e); // Handle invalid versions more gracefully
        return;
    }

};

function parseVersion(versionStr) {
    const versionComponents = versionStr.split('.');
    return Number.parseInt(`${versionComponents[0]}${versionComponents.slice(1).join('.')}`);
}

This approach improves readability, removes redundant calls, and provides clearer logging for errors.

[wanghe-fit2cloud]

Yes, there seem to be a few inconsistencies in the code:

1. Typographical Errors:

   • In versionHelper, "命名規則" should be capitalized as "命名規则".
   • In hasNewVersion (in messages.js), capitalization of words doesn't follow standard conventions.

2. Incorrect Phrases:

   • The phrase "降級操作需要重啟 1Panel 服務，是否繼續" translates to "Upgrade operation requires restarting 1Panel service. Continue?" and isn't grammatically correct.

3. Redundant Messages:

   • There appear to be redundant strings like rollbackLocalHelper.

4. Semantic Issues:

   • The terms "版本高於主節點" and "版本低於主節點" might not clearly convey their intended meanings within this context.

5. Inconsistent Versioning Logic:

   • The version comparison logic seems inconsistent and may need refinement based on actual requirements.

These findings suggest improvements in terminology, readability, consistency, and potentially in the logic governing version checks. It would also be beneficial to have consistent use of naming conventions throughout similar contexts in other files related to version handling.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

[wanghe-fit2cloud]

/lgtm

[wanghe-fit2cloud]

/approve

[f2c-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wanghe-fit2cloud

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [wanghe-fit2cloud]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment