Skip to content

Improvement/artesca 15276 remove dataservice artesca plus veeam #875

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

Conversation

JeanMarcMilletScality
Copy link
Contributor

No description provided.

@bert-e
Copy link
Contributor

bert-e commented May 20, 2025

Hello jeanmarcmilletscality,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented May 20, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@JeanMarcMilletScality JeanMarcMilletScality changed the base branch from development/3.0 to development/3.2 May 20, 2025 08:53
@bert-e
Copy link
Contributor

bert-e commented May 20, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds a feature flag to hide data service routes and navigation items when Veeam-only mode is enabled.

  • Imports and uses a new useIsVeeamVBROnly hook
  • Wraps the “create-dataservice” route in a conditional to exclude it in Veeam-only mode
  • Conditionally removes the “Data Services” navigation item in internal routes
Comments suppressed due to low confidence (2)

src/react/Routes.tsx:108

  • [nitpick] The variable name isArtescaPlusVeeamEnabled is inconsistent with the hook name useIsVeeamVBROnly and is somewhat ambiguous. Consider renaming it to isVeeamVBROnly for clarity and alignment with the hook.
const isArtescaPlusVeeamEnabled = useIsVeeamVBROnly();

src/react/Routes.tsx:214

  • This new conditional rendering for data service routes should have corresponding unit or integration tests to verify that routes are correctly included or excluded based on the Veeam-only flag.
{!isArtescaPlusVeeamEnabled && (

@@ -386,6 +393,7 @@ function InternalRoutes() {
const { isStorageManager } = useAuthGroups();
const config = useConfig();
const navigate = useBasenameRelativeNavigate();
const isArtescaPlusVeeamEnabled = useIsVeeamVBROnly();
Copy link
Preview

Copilot AI May 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] This hook is called in both PrivateRoutes and InternalRoutes, leading to duplication. Consider lifting this logic into a shared parent component or a custom hook wrapper to reduce repetition.

Copilot uses AI. Check for mistakes.

}
/>
{!isArtescaPlusVeeamEnabled && (
<>
Copy link
Preview

Copilot AI May 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The React fragment here wraps only a single <Route> component. You can remove the fragment to simplify the JSX.

Copilot uses AI. Check for mistakes.

Copy link

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR introduces conditional rendering of Data Service routes and sidebar entries based on the useIsVeeamVBROnly feature flag and adds corresponding tests.

  • Imported and applied useIsVeeamVBROnly in PrivateRoutes and InternalRoutes
  • Wrapped create-dataservice and dataservices routes in a conditional to hide them for Veeam VBR–only users
  • Updated sidebar configuration to exclude the “Data Services” action when the flag is enabled
  • Added tests in Routes.test.tsx to cover both route and sidebar behaviors

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
src/react/Routes.tsx Added useIsVeeamVBROnly import; conditionally hide DataService routes and sidebar entry
src/react/Routes.test.tsx New tests mocking useIsVeeamVBROnly to verify route and sidebar visibility
Comments suppressed due to low confidence (2)

src/react/Routes.tsx:108

  • [nitpick] The variable name isArtescaPlusVeeamEnabled is verbose and doesn't align directly with the hook useIsVeeamVBROnly. Consider renaming it to isVeeamVBROnly for consistency and clarity.
const isArtescaPlusVeeamEnabled = useIsVeeamVBROnly();

src/react/Routes.test.tsx:6

  • The debug import from jest-preview is not used in this test file. You can remove it to avoid unused imports.
import { debug } from 'jest-preview';

@bert-e
Copy link
Contributor

bert-e commented May 20, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented May 21, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@JeanMarcMilletScality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 21, 2025

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/3.2

The following branches have NOT changed:

  • development/1.4
  • development/1.5
  • development/1.6
  • development/2.0
  • development/2.1
  • development/2.2
  • development/3.0
  • development/3.1

Please check the status of the associated issue ARTESCA-15276.

Goodbye jeanmarcmilletscality.

The following options are set: approve

@bert-e bert-e merged commit 1b0ae6a into development/3.2 May 21, 2025
9 checks passed
@bert-e bert-e deleted the improvement/ARTESCA-15276-remove-dataservice-artesca-plus-veeam branch May 21, 2025 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants