thm-p3-configurator 0.0.232 → 0.0.234
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/src/shared/App.js +1 -1
- package/dist/src/shared/__api__/queries.js +5 -1
- package/dist/src/shared/__containers__/VehicleData.js +3 -2
- package/dist/src/shared/__containers__/internal/InternalBranchSelectorModal.js +11 -4
- package/dist/src/shared/__helpers__/index.js +13 -1
- package/package.json +1 -1
package/dist/src/shared/App.js
CHANGED
|
@@ -75,6 +75,6 @@ const App = () => {
|
|
|
75
75
|
defaultCountry: APP_CONFIG.country
|
|
76
76
|
}, /*#__PURE__*/_react.default.createElement(_OrderSessionContext.OrderSessionController, null, /*#__PURE__*/_react.default.createElement(_reactQuery.QueryClientProvider, {
|
|
77
77
|
client: _queryClient.default
|
|
78
|
-
}, /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_reactHotLoader.AppContainer, null, /*#__PURE__*/_react.default.createElement(_ActiveMarkerContext.ActiveMarkerProvider, null, /*#__PURE__*/_react.default.createElement(_StyleWrapper.default, null, !APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_Navbar.default, null), APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalBranchSelectorModal.default, null), /*#__PURE__*/_react.default.createElement(
|
|
78
|
+
}, /*#__PURE__*/_react.default.createElement(_reactRouterDom.BrowserRouter, null, /*#__PURE__*/_react.default.createElement(_reactHotLoader.AppContainer, null, /*#__PURE__*/_react.default.createElement(_ActiveMarkerContext.ActiveMarkerProvider, null, /*#__PURE__*/_react.default.createElement(_StyleWrapper.default, null, !APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_Navbar.default, null), APP_CONFIG.internal && /*#__PURE__*/_react.default.createElement(_InternalBranchSelectorModal.default, null), APP_CONFIG.nodeEnv === 'development' && APP_CONFIG.internal === true && /*#__PURE__*/_react.default.createElement(_TEST_ONLY_INTERNAL_ROUTES.default, null))))))))));
|
|
79
79
|
};
|
|
80
80
|
var _default = exports.default = App;
|
|
@@ -225,7 +225,11 @@ const useModelsQuery = _ref2 => {
|
|
|
225
225
|
formula
|
|
226
226
|
}).then(res => {
|
|
227
227
|
var _res$data3;
|
|
228
|
-
|
|
228
|
+
const options = (0, _helpers__.parseArrayToInputOptions)((_res$data3 = res === null || res === void 0 ? void 0 : res.data) !== null && _res$data3 !== void 0 ? _res$data3 : []);
|
|
229
|
+
// Truncate labels to only show text before the first '|' character
|
|
230
|
+
return options.map(option => _objectSpread(_objectSpread({}, option), {}, {
|
|
231
|
+
label: (0, _helpers__.truncateAtPipe)(option.label)
|
|
232
|
+
}));
|
|
229
233
|
});
|
|
230
234
|
}
|
|
231
235
|
});
|
|
@@ -70,7 +70,7 @@ const VehicleData = _ref => {
|
|
|
70
70
|
isDefaultExpanded: true,
|
|
71
71
|
body: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ' ', /*#__PURE__*/_react.default.createElement("div", {
|
|
72
72
|
className: (0, _helpers__.withStyle)('col-auto col-md-12 text-center')
|
|
73
|
-
}, !isFilter && /*#__PURE__*/_react.default.createElement("img", {
|
|
73
|
+
}, !isFilter && !licensePlate && /*#__PURE__*/_react.default.createElement("img", {
|
|
74
74
|
className: (0, _helpers__.withStyle)('vehicle-data__image img-fluid rounded-1 mx-0 mb-1'),
|
|
75
75
|
src: (0, _image.getImageFromHyper)({
|
|
76
76
|
imageId: vehicleLogo
|
|
@@ -96,6 +96,7 @@ const VehicleData = _ref => {
|
|
|
96
96
|
}).map(_ref3 => {
|
|
97
97
|
let [key, value] = _ref3;
|
|
98
98
|
if (!value) return null;
|
|
99
|
+
const displayValue = key === 'model' ? (0, _helpers__.truncateAtPipe)(value) : value;
|
|
99
100
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
100
101
|
key: key + value,
|
|
101
102
|
className: (0, _helpers__.withStyle)('d-flex align-items-center justify-content-between')
|
|
@@ -106,7 +107,7 @@ const VehicleData = _ref => {
|
|
|
106
107
|
fontSize: '14px'
|
|
107
108
|
},
|
|
108
109
|
className: "text-truncate"
|
|
109
|
-
},
|
|
110
|
+
}, displayValue));
|
|
110
111
|
})
|
|
111
112
|
});
|
|
112
113
|
};
|
|
@@ -29,6 +29,7 @@ var _OrderSessionContext = require("../../__context__/OrderSessionContext");
|
|
|
29
29
|
var _useIsSingleOrder = _interopRequireDefault(require("../../__hooks__/useIsSingleOrder"));
|
|
30
30
|
var _useIsTmg = require("../../__hooks__/useIsTmg");
|
|
31
31
|
var _LocalStorageWorker = require("../../__services__/LocalStorageWorker");
|
|
32
|
+
var _OrderTypeSelectorModal = _interopRequireWildcard(require("./OrderTypeSelectorModal"));
|
|
32
33
|
function _interopRequireDefault(e) {
|
|
33
34
|
return e && e.__esModule ? e : {
|
|
34
35
|
default: e
|
|
@@ -247,7 +248,8 @@ const InternalBranchSelectorModal = () => {
|
|
|
247
248
|
}, [branchTypes, authSession]);
|
|
248
249
|
const [{
|
|
249
250
|
selectedBranch,
|
|
250
|
-
existingDossierId
|
|
251
|
+
existingDossierId,
|
|
252
|
+
orderType
|
|
251
253
|
}, dispatch] = (0, _OrderSessionContext.useOrderSession)();
|
|
252
254
|
const {
|
|
253
255
|
myBranches,
|
|
@@ -265,15 +267,20 @@ const InternalBranchSelectorModal = () => {
|
|
|
265
267
|
}
|
|
266
268
|
});
|
|
267
269
|
};
|
|
268
|
-
const shouldShowModalForSingleOrder = APP_CONFIG.internal &&
|
|
269
|
-
const shouldShowModalForOtherPages = APP_CONFIG.internal &&
|
|
270
|
+
const shouldShowModalForSingleOrder = APP_CONFIG.internal && !selectedBranch && !existingDossierId && isSingleOrderPage;
|
|
271
|
+
const shouldShowModalForOtherPages = APP_CONFIG.internal && !selectedBranch && !existingDossierId && !isSingleOrderPage && !isTMGOrganization && !shouldAutoSelect && !isLoadingMyBranches;
|
|
270
272
|
if (isLoadingBranchTypes || isLoadingMyBranches) {
|
|
271
273
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
272
274
|
className: "thm-configurator-wrapper--offset"
|
|
273
275
|
}, /*#__PURE__*/_react.default.createElement(_FullPageSpinner.default, null));
|
|
274
276
|
}
|
|
277
|
+
if ((shouldShowModalForSingleOrder || shouldShowModalForOtherPages) && isTMGOrganization && formula === _constants__.CONFIGURATOR_FORMULAS.TMG && !orderType) {
|
|
278
|
+
return /*#__PURE__*/_react.default.createElement(_OrderTypeSelectorModal.default, {
|
|
279
|
+
isOpen: true
|
|
280
|
+
});
|
|
281
|
+
}
|
|
275
282
|
return /*#__PURE__*/_react.default.createElement(_Modal.default, {
|
|
276
|
-
isOpen: shouldShowModalForSingleOrder || shouldShowModalForOtherPages,
|
|
283
|
+
isOpen: (shouldShowModalForSingleOrder || shouldShowModalForOtherPages) && !(isTMGOrganization && orderType === _OrderTypeSelectorModal.ORDER_TYPES.ONLINE),
|
|
277
284
|
title: 'Kies een vestiging:',
|
|
278
285
|
size: "wide",
|
|
279
286
|
hasSecondaryButton: false,
|
|
@@ -6,6 +6,7 @@ require("core-js/modules/es.object.from-entries.js");
|
|
|
6
6
|
require("core-js/modules/es.regexp.exec.js");
|
|
7
7
|
require("core-js/modules/es.regexp.to-string.js");
|
|
8
8
|
require("core-js/modules/es.string.replace.js");
|
|
9
|
+
require("core-js/modules/es.string.trim.js");
|
|
9
10
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
10
11
|
require("core-js/modules/esnext.iterator.filter.js");
|
|
11
12
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
@@ -15,13 +16,14 @@ require("core-js/modules/web.dom-collections.iterator.js");
|
|
|
15
16
|
Object.defineProperty(exports, "__esModule", {
|
|
16
17
|
value: true
|
|
17
18
|
});
|
|
18
|
-
exports.withStyle = exports.removeNullishProps = exports.reduceYupErrorsToObject = exports.pushToDataLayer = exports.parseJson = exports.parseDateAndTimeToTimestamp = exports.parseArrayToInputOptions = exports.normalizeArray = exports.groupByKey = exports.formatPrice = exports.formatMontageTime = exports.createSlug = void 0;
|
|
19
|
+
exports.withStyle = exports.truncateAtPipe = exports.removeNullishProps = exports.reduceYupErrorsToObject = exports.pushToDataLayer = exports.parseJson = exports.parseDateAndTimeToTimestamp = exports.parseArrayToInputOptions = exports.normalizeArray = exports.groupByKey = exports.formatPrice = exports.formatMontageTime = exports.createSlug = void 0;
|
|
19
20
|
require("core-js/modules/es.array.reduce.js");
|
|
20
21
|
require("core-js/modules/es.json.stringify.js");
|
|
21
22
|
require("core-js/modules/es.object.from-entries.js");
|
|
22
23
|
require("core-js/modules/es.regexp.exec.js");
|
|
23
24
|
require("core-js/modules/es.regexp.to-string.js");
|
|
24
25
|
require("core-js/modules/es.string.replace.js");
|
|
26
|
+
require("core-js/modules/es.string.trim.js");
|
|
25
27
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
26
28
|
require("core-js/modules/esnext.iterator.filter.js");
|
|
27
29
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
@@ -193,9 +195,19 @@ const parseArrayToInputOptions = exports.parseArrayToInputOptions = function par
|
|
|
193
195
|
}));
|
|
194
196
|
};
|
|
195
197
|
|
|
198
|
+
/**
|
|
199
|
+
* @description Truncates a string at the first '|' character
|
|
200
|
+
* Example: "Q4 (F4B) | Other text" => "Q4 (F4B)"
|
|
201
|
+
*/
|
|
202
|
+
const truncateAtPipe = value => {
|
|
203
|
+
if (!value || typeof value !== 'string') return value;
|
|
204
|
+
return value.split('|')[0].trim();
|
|
205
|
+
};
|
|
206
|
+
|
|
196
207
|
/**
|
|
197
208
|
* @description Parses a string into JSON object, returns null on error
|
|
198
209
|
*/
|
|
210
|
+
exports.truncateAtPipe = truncateAtPipe;
|
|
199
211
|
const parseJson = string => {
|
|
200
212
|
try {
|
|
201
213
|
return JSON.parse(string);
|