@arquimedes.co/eureka-forms 1.9.118-test → 1.9.119

package/dist/@Types/Branding.d.ts

@@ -0,0 +1,13 @@
+export interface Branding {
+    name: string;
+    images: {
+        logoUrl: string;
+        iconUrl: string;
+    };
+    colors: {
+        primaryColor: string;
+        secondaryColor: string;
+        contrastColor: string;
+        navbarColor?: string;
+    };
+}

package/dist/@Types/Branding.js

@@ -0,0 +1 @@
+export {};

package/dist/@Types/Form.d.ts

@@ -1,4 +1,5 @@
 import { FormStyleTypes, FormTypes } from '../constants/FormStepTypes';
+import { Branding } from './Branding';
 import { FormStep } from './FormStep';
 export interface Form {
     apiKey?: string;
@@ -11,6 +12,7 @@ export interface Form {
     hasCaptcha?: boolean;
     isStandAlone?: boolean;
     style?: FormStyle;
+    Branding?: Branding;
     classifiers?: Record<string, Classifier>;
     terms?: Term[];
 }

package/dist/@Types/Organization.d.ts

@@ -1,17 +1,9 @@
+import { Branding } from './Branding';
 export interface Organization {
     /** The Organization's id */
     idOrganization: string;
     /** The Organization's name */
     name: string;
-    /** The organization Logo url */
-    logoUrl: string;
-    /** The organization Favicon url */
-    iconUrl?: string;
-    mainCity?: string;
-    styles?: {
-        primaryColor: string;
-        secondaryColor: string;
-        contrastColor: string;
-        navbarColor?: string;
-    };
+    branding: Branding;
+    customBrandings: boolean;
 }

package/dist/App.js

@@ -76,6 +76,7 @@ function App(_a) {
     var _g = useState(undefined), form = _g[0], setForm = _g[1];
     var _h = useState({}), originalValues = _h[0], setOriginalValues = _h[1];
     var _j = useState(undefined), organizationInfo = _j[0], setOrganizationInfo = _j[1];
+    var _k = useState(), branding = _k[0], setBranding = _k[1];
     var migrateFormData = function (formData, valuesData) {
         var form = migrateForm(formData, classifiers);
         var steps = Object.values(form.steps);
@@ -100,6 +101,9 @@ function App(_a) {
                     case 1:
                         response = _a.sent();
                         if (response.data) {
+                            if (!response.data.customBrandings) {
+                                setBranding(response.data.branding);
+                            }
                             setOrganizationInfo(response.data);
                             migrateFormData(formData, valuesData);
                         }
@@ -115,6 +119,7 @@ function App(_a) {
             }
             else {
                 migrateFormData(__assign({}, formData), valuesData);
+                setBranding(undefined);
                 setOrganizationInfo(null);
             }
         }
@@ -132,6 +137,7 @@ function App(_a) {
             console.error('ERROREMBED');
             //Error in embed
             setForm(null);
+            setBranding(undefined);
             setOrganizationInfo(null);
         }
     }, []);
@@ -190,25 +196,27 @@ function App(_a) {
                 case 4:
                     response = _a;
                     if (response === null || response === void 0 ? void 0 : response.data) {
-                        if (response === null || response === void 0 ? void 0 : response.data) {
-                            // document.title = currentOrg.name;
-                            // const favicon: any = document.getElementById('favicon');
-                            // if (favicon !== undefined) {
-                            //     favicon.href = currentOrg.partialLogoUrl;
-                            // }
-                            //TODO cambiar el color del navbar en movil
-                            // eslint-disable-next-line no-console
-                            console.log(response === null || response === void 0 ? void 0 : response.data);
-                            setOrganizationInfo(response === null || response === void 0 ? void 0 : response.data);
-                        }
-                        else {
-                            setOrganizationInfo(null);
+                        // document.title = currentOrg.name;
+                        // const favicon: any = document.getElementById('favicon');
+                        // if (favicon !== undefined) {
+                        //     favicon.href = currentOrg.partialLogoUrl;
+                        // }
+                        //TODO cambiar el color del navbar en movil
+                        // eslint-disable-next-line no-console
+                        setOrganizationInfo(response === null || response === void 0 ? void 0 : response.data);
+                        if (!response.data.customBrandings) {
+                            setBranding(response === null || response === void 0 ? void 0 : response.data.branding);
                         }
                     }
+                    else {
+                        setBranding(undefined);
+                        setOrganizationInfo(null);
+                    }
                     return [3 /*break*/, 6];
                 case 5:
                     error_2 = _b.sent();
                     console.error(error_2);
+                    setBranding(undefined);
                     setOrganizationInfo(null);
                     return [3 /*break*/, 6];
                 case 6: return [2 /*return*/];
@@ -227,6 +235,8 @@ function App(_a) {
                 case 1:
                     response = _a.sent();
                     if (response) {
+                        if (response.data.branding)
+                            setBranding(response.data.branding);
                         migrateFormData(response.data, valuesData);
                     }
                     return [3 /*break*/, 3];
@@ -241,9 +251,9 @@ function App(_a) {
     }); };
     if (form === undefined || organizationInfo === undefined) {
         if (isWidget) {
-            return (_jsx("div", __assign({ className: styles.widgetContainer }, { children: _jsx("div", __assign({ className: styles.curtain }, { children: _jsx(Loader, { size: 50, color: (_c = (_b = organizationInfo === null || organizationInfo === void 0 ? void 0 : organizationInfo.styles) === null || _b === void 0 ? void 0 : _b.primaryColor) !== null && _c !== void 0 ? _c : '#b8b8b8' }) })) })));
+            return (_jsx("div", __assign({ className: styles.widgetContainer }, { children: _jsx("div", __assign({ className: styles.curtain }, { children: _jsx(Loader, { size: 50, color: (_c = (_b = branding === null || branding === void 0 ? void 0 : branding.colors) === null || _b === void 0 ? void 0 : _b.primaryColor) !== null && _c !== void 0 ? _c : '#b8b8b8' }) })) })));
         }
-        return (_jsx("div", __assign({ className: styles.curtain }, { children: _jsx(Loader, { size: 50, color: (_e = (_d = organizationInfo === null || organizationInfo === void 0 ? void 0 : organizationInfo.styles) === null || _d === void 0 ? void 0 : _d.primaryColor) !== null && _e !== void 0 ? _e : '#b8b8b8' }) })));
+        return (_jsx("div", __assign({ className: styles.curtain }, { children: _jsx(Loader, { size: 50, color: (_e = (_d = branding === null || branding === void 0 ? void 0 : branding.colors) === null || _d === void 0 ? void 0 : _d.primaryColor) !== null && _e !== void 0 ? _e : '#b8b8b8' }) })));
     }
     else if (form === null) {
         if (organizationInfo === null) {
@@ -260,7 +270,7 @@ function App(_a) {
         }
     }
     else {
-        return (_jsx("div", __assign({ ref: containerRef, className: styles.container }, { children: _jsx(FormComponent, __assign({}, others, { form: form, reload: function () {
+        return (_jsx("div", __assign({ ref: containerRef, className: styles.container }, { children: _jsx(FormComponent, __assign({}, others, { form: form, branding: branding, reload: function () {
                     var tempForm = __assign({}, form);
                     setForm(undefined);
                     setTimeout(function () {

package/dist/FormComponents/Form/Form.d.ts

@@ -2,6 +2,7 @@
 import { Organization } from '../../@Types/@Types';
 import { Form, FormStyle } from '../../@Types/Form';
 import { CustomStep } from '../../App';
+import { Branding } from '../../@Types/Branding';
 export declare const getLocale: () => any;
 export interface WidthStats {
     currentBreakPoint: number;
@@ -11,6 +12,7 @@ export interface WidthStats {
 export interface FormComponentProps {
     form: Form;
     organization: Organization;
+    branding?: Branding;
     originalValues: Record<string, unknown>;
     customSteps: Record<string, CustomStep>;
     customStepProps: Record<string, any>;
@@ -34,7 +36,7 @@ export interface FormComponentProps {
     /** The custom send label to display */
     sendLabel?: string;
 }
-declare function FormComponent({ form, isWidget, internal, postview, organization, containerRef, ...others }: Omit<FormComponentProps, 'widthStats' | 'formStyle' | 'handleLoaded'> & {
+declare function FormComponent({ form, isWidget, internal, postview, branding, organization, containerRef, ...others }: Omit<FormComponentProps, 'widthStats' | 'formStyle' | 'handleLoaded'> & {
     containerRef: any;
     organization: Organization | null;
     isWidget: boolean;

package/dist/FormComponents/Form/Form.js

@@ -49,7 +49,7 @@ export var getLocale = function () {
 };
 function FormComponent(_a) {
     var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    var form = _a.form, isWidget = _a.isWidget, internal = _a.internal, postview = _a.postview, organization = _a.organization, containerRef = _a.containerRef, others = __rest(_a, ["form", "isWidget", "internal", "postview", "organization", "containerRef"]);
+    var form = _a.form, isWidget = _a.isWidget, internal = _a.internal, postview = _a.postview, branding = _a.branding, organization = _a.organization, containerRef = _a.containerRef, others = __rest(_a, ["form", "isWidget", "internal", "postview", "branding", "organization", "containerRef"]);
     var _p = useState(false), loaded = _p[0], setLoaded = _p[1];
     var _q = useState(undefined), widthStats = _q[0], setWidthStats = _q[1];
     /** Calcs the currentBreakPoint and if is mobile */
@@ -92,22 +92,22 @@ function FormComponent(_a) {
                     ? 'transparent'
                     : (_d = (_c = form.style) === null || _c === void 0 ? void 0 : _c.backgroundColor) !== null && _d !== void 0 ? _d : InternalFormStyle.backgroundColor,
                 minHeight: form.isStandAlone && !isWidget ? '100vh' : '100%',
-            } }, { children: _jsx("div", __assign({ className: styles.widgetFormContainer, ref: containerRef }, { children: _jsx(FormTypeComponent, __assign({}, others, { handleLoaded: function () {
+            } }, { children: _jsx("div", __assign({ className: styles.widgetFormContainer, ref: containerRef }, { children: _jsx(FormTypeComponent, __assign({}, others, { branding: branding, handleLoaded: function () {
                         setLoaded(true);
                     }, widthStats: widthStats, form: form, internal: internal, postview: postview, organization: organization, formStyle: internal
                         ? InternalFormStyle
                         : __assign(__assign({}, InternalFormStyle), ((_e = form.style) !== null && _e !== void 0 ? _e : {})) })) })) })));
     }
-    else if (organization && widthStats !== undefined) {
+    else if (organization && branding && widthStats !== undefined) {
         //Standalone cant have widget
-        return (_jsxs(React.Fragment, { children: [_jsx(Navbar, { logo: organization.logoUrl, color: (_g = (_f = organization.styles) === null || _f === void 0 ? void 0 : _f.navbarColor) !== null && _g !== void 0 ? _g : (_h = organization.styles) === null || _h === void 0 ? void 0 : _h.primaryColor }), _jsx("div", __assign({ className: styles.standAloneFormContainer, ref: containerRef, style: {
+        return (_jsxs(React.Fragment, { children: [_jsx(Navbar, { logo: branding.images.logoUrl, color: (_g = (_f = branding.colors) === null || _f === void 0 ? void 0 : _f.navbarColor) !== null && _g !== void 0 ? _g : (_h = branding.colors) === null || _h === void 0 ? void 0 : _h.primaryColor }), _jsx("div", __assign({ className: styles.standAloneFormContainer, ref: containerRef, style: {
                         background: (_k = (_j = form.style) === null || _j === void 0 ? void 0 : _j.standAloneBackgroundColor) !== null && _k !== void 0 ? _k : '#ffffff',
                     } }, { children: _jsx("div", __assign({ className: widthStats.isResponsive
                             ? styles.fullScreenStandAloneForm
                             : styles.standAloneFormCard, style: {
                             backgroundColor: (_m = (_l = form.style) === null || _l === void 0 ? void 0 : _l.backgroundColor) !== null && _m !== void 0 ? _m : InternalFormStyle.backgroundColor,
                             visibility: loaded ? 'visible' : 'hidden',
-                        } }, { children: _jsx(FormTypeComponent, __assign({}, others, { internal: internal, postview: postview, widthStats: widthStats, form: form, formStyle: (_o = form.style) !== null && _o !== void 0 ? _o : InternalFormStyle, organization: organization, handleLoaded: function () {
+                        } }, { children: _jsx(FormTypeComponent, __assign({}, others, { branding: branding, internal: internal, postview: postview, widthStats: widthStats, form: form, formStyle: (_o = form.style) !== null && _o !== void 0 ? _o : InternalFormStyle, organization: organization, handleLoaded: function () {
                                 setLoaded(true);
                             } })) })) }))] }));
     }

package/dist/FormComponents/Step/AYFStepMapper.js

@@ -76,7 +76,7 @@ function AYFStepMapper(props) {
         });
     }); };
     var getCiudadesOptions = function (_a, step, dependencyStore) {
-        var idOrganization = _a.idOrganization, mainCity = _a.mainCity;
+        var idOrganization = _a.idOrganization;
         return __awaiter(_this, void 0, void 0, function () {
             var nit, params, _i, _b, dep, value, error_1;
             var _c, _d;
@@ -84,9 +84,6 @@ function AYFStepMapper(props) {
                 switch (_e.label) {
                     case 0:
                         nit = dependencyStore[step.idNitStep];
-                        if (!nit) {
-                            return [2 /*return*/, [mainCity !== null && mainCity !== void 0 ? mainCity : 'BOGOTA']];
-                        }
                         params = new URLSearchParams({
                             idOrganization: idOrganization,
                             idCompany: nit,
@@ -118,7 +115,7 @@ function AYFStepMapper(props) {
                     case 2: return [2 /*return*/, (_e.sent()).data];
                     case 3:
                         error_1 = _e.sent();
-                        return [2 /*return*/, [mainCity !== null && mainCity !== void 0 ? mainCity : 'BOGOTA']];
+                        return [2 /*return*/, null];
                     case 4: return [2 /*return*/];
                 }
             });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@arquimedes.co/eureka-forms",
     "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-    "version":"1.9.118-test",
+    "version": "1.9.119",
     "scripts": {
         "start": "react-scripts start",
         "build": "react-scripts build",