orc-shared 1.6.0-dev.2 → 1.6.0-dev.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/MaterialUI/DataDisplay/PredefinedElements/StepperModal.js +2 -1
- package/dist/utils/buildUrl.js +1 -1
- package/package.json +1 -1
- package/src/components/MaterialUI/DataDisplay/PredefinedElements/StepperModal.js +2 -1
- package/src/components/MaterialUI/DataDisplay/PredefinedElements/StepperModal.test.js +20 -0
- package/src/utils/buildUrl.js +1 -1
|
@@ -119,6 +119,7 @@ var StepperModal = function StepperModal(_ref) {
|
|
|
119
119
|
open = _ref.open,
|
|
120
120
|
closeCallback = _ref.closeCallback,
|
|
121
121
|
confirmCallback = _ref.confirmCallback,
|
|
122
|
+
backdropCallback = _ref.backdropCallback,
|
|
122
123
|
confirmTitle = _ref.confirmTitle,
|
|
123
124
|
_ref$type = _ref.type,
|
|
124
125
|
type = _ref$type === void 0 ? "wide" : _ref$type;
|
|
@@ -150,7 +151,7 @@ var StepperModal = function StepperModal(_ref) {
|
|
|
150
151
|
}, (_steps$currentStep3 = steps[currentStep]) == null ? void 0 : _steps$currentStep3.content);
|
|
151
152
|
modalProps.set(_modalProps.default.propNames.title, titleComponent);
|
|
152
153
|
modalProps.set(_modalProps.default.propNames.open, open);
|
|
153
|
-
modalProps.set(_modalProps.default.propNames.backdropClickCallback, closeCallback);
|
|
154
|
+
modalProps.set(_modalProps.default.propNames.backdropClickCallback, backdropCallback != null ? backdropCallback : closeCallback);
|
|
154
155
|
modalProps.set(_modalProps.default.propNames.type, type);
|
|
155
156
|
var nextClick = (0, _react.useCallback)(function () {
|
|
156
157
|
return changeCurrentStep(function (step) {
|
package/dist/utils/buildUrl.js
CHANGED
|
@@ -47,7 +47,7 @@ var loadConfig = function loadConfig() {
|
|
|
47
47
|
}).catch(function () {
|
|
48
48
|
console.warn("Failed to load config.json, falling back to dev defaults");
|
|
49
49
|
return {
|
|
50
|
-
serviceApiUrl: "https://
|
|
50
|
+
serviceApiUrl: "https://occ-dev-ocs-cm.develop.orckestra.cloud:443/api"
|
|
51
51
|
};
|
|
52
52
|
}).then(function (config) {
|
|
53
53
|
var host = config.serviceApiUrl;
|
package/package.json
CHANGED
|
@@ -96,6 +96,7 @@ const StepperModal = ({
|
|
|
96
96
|
open,
|
|
97
97
|
closeCallback,
|
|
98
98
|
confirmCallback,
|
|
99
|
+
backdropCallback,
|
|
99
100
|
confirmTitle,
|
|
100
101
|
type = "wide",
|
|
101
102
|
}) => {
|
|
@@ -138,7 +139,7 @@ const StepperModal = ({
|
|
|
138
139
|
|
|
139
140
|
modalProps.set(ModalProps.propNames.title, titleComponent);
|
|
140
141
|
modalProps.set(ModalProps.propNames.open, open);
|
|
141
|
-
modalProps.set(ModalProps.propNames.backdropClickCallback, closeCallback);
|
|
142
|
+
modalProps.set(ModalProps.propNames.backdropClickCallback, backdropCallback ?? closeCallback);
|
|
142
143
|
modalProps.set(ModalProps.propNames.type, type);
|
|
143
144
|
|
|
144
145
|
const nextClick = useCallback(() => changeCurrentStep(step => step + 1), []);
|
|
@@ -3,6 +3,7 @@ import StepperModal from "./StepperModal";
|
|
|
3
3
|
import Modal from "./../Modal";
|
|
4
4
|
import ModalProps from "./../modalProps";
|
|
5
5
|
import Button from "@material-ui/core/Button";
|
|
6
|
+
import ModalMui from "@material-ui/core/Modal";
|
|
6
7
|
import { mount } from "enzyme";
|
|
7
8
|
import sinon from "sinon";
|
|
8
9
|
import { IntlProvider } from "react-intl";
|
|
@@ -163,6 +164,25 @@ describe("StepperModal", () => {
|
|
|
163
164
|
expect(cancelCallbackSpy, "was called");
|
|
164
165
|
});
|
|
165
166
|
|
|
167
|
+
it("Calls backdropCallback when clicking away from component", () => {
|
|
168
|
+
const open = true;
|
|
169
|
+
const backdropCallbackSpy = sinon.spy();
|
|
170
|
+
|
|
171
|
+
const component = (
|
|
172
|
+
<IntlProvider locale="en-US" messages={messages}>
|
|
173
|
+
<StepperModal open={open} backdropCallback={backdropCallbackSpy} />
|
|
174
|
+
</IntlProvider>
|
|
175
|
+
);
|
|
176
|
+
|
|
177
|
+
const mountedComponent = mount(component);
|
|
178
|
+
|
|
179
|
+
const muiModal = mountedComponent.find(ModalMui);
|
|
180
|
+
|
|
181
|
+
muiModal.invoke("onClose")({}, "backdropClick");
|
|
182
|
+
|
|
183
|
+
expect(backdropCallbackSpy, "was called");
|
|
184
|
+
});
|
|
185
|
+
|
|
166
186
|
it("Calls cancelCallback when ok button is pressed", () => {
|
|
167
187
|
const open = true;
|
|
168
188
|
const okCallback = sinon.spy();
|
package/src/utils/buildUrl.js
CHANGED
|
@@ -21,7 +21,7 @@ export const loadConfig = () =>
|
|
|
21
21
|
.catch(() => {
|
|
22
22
|
console.warn("Failed to load config.json, falling back to dev defaults");
|
|
23
23
|
return {
|
|
24
|
-
serviceApiUrl: "https://
|
|
24
|
+
serviceApiUrl: "https://occ-dev-ocs-cm.develop.orckestra.cloud:443/api",
|
|
25
25
|
};
|
|
26
26
|
})
|
|
27
27
|
.then(config => {
|