Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"moment-duration-format": "^2.3.2",
"moment-timezone": "^0.5.33",
"mui-color-input": "^9.0.0",
"openstack-uicore-foundation": "5.0.37",
"openstack-uicore-foundation": "5.0.38",
"p-limit": "^6.1.0",
"path-browserify": "^1.0.1",
"postcss-loader": "^6.2.1",
Expand Down
5 changes: 3 additions & 2 deletions src/actions/admin-access-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ import {
createAction,
stopLoading,
startLoading,
escapeFilterValue
escapeFilterValue,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";
import { getAccessTokenSafely } from "../utils/methods";
import { DEFAULT_PER_PAGE } from "../utils/constants";

Expand Down
17 changes: 0 additions & 17 deletions src/actions/base-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
createAction,
authErrorHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import { CODE_200 } from "../utils/constants";

export const REQUEST_TIMEZONES = "REQUEST_TIMEZONES";
export const RECEIVE_TIMEZONES = "RECEIVE_TIMEZONES";
Expand All @@ -41,19 +40,3 @@ export const clearSnackbarMessage = () => (dispatch) => {
export const setSnackbarMessage = (message) => (dispatch) => {
dispatch(createAction(SET_SNACKBAR_MESSAGE)(message));
};

export const snackbarErrorHandler = (err, res) => (dispatch, state) => {
authErrorHandler(err, res, setSnackbarMessage)(dispatch, state);
};

export const snackbarSuccessHandler = (message) => (dispatch, state) =>
setSnackbarMessage({ ...message, type: "success", code: CODE_200 })(
dispatch,
state
);

export const snackbarErrorMsg = (message) => (dispatch, state) =>
setSnackbarMessage({ ...message, type: "error", code: CODE_200 })(
dispatch,
state
);
5 changes: 3 additions & 2 deletions src/actions/form-template-item-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ import {
createAction,
stopLoading,
startLoading,
escapeFilterValue
escapeFilterValue,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";
import { getAccessTokenSafely } from "../utils/methods";
import {
DEFAULT_CURRENT_PAGE,
Expand Down
5 changes: 3 additions & 2 deletions src/actions/media-file-type-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ import {
startLoading,
fetchResponseHandler,
fetchErrorHandler,
escapeFilterValue
escapeFilterValue,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import URI from "urijs";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";
import { getAccessTokenSafely } from "../utils/methods";
import {
DEBOUNCE_WAIT,
Expand Down
4 changes: 2 additions & 2 deletions src/actions/member-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import {
createAction,
stopLoading,
startLoading,
authErrorHandler
authErrorHandler,
snackbarErrorHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import moment from "moment-timezone";
import { getAccessTokenSafely } from "../utils/methods";
import { snackbarErrorHandler } from "./base-actions";
import { DEFAULT_PER_PAGE } from "../utils/constants";

export const REQUEST_MEMBERS = "REQUEST_MEMBERS";
Expand Down
5 changes: 3 additions & 2 deletions src/actions/page-template-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@ import {
stopLoading,
startLoading,
authErrorHandler,
escapeFilterValue
escapeFilterValue,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import { getAccessTokenSafely } from "../utils/methods";
import {
DEFAULT_CURRENT_PAGE,
DEFAULT_ORDER_DIR,
DEFAULT_PER_PAGE
} from "../utils/constants";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";
import { normalizePageTemplateModules } from "../utils/page-template";
import { GLOBAL_PAGE_CLONED } from "./sponsor-pages-actions";

Expand Down
2 changes: 1 addition & 1 deletion src/actions/selection-plan-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
showMessage,
authErrorHandler,
snackbarErrorHandler,
snackbarSuccessHandler,
postFile
} from "openstack-uicore-foundation/lib/utils/actions";
import URI from "urijs";
Expand All @@ -35,7 +36,6 @@ import {
fetchErrorHandler
} from "../utils/methods";
import { saveMarketingSetting } from "./marketing-actions";
import { snackbarSuccessHandler } from "./base-actions";
import {
DEBOUNCE_WAIT,
DEFAULT_CURRENT_PAGE,
Expand Down
5 changes: 3 additions & 2 deletions src/actions/show-pages-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import {
putRequest,
deleteRequest,
startLoading,
stopLoading
stopLoading,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import T from "i18n-react/dist/i18n-react";
import { escapeFilterValue, getAccessTokenSafely } from "../utils/methods";
Expand All @@ -28,7 +30,6 @@ import {
DEFAULT_ORDER_DIR,
DEFAULT_PER_PAGE
} from "../utils/constants";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";
import { normalizePageTemplateModules } from "../utils/page-template";

export const REQUEST_SHOW_PAGES = "REQUEST_SHOW_PAGES";
Expand Down
5 changes: 3 additions & 2 deletions src/actions/sponsor-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ import {
escapeFilterValue,
fetchResponseHandler,
fetchErrorHandler,
postFile
postFile,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import debounce from "lodash/debounce";
import URI from "urijs";
Expand All @@ -42,7 +44,6 @@ import {
FIVE_PER_PAGE,
HUNDRED_PER_PAGE
} from "../utils/constants";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";

URI.escapeQuerySpace = false;

Expand Down
10 changes: 4 additions & 6 deletions src/actions/sponsor-cart-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,13 @@ import {
postRequest,
putRequest,
startLoading,
stopLoading
stopLoading,
snackbarErrorHandler,
snackbarSuccessHandler,
setSnackbarMessage
} from "openstack-uicore-foundation/lib/utils/actions";
import T from "i18n-react";
import { escapeFilterValue, getAccessTokenSafely } from "../utils/methods";
import {
setSnackbarMessage,
snackbarErrorHandler,
snackbarSuccessHandler
} from "./base-actions";
import {
DEFAULT_CURRENT_PAGE,
DEFAULT_ORDER_DIR,
Expand Down
5 changes: 3 additions & 2 deletions src/actions/sponsor-forms-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ import {
postRequest,
putRequest,
startLoading,
stopLoading
stopLoading,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";

import T from "i18n-react/dist/i18n-react";
Expand All @@ -34,7 +36,6 @@ import {
DEFAULT_ORDER_DIR,
DEFAULT_PER_PAGE
} from "../utils/constants";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";

export const REQUEST_SPONSOR_FORMS = "REQUEST_SPONSOR_FORMS";
export const RECEIVE_SPONSOR_FORMS = "RECEIVE_SPONSOR_FORMS";
Expand Down
4 changes: 2 additions & 2 deletions src/actions/sponsor-mu-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ import {
putRequest,
deleteRequest,
startLoading,
stopLoading
stopLoading,
snackbarErrorHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import { getAccessTokenSafely } from "../utils/methods";
import {
DEFAULT_CURRENT_PAGE,
DEFAULT_ORDER_DIR,
DEFAULT_PER_PAGE
} from "../utils/constants";
import { snackbarErrorHandler } from "./base-actions";

export const REQUEST_SPONSOR_MEDIA_UPLOADS = "REQUEST_SPONSOR_MEDIA_UPLOADS";
export const RECEIVE_SPONSOR_MEDIA_UPLOADS = "RECEIVE_SPONSOR_MEDIA_UPLOADS";
Expand Down
5 changes: 3 additions & 2 deletions src/actions/sponsor-pages-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ import {
deleteRequest,
startLoading,
stopLoading,
escapeFilterValue
escapeFilterValue,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import T from "i18n-react/dist/i18n-react";
import {
getAccessTokenSafely,
normalizeSelectAllField
} from "../utils/methods";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";
import {
DEFAULT_CURRENT_PAGE,
DEFAULT_ORDER_DIR,
Expand Down
5 changes: 3 additions & 2 deletions src/actions/sponsor-purchases-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ import {
putRequest,
startLoading,
stopLoading,
getCSV
getCSV,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import T from "i18n-react/dist/i18n-react";
import { escapeFilterValue, getAccessTokenSafely } from "../utils/methods";
Expand All @@ -30,7 +32,6 @@ import {
DUMMY_ACTION,
PURCHASE_STATUS
} from "../utils/constants";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";

export const REQUEST_ALL_SPONSOR_PURCHASES = "REQUEST_ALL_SPONSOR_PURCHASES";
export const RECEIVE_ALL_SPONSOR_PURCHASES = "RECEIVE_ALL_SPONSOR_PURCHASES";
Expand Down
10 changes: 4 additions & 6 deletions src/actions/sponsor-users-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ import {
postRequest,
putRequest,
startLoading,
stopLoading
stopLoading,
snackbarErrorHandler,
snackbarSuccessHandler,
snackbarErrorMsg
} from "openstack-uicore-foundation/lib/utils/actions";
import T from "i18n-react/dist/i18n-react";
import { escapeFilterValue, getAccessTokenSafely } from "../utils/methods";
Expand All @@ -33,11 +36,6 @@ import {
IMPORT_SPONSOR_USERS_STATUS,
SPONSOR_USER_ASSIGNMENT_TYPE
} from "../utils/constants";
import {
snackbarErrorHandler,
snackbarErrorMsg,
snackbarSuccessHandler
} from "./base-actions";

export const RECEIVE_SPONSOR_USER_GROUPS = "RECEIVE_SPONSOR_USER_GROUPS";
export const REQUEST_SPONSOR_USER_REQUESTS = "REQUEST_SPONSOR_USER_REQUESTS";
Expand Down
5 changes: 3 additions & 2 deletions src/actions/sponsorship-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ import {
startLoading,
escapeFilterValue,
fetchResponseHandler,
fetchErrorHandler
fetchErrorHandler,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import URI from "urijs";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";
import { getAccessTokenSafely } from "../utils/methods";
import {
DEBOUNCE_WAIT,
Expand Down
5 changes: 3 additions & 2 deletions src/actions/ticket-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ import {
showMessage,
showSuccessMessage,
startLoading,
stopLoading
stopLoading,
snackbarErrorHandler,
snackbarSuccessHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import URI from "urijs";
import Swal from "sweetalert2";
Expand All @@ -48,7 +50,6 @@ import {
EXPORT_PAGE_SIZE_100,
TEN
} from "../utils/constants";
import { snackbarErrorHandler, snackbarSuccessHandler } from "./base-actions";

export const REQUEST_TICKETS = "REQUEST_TICKETS";
export const RECEIVE_TICKETS = "RECEIVE_TICKETS";
Expand Down
4 changes: 2 additions & 2 deletions src/actions/track-chair-actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import {
postRequest,
putRequest,
startLoading,
stopLoading
stopLoading,
snackbarErrorHandler
} from "openstack-uicore-foundation/lib/utils/actions";
import URI from "urijs";
import debounce from "lodash/debounce";
Expand All @@ -35,7 +36,6 @@ import {
DEFAULT_PER_PAGE,
DOUBLE_PER_PAGE
} from "../utils/constants";
import { snackbarErrorHandler } from "./base-actions";

URI.escapeQuerySpace = false;

Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9068,10 +9068,10 @@ open@^10.0.3:
is-inside-container "^1.0.0"
wsl-utils "^0.1.0"

openstack-uicore-foundation@5.0.37:
version "5.0.37"
resolved "https://registry.yarnpkg.com/openstack-uicore-foundation/-/openstack-uicore-foundation-5.0.37.tgz#0d57db5111c9d47d1896563fb010e200b4c5961c"
integrity sha512-Lf6TIZeN+8iWjT23l+zEwkjyQHoL6fDFAlSRbVX9wnMuaAna4itN1fKOQDnQK91CEtON34bEUwACdOmxCJqiyw==
openstack-uicore-foundation@5.0.38:
version "5.0.38"
resolved "https://registry.yarnpkg.com/openstack-uicore-foundation/-/openstack-uicore-foundation-5.0.38.tgz#54feaacc2a34d56a3db59b48bd2572bf25e963cf"
integrity sha512-MQCh+JOte0afEeWv5tfC6P3bkx71sp31qAdMjtnim1MkggP+hpFUwlUo6ArUZ9b/ksEQvyZHLI0eveSB5O6cRg==
dependencies:
use-sync-external-store "^1.6.0"

Expand Down
Loading