@threekit-tools/treble 0.0.60 → 0.0.61

package/dist/store/treble.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reloadPlayer = exports.unloadPlayer = exports.launch = exports.initPlayer = exports.getPlayerElementId = exports.isPlayerLoading = exports.isThreekitInitialized = exports.reloadTreble = exports.setPlayerElement = exports.setPlayerLoading = exports.setThreekitInitialized = void 0;
+exports.reloadPlayer = exports.unloadPlayer = exports.launch = exports.initPlayer = exports.getPlayerElementId = exports.isPlayerLoading = exports.isThreekitInitialized = exports.getThreekitEnv = exports.reloadTreble = exports.setPlayerElement = exports.setPlayerLoading = exports.setThreekitInitialized = exports.setThreekitEnv = void 0;
 var connection_1 = __importDefault(require("../connection"));
 var toolkit_1 = require("@reduxjs/toolkit");
 var api_1 = __importDefault(require("../api"));
@@ -98,6 +98,7 @@ var EVENTS = {};
  * State
  ****************************************************/
 var initialState = {
+    threekitEnv: 'preview',
     isThreekitInitialized: false,
     isPlayerLoading: false,
     playerElId: undefined,
@@ -106,6 +107,7 @@ var initialState = {
 /*****************************************************
  * Actions
  ****************************************************/
+exports.setThreekitEnv = (0, toolkit_1.createAction)('treble/set-threekit-env');
 exports.setThreekitInitialized = (0, toolkit_1.createAction)('treble/set-threekit-initialized');
 exports.setPlayerLoading = (0, toolkit_1.createAction)('treble/set-player-loading');
 exports.setPlayerElement = (0, toolkit_1.createAction)('treble/set-player-element');
@@ -118,6 +120,10 @@ var reducer = (0, toolkit_1.createSlice)({
     initialState: initialState,
     reducers: {},
     extraReducers: function (builder) {
+        builder.addCase(exports.setThreekitEnv, function (state, action) {
+            state.threekitEnv = action.payload;
+            return state;
+        });
         builder.addCase(exports.setThreekitInitialized, function (state, action) {
             state.isThreekitInitialized = action.payload;
             return state;
@@ -139,6 +145,11 @@ var reducer = (0, toolkit_1.createSlice)({
  * Standard Selectors
  ****************************************************/
 //  Loading Trackers
+var getThreekitEnv = function (state) {
+    return state.treble.threekitEnv;
+};
+exports.getThreekitEnv = getThreekitEnv;
+//  Loading Trackers
 var isThreekitInitialized = function (state) {
     return state.treble.isThreekitInitialized;
 };
@@ -197,41 +208,67 @@ var initPlayer = function (config) { return function (dispatch) { return __await
 exports.initPlayer = initPlayer;
 var launch = function (launchConfig) {
     return function (dispatch) { return __awaiter(void 0, void 0, void 0, function () {
-        var config, credentials, products, threekitEnv, serverUrl, playerConfig, envCredentials, product, threekitDomainRaw, orgId, authToken, initialConfigurationRaw, assetId, stageId, configurationId, el, threekitDomain, initialConfiguration, updatedAssetId, params, configId, configuration;
-        var _a, _b, _c, _d, _e, _f;
-        return __generator(this, function (_g) {
-            switch (_g.label) {
+        var config, productId, credentials, productsRaw, products, threekitEnv, serverUrl, playerConfig, envCredentials, _a, assetId, stageId, configurationId, initialConfigurationRaw, threekitDomainRaw, orgId, authToken, el, threekitDomain, initialConfiguration, updatedAssetId, params, configId, configuration;
+        var _b, _c, _d, _e, _f, _g, _h;
+        return __generator(this, function (_j) {
+            switch (_j.label) {
                 case 0:
                     if (window.threekit)
                         return [2 /*return*/];
                     config = (0, utils_1.loadTrebleConfig)();
-                    credentials = Object.assign({}, ((_a = config.project) === null || _a === void 0 ? void 0 : _a.credentials) || {}, ((_b = launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.project) === null || _b === void 0 ? void 0 : _b.credentials) || {});
-                    products = Object.assign({}, ((_c = config.project) === null || _c === void 0 ? void 0 : _c.products) || {}, ((_d = launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.project) === null || _d === void 0 ? void 0 : _d.products) || {});
+                    credentials = ((_b = launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.project) === null || _b === void 0 ? void 0 : _b.credentials) || ((_c = config.project) === null || _c === void 0 ? void 0 : _c.credentials) || {};
+                    productsRaw = ((_d = launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.project) === null || _d === void 0 ? void 0 : _d.products) || ((_e = config.project) === null || _e === void 0 ? void 0 : _e.products) || {};
+                    if (!((_f = launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.productId) === null || _f === void 0 ? void 0 : _f.length)) {
+                        productsRaw = { default: productsRaw };
+                        productId = 'default';
+                    }
+                    else
+                        productId = launchConfig.productId;
+                    products = Object.entries(productsRaw).reduce(function (output, _a) {
+                        var _b;
+                        var prodId = _a[0], envs = _a[1];
+                        var updatedEnvs = Object.entries(envs).reduce(function (result, _a) {
+                            var _b;
+                            var env = _a[0], conf = _a[1];
+                            var initialConfiguration;
+                            var assetId;
+                            var stageId;
+                            var configurationId;
+                            if (typeof conf === 'string') {
+                                if ((0, utils_1.isUuid)(conf))
+                                    assetId = conf;
+                                else
+                                    configurationId = conf;
+                            }
+                            else {
+                                stageId = conf.stageId;
+                                if (conf.configurationId)
+                                    configurationId = conf.configurationId;
+                                else if ((0, utils_1.isUuid)(conf.assetId))
+                                    assetId = conf.assetId;
+                                else
+                                    configurationId = conf.assetId;
+                            }
+                            return Object.assign(result, (_b = {},
+                                _b[env] = {
+                                    assetId: assetId,
+                                    stageId: stageId,
+                                    configurationId: configurationId,
+                                    initialConfiguration: initialConfiguration,
+                                },
+                                _b));
+                        }, {});
+                        return Object.assign(output, (_b = {}, _b[prodId] = updatedEnvs, _b));
+                    }, {});
                     if (!Object.keys(credentials).length || !Object.keys(products).length)
                         return [2 /*return*/, console.error('Missing credentials')];
                     threekitEnv = (launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.threekitEnv) || process.env.THREEKIT_ENV || 'preview';
-                    serverUrl = (launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.serverUrl) || ((_e = config === null || config === void 0 ? void 0 : config.project) === null || _e === void 0 ? void 0 : _e.serverUrl);
-                    (launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.threekitEnv) || process.env.THREEKIT_ENV || 'preview';
+                    serverUrl = (launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.serverUrl) || ((_g = config === null || config === void 0 ? void 0 : config.project) === null || _g === void 0 ? void 0 : _g.serverUrl);
                     playerConfig = Object.assign({}, constants_1.DEFAULT_PLAYER_CONFIG, config.player, launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.playerConfig);
                     envCredentials = credentials[threekitEnv];
-                    product = products[threekitEnv];
+                    _a = products[productId][threekitEnv], assetId = _a.assetId, stageId = _a.stageId, configurationId = _a.configurationId, initialConfigurationRaw = _a.initialConfiguration;
                     threekitDomainRaw = envCredentials.threekitDomain || "".concat(threekitEnv, ".threekit.com");
                     orgId = envCredentials.orgId, authToken = envCredentials.publicToken;
-                    if (typeof product === 'string') {
-                        if ((0, utils_1.isUuid)(product))
-                            assetId = product;
-                        else
-                            configurationId = product;
-                    }
-                    else {
-                        stageId = product.stageId;
-                        if (product.configurationId)
-                            configurationId = product.configurationId;
-                        else if ((0, utils_1.isUuid)(product.assetId))
-                            assetId = product.assetId;
-                        else
-                            configurationId = product.assetId;
-                    }
                     if (playerConfig.elementId) {
                         el = document.getElementById(playerConfig.elementId);
                         if (el)
@@ -253,19 +290,19 @@ var launch = function (launchConfig) {
                     initialConfiguration = __assign({}, initialConfigurationRaw);
                     updatedAssetId = assetId;
                     params = (0, utils_1.getParams)();
-                    configId = ((_f = params[constants_1.TK_SAVED_CONFIG_PARAM_KEY]) === null || _f === void 0 ? void 0 : _f.length)
+                    configId = ((_h = params[constants_1.TK_SAVED_CONFIG_PARAM_KEY]) === null || _h === void 0 ? void 0 : _h.length)
                         ? params[constants_1.TK_SAVED_CONFIG_PARAM_KEY]
                         : configurationId;
                     if (!configId) return [3 /*break*/, 2];
                     return [4 /*yield*/, api_1.default.configurations.fetch(configId)];
                 case 1:
-                    configuration = _g.sent();
+                    configuration = _j.sent();
                     if (configuration) {
                         initialConfiguration = Object.assign({}, initialConfigurationRaw, configuration.data.variant);
                         connection_1.default.connect({ assetId: configuration.data.productId });
                         updatedAssetId = configuration.data.productId;
                     }
-                    _g.label = 2;
+                    _j.label = 2;
                 case 2:
                     if (!updatedAssetId)
                         return [2 /*return*/, console.error('missing assetId')];
@@ -279,7 +316,7 @@ var launch = function (launchConfig) {
                         })];
                 case 3:
                     //  We create the threekit script
-                    _g.sent();
+                    _j.sent();
                     return [4 /*yield*/, dispatch((0, exports.initPlayer)({
                             el: el,
                             orgId: orgId,
@@ -290,15 +327,17 @@ var launch = function (launchConfig) {
                             initialConfiguration: initialConfiguration,
                         }))];
                 case 4:
-                    _g.sent();
+                    _j.sent();
                     document.addEventListener('treble:notification', function (e) {
                         message_1.default.info(e.detail.message);
                     });
                     EVENTS = Object.assign(EVENTS, launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.eventHandlers);
+                    dispatch((0, exports.setThreekitEnv)(threekitEnv));
                     dispatch((0, translations_1.initTranslations)(launchConfig === null || launchConfig === void 0 ? void 0 : launchConfig.locale));
                     dispatch((0, price_1.initPrice)());
                     dispatch((0, price_1.updatePrice)());
                     dispatch((0, product_1.initProduct)(products));
+                    dispatch((0, product_1.setProductId)(productId));
                     dispatch((0, wishlist_1.refreshWishlist)());
                     return [2 /*return*/];
             }

package/dist/utils.d.ts

@@ -1,6 +1,7 @@
-import { IThreekitCamera, IConfigurationColor, ICoordinates, IQuaternion, IThreekitDisplayAttribute } from './threekit';
+import { IThreekitCamera, IConfigurationColor, ICoordinates, IQuaternion, IThreekitDisplayAttribute, ISetConfiguration, IHydratedAttribute } from './threekit';
 import { ITrebleConfig, IAttributeTypes } from './threekit';
 import { RawAttributeValue } from './hooks/useAttribute';
+import { ITranslationMap } from './api/products';
 interface ICameraPosition {
     position: ICoordinates;
     quaternion: IQuaternion;
@@ -46,6 +47,11 @@ export declare const downloadSnapshot: (snapshot: string, filename: string) => P
 export declare const copyToClipboard: (data: string | Record<string, string | number | boolean>) => void;
 export declare const easeInOutCubic: (val: number) => number;
 export declare const metadataValueToObject: (data: string) => Record<string, string | number>;
+export declare const hydrateAttribute: (data: [
+    Record<string, IThreekitDisplayAttribute>,
+    undefined | ITranslationMap,
+    undefined | string
+], optionSelectionHandler: (config: ISetConfiguration) => Promise<void>) => Record<string, IHydratedAttribute>;
 export declare const selectionToConfiguration: (value: RawAttributeValue, attributeType: IAttributeTypes) => string | number | boolean | File | IConfigurationColor | {
     assetId: RawAttributeValue;
 } | undefined;

package/dist/utils.js

@@ -45,7 +45,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTrebleConfig = exports.isUuid = exports.filterFormAttributes = exports.selectionToConfiguration = exports.metadataValueToObject = exports.easeInOutCubic = exports.copyToClipboard = exports.downloadSnapshot = exports.dataURItoFile = exports.dataURItoBlob = exports.setCameraPosition = exports.getCameraPosition = exports.findHitNode = exports.deflateRgb = exports.inflateRgb = exports.rgbToHex = exports.hexToRgb = exports.regularToKebabCase = exports.deepCompare = exports.shallowCompare = exports.getResumableUrl = exports.getParams = exports.objectToQueryStr = exports.isJsonString = exports.generateFormClassName = exports.generateDisplayClassName = exports.generateToolClassName = exports.generateLayoutClassName = exports.generateWidgetClassName = exports.generateInputClassName = exports.generateClassName = void 0;
+exports.loadTrebleConfig = exports.isUuid = exports.filterFormAttributes = exports.selectionToConfiguration = exports.hydrateAttribute = exports.metadataValueToObject = exports.easeInOutCubic = exports.copyToClipboard = exports.downloadSnapshot = exports.dataURItoFile = exports.dataURItoBlob = exports.setCameraPosition = exports.getCameraPosition = exports.findHitNode = exports.deflateRgb = exports.inflateRgb = exports.rgbToHex = exports.hexToRgb = exports.regularToKebabCase = exports.deepCompare = exports.shallowCompare = exports.getResumableUrl = exports.getParams = exports.objectToQueryStr = exports.isJsonString = exports.generateFormClassName = exports.generateDisplayClassName = exports.generateToolClassName = exports.generateLayoutClassName = exports.generateWidgetClassName = exports.generateInputClassName = exports.generateClassName = void 0;
 var constants_1 = require("./constants");
 var generateClassName = function (baseClass) {
     return function (component, customClassName, title) {
@@ -309,6 +309,58 @@ var metadataValueToObject = function (data) {
     }, {});
 };
 exports.metadataValueToObject = metadataValueToObject;
+var hydrateAttribute = function (data, optionSelectionHandler) {
+    var attributes = data[0], translations = data[1], language = data[2];
+    var hasTranslation = !!language && !!translations;
+    return Object.values(attributes).reduce(function (output, attribute) {
+        var _a;
+        var _b;
+        return Object.assign(output, (_a = {},
+            _a[attribute.name] = Object.assign({}, attribute, {
+                label: hasTranslation
+                    ? ((_b = translations === null || translations === void 0 ? void 0 : translations[attribute.name]) === null || _b === void 0 ? void 0 : _b[language]) || attribute.name
+                    : attribute.name,
+            }, attribute.type === 'String'
+                ? {
+                    values: attribute.values.map(function (el) {
+                        var _a;
+                        return Object.assign({}, el, {
+                            label: hasTranslation
+                                ? ((_a = translations === null || translations === void 0 ? void 0 : translations[el.label]) === null || _a === void 0 ? void 0 : _a[language]) || el.label
+                                : el.label,
+                            handleSelect: function () {
+                                var _a;
+                                return optionSelectionHandler((_a = {},
+                                    _a[attribute.name] = el.value,
+                                    _a));
+                            },
+                            selected: attribute.value === el.value,
+                        });
+                    }),
+                }
+                : attribute.type === 'Asset'
+                    ? {
+                        values: attribute.values.map(function (el) {
+                            var _a;
+                            return Object.assign({}, el, {
+                                label: hasTranslation
+                                    ? ((_a = translations === null || translations === void 0 ? void 0 : translations[el.name]) === null || _a === void 0 ? void 0 : _a[language]) || el.name
+                                    : el.name,
+                                handleSelect: function () {
+                                    var _a;
+                                    return optionSelectionHandler((_a = {},
+                                        _a[attribute.name] = { assetId: el.assetId },
+                                        _a));
+                                },
+                                selected: attribute.value.assetId === el.assetId,
+                            });
+                        }),
+                    }
+                    : undefined),
+            _a));
+    }, {});
+};
+exports.hydrateAttribute = hydrateAttribute;
 var selectionToConfiguration = function (value, attributeType) {
     switch (attributeType) {
         case constants_1.ATTRIBUTE_TYPES.number:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threekit-tools/treble",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "author": "Amaan Saeed",
   "license": "MIT",
   "files": [