Skip to content

Commit

Permalink
Validate functionality addded
Browse files Browse the repository at this point in the history
  • Loading branch information
radhikav1 committed Sep 13, 2023
1 parent 3000b56 commit 9a7f50e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 11 deletions.
45 changes: 34 additions & 11 deletions app/cdap/components/NamespaceAdmin/ServiceAccounts/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import Box from '@material-ui/core/Box';
import styled from 'styled-components';
import IconButton from '@material-ui/core/IconButton';
import { ConfirmDialog } from 'components/shared/ConfirmDialog';
import { boolean } from '@storybook/addon-knobs';

const PREFIX = 'features.ServiceAccounts';

Expand Down Expand Up @@ -63,19 +64,22 @@ const ServiceAccountsView = ({ serviceacnts }) => {
const [open, setOpen] = React.useState(false);
const [deleteErrorMsg, setDeleteErrorMsg] = useState(null);
const [extendedErrorMsg, setExtendedErrorMsg] = useState(null);
const [saveErrorMsg, setSaveErrorMsg] = useState(null);
const [saveErrorDetails, setSaveErrorDetails] = useState(null);
const [saveStatusMsg, setSaveStatusMsg] = useState(null);
const [saveStatusDetails, setSaveStatusDetails] = useState(null);
const [saveStatus, setSaveStatus] = useState(null); // 'success' | 'info' | 'warning' | 'error';
const [isValidated, setIsValidated] = useState(false);

const handleClose = () => {
setOpen(false);
setSaveErrorMsg(null);
setSaveErrorDetails(null);
setSaveStatusMsg(null);
setSaveStatusDetails(null);
};

const handleSave = () => {
// alert('saving ' + selectedServiceAcnt);
// setSaveErrorMsg(T.translate(`${PREFIX}.saveErrorMessage`));
// setSaveErrorDetails({
// setSaveStatus('error');
// setSaveStatusMsg(T.translate(`${PREFIX}.saveErrorMessage`));
// setSaveStatusDetails({
// response:
// 'Sample Error message for testing : Error occurred as save is not intergrated with API',
// });
Expand All @@ -86,6 +90,23 @@ const ServiceAccountsView = ({ serviceacnts }) => {
setSelectedServiceAcnt(null);
};

const handleValidate = () => {
const isValidateSuccess = false;
// To do: Call validate API
if (isValidateSuccess) {
setIsValidated(true);
setSaveStatus('success');
setSaveStatusMsg(T.translate(`${PREFIX}.validationSuccessMessage`));
} else {
setIsValidated(false);
setSaveStatus('error');
setSaveStatusMsg(T.translate(`${PREFIX}.validationErrorMessage`));
setSaveStatusDetails({
response: 'Sample Error message for testing : Validation failed',
});
}
};

const deleteHanlder = (serviceAcnt) => {
// alert('delete');
// const sampleError =
Expand Down Expand Up @@ -176,14 +197,16 @@ const ServiceAccountsView = ({ serviceacnts }) => {
headerTitle={T.translate(`${PREFIX}.serviceAccount`)}
confirmationElem={getEditDialogContent()}
cancelButtonText={T.translate('commons.cancel')}
confirmButtonText={T.translate('commons.save')}
confirmFn={handleSave}
confirmButtonText={
isValidated ? T.translate('commons.save') : T.translate('commons.validate')
}
confirmFn={isValidated ? handleSave : handleValidate}
cancelFn={handleClose}
disableAction={!selectedServiceAcnt ? true : false}
isOpen={open}
severity="error"
statusMessage={saveErrorMsg}
extendedMessage={saveErrorDetails}
severity={saveStatus}
statusMessage={saveStatusMsg}
extendedMessage={saveStatusDetails}
></ConfirmDialog>
);
};
Expand Down
3 changes: 3 additions & 0 deletions app/cdap/text/text-en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ commons:
then: Then
tracker: Cask Tracker
typeLabel: Type
validate: Validate
when: When
wrangler: Cask Wrangler
yesLabel: Yes
Expand Down Expand Up @@ -3183,6 +3184,8 @@ features:
serviceAccount : Service account
deleteErrorMessage: Unable to delete service account
saveErrorMessage: Failed to save the service account changes
validationSuccessMessage: Service account validation successful
validationErrorMessage: Service account validation failed
SourceControlManagement:
configModal:
auth:
Expand Down

0 comments on commit 9a7f50e

Please sign in to comment.