Secret create error doesn't show on modal and secrets page

src/containers/Secrets/Secrets.js

@@ -38,9 +38,9 @@ import {
 import { fetchServiceAccounts } from '../../actions/serviceAccounts';
 import {
  getCreateSecretsSuccessMessage,
+ getDeleteSecretsErrorMessage,
  getDeleteSecretsSuccessMessage,
  getSecrets,
- getSecretsErrorMessage,
  getSelectedNamespace,
  getServiceAccounts,
  isFetchingSecrets,
@@ -370,7 +370,6 @@ export /* istanbul ignore next */ class Secrets extends Component {
  ]}
  />
  <Modal
- errorMessage={errorMessage}
  open={openNewSecret}
  key={openNewSecret}
  handleCreateSecret={this.handleCreateSecretClick}
@@ -398,7 +397,7 @@ function mapStateToProps(state, props) {
  const namespace = namespaceParam || getSelectedNamespace(state);
 
  return {
- errorMessage: getSecretsErrorMessage(state),
+ errorMessage: getDeleteSecretsErrorMessage(state),
  createSuccess: getCreateSecretsSuccessMessage(state),
  deleteSuccess: getDeleteSecretsSuccessMessage(state),
  filters,

src/reducers/index.js

@@ -313,6 +313,10 @@ export function getSecretsErrorMessage(state) {
  return secretSelectors.getSecretsErrorMessage(state.secrets);
 }
 
+export function getDeleteSecretsErrorMessage(state) {
+ return secretSelectors.getDeleteSecretsErrorMessage(state.secrets);
+}
+
 export function getCreateSecretsSuccessMessage(state) {
  return secretSelectors.getCreateSecretsSuccessMessage(state.secrets);
 }

src/reducers/index.test.js

@@ -15,6 +15,7 @@ import {
  getClusterTask,
  getClusterTasks,
  getClusterTasksErrorMessage,
+ getDeleteSecretsErrorMessage,
  getExtensions,
  getExtensionsErrorMessage,
  getLocale,
@@ -303,6 +304,17 @@ it('getSecretsErrorMessage', () => {
  );
 });
 
+it('getDeleteSecretsErrorMessage', () => {
+ const errorMessage = 'fake error message';
+ jest
+ .spyOn(secretSelectors, 'getDeleteSecretsErrorMessage')
+ .mockImplementation(() => errorMessage);
+ expect(getDeleteSecretsErrorMessage(state)).toEqual(errorMessage);
+ expect(secretSelectors.getDeleteSecretsErrorMessage).toHaveBeenCalledWith(
+ state.secrets
+ );
+});
+
 it('isFetchingSecrets', () => {
  jest
  .spyOn(secretSelectors, 'isFetchingSecrets')

src/reducers/secrets.js

@@ -84,8 +84,22 @@ function errorMessage(state = false, action) {
  case 'SECRETS_FETCH_FAILURE':
  case 'SECRET_CREATE_FAILURE':
  return action.error;
+ case 'SECRET_DELETE_FAILURE':
+ case 'SECRETS_FETCH_REQUEST':
+ case 'SECRETS_FETCH_SUCCESS':
+ case 'CLEAR_SECRET_ERROR_NOTIFICATION':
+ return null;
+ default:
+ return state;
+ }
+}
+
+function deleteErrorMessage(state = false, action) {
+ switch (action.type) {
+ case 'SECRETS_FETCH_FAILURE':
  case 'SECRET_DELETE_FAILURE':
  return action.error;
+ case 'SECRET_CREATE_FAILURE':
  case 'SECRETS_FETCH_REQUEST':
  case 'SECRETS_FETCH_SUCCESS':
  case 'CLEAR_SECRET_ERROR_NOTIFICATION':
@@ -128,6 +142,7 @@ function deleteSuccessMessage(state = null, action) {
 export default combineReducers({
  byNamespace,
  errorMessage,
+ deleteErrorMessage,
  createSuccessMessage,
  deleteSuccessMessage,
  isFetching
@@ -149,6 +164,10 @@ export function getSecretsErrorMessage(state) {
  return state.errorMessage;
 }
 
+export function getDeleteSecretsErrorMessage(state) {
+ return state.deleteErrorMessage;
+}
+
 export function getCreateSecretsSuccessMessage(state) {
  return state.createSuccessMessage;
 }

src/reducers/secrets.test.js

@@ -17,6 +17,7 @@ it('handles init or unknown actions', () => {
  expect(secretsReducer(undefined, { type: 'does_not_exist' })).toEqual({
  byNamespace: {},
  errorMessage: false,
+ deleteErrorMessage: false,
  createSuccessMessage: null,
  deleteSuccessMessage: null,
  isFetching: false