Skip to content
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.

Sign up for GitHub

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

Change help text in Veeam summary for VBO V8, (add application in vee… #780

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Change help text in Veeam summary for VBO V8, (add application in vee… #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19efd77
Change help text in Veeam summary for VBO V8, (add application in vee…
JeanMarcMilletScality Sep 30, 2024
8d43478
add prop 'application' in VeeamSummary.test
JeanMarcMilletScality Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/react/ui-elements/Veeam/VeeamSummary.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import {
VeeamSummary,
} from './VeeamSummary';
import userEvent from '@testing-library/user-event';
import { VEEAM_DEFAULT_ACCOUNT_NAME } from './VeeamConstants';
import {
VEEAM_BACKUP_REPLICATION,
VEEAM_DEFAULT_ACCOUNT_NAME,
} from './VeeamConstants';

jest.mock('../../next-architecture/ui/CertificateDownloadButton', () => ({
CertificateDownloadButton: () => <button type="button">Download</button>,
Expand Down Expand Up @@ -67,6 +70,7 @@ describe('VeeamSummary', () => {
secretKey={SECRET_KEY}
bucketName={VEEAM_BUCKET_NAME}
enableImmutableBackup={true}
application={VEEAM_BACKUP_REPLICATION}
/>
);
};
Expand Down
7 changes: 6 additions & 1 deletion src/react/ui-elements/Veeam/VeeamSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ import { CertificateDownloadButton } from '../../next-architecture/ui/Certificat
import { useAuthGroups } from '../../utils/hooks';
import { HideCredential } from '../Hide';
import { useGetS3ServicePoint } from './useGetS3ServicePoint';
import { VEEAM_OFFICE_365_V8 } from './VeeamConstants';

type VeeamSummaryProps = {
accountName: string;
bucketName: string;
enableImmutableBackup: boolean;
accessKey: string;
secretKey: string;
application: string;
};

export const VEEAM_SUMMARY_TITLE = 'Veeam Repository preparation summary';
Expand Down Expand Up @@ -63,6 +65,7 @@ export const VeeamSummary = ({
enableImmutableBackup,
accessKey,
secretKey,
application,
}: VeeamSummaryProps) => {
const history = useHistory();
const { isPlatformAdmin } = useAuthGroups();
Expand Down Expand Up @@ -227,7 +230,9 @@ export const VeeamSummary = ({
helpErrorPosition="bottom"
help={
enableImmutableBackup
? 'Ensure "Make recent backups immutable" is checked when configuring the bucket in Veeam.'
? `Ensure "Make ${
application === VEEAM_OFFICE_365_V8 ? '' : 'recent '
}backups immutable" is checked when configuring the bucket in Veeam.`
: undefined
}
content={
Expand Down
4 changes: 3 additions & 1 deletion src/react/ui-elements/Veeam/VeeamTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ export default function VeeamTable(propsConfiguration: VeeamTableProps) {
const history = useHistory();
const queryClient = useQueryClient();
const { next } = useStepper(VeeamStepsIndexes.Table, VEEAM_STEPS);
const { bucketName, enableImmutableBackup, accountName } = propsConfiguration;
const { bucketName, enableImmutableBackup, accountName, application } =
propsConfiguration;
const { data, accessKey, secretKey } = useMutationTableData({
propsConfiguration,
});
Expand Down Expand Up @@ -144,6 +145,7 @@ export default function VeeamTable(propsConfiguration: VeeamTableProps) {
enableImmutableBackup,
accessKey,
secretKey,
application,
});
}}
/>
Expand Down
Loading