drapcode-utility 1.0.8 → 1.1.0

package/build/format-fields/index.js

@@ -26,7 +26,7 @@ var formatField = function (itemData, fields) {
     return newItemData;
 };
 var getFormatFieldData = function (fieldData, fieldType) {
-    var createdAt = drapcode_constant_1.FieldTypes.createdAt, text = drapcode_constant_1.FieldTypes.text, large_text = drapcode_constant_1.FieldTypes.large_text, date = drapcode_constant_1.FieldTypes.date, password = drapcode_constant_1.FieldTypes.password, uuid = drapcode_constant_1.FieldTypes.uuid, custom_uuid = drapcode_constant_1.FieldTypes.custom_uuid, email = drapcode_constant_1.FieldTypes.email, url = drapcode_constant_1.FieldTypes.url, number = drapcode_constant_1.FieldTypes.number, unix_timestamp = drapcode_constant_1.FieldTypes.unix_timestamp, reference = drapcode_constant_1.FieldTypes.reference, belongsTo = drapcode_constant_1.FieldTypes.belongsTo, multi_reference = drapcode_constant_1.FieldTypes.multi_reference, dynamic_option = drapcode_constant_1.FieldTypes.dynamic_option, static_option = drapcode_constant_1.FieldTypes.static_option, boolean = drapcode_constant_1.FieldTypes.boolean, time_slot = drapcode_constant_1.FieldTypes.time_slot, slug = drapcode_constant_1.FieldTypes.slug, json = drapcode_constant_1.FieldTypes.json;
+    var createdAt = drapcode_constant_1.FieldTypes.createdAt, text = drapcode_constant_1.FieldTypes.text, large_text = drapcode_constant_1.FieldTypes.large_text, date = drapcode_constant_1.FieldTypes.date, password = drapcode_constant_1.FieldTypes.password, uuid = drapcode_constant_1.FieldTypes.uuid, custom_uuid = drapcode_constant_1.FieldTypes.custom_uuid, email = drapcode_constant_1.FieldTypes.email, url = drapcode_constant_1.FieldTypes.url, number = drapcode_constant_1.FieldTypes.number, unix_timestamp = drapcode_constant_1.FieldTypes.unix_timestamp, reference = drapcode_constant_1.FieldTypes.reference, belongsTo = drapcode_constant_1.FieldTypes.belongsTo, multi_reference = drapcode_constant_1.FieldTypes.multi_reference, dynamic_option = drapcode_constant_1.FieldTypes.dynamic_option, static_option = drapcode_constant_1.FieldTypes.static_option, boolean = drapcode_constant_1.FieldTypes.boolean, time_slot = drapcode_constant_1.FieldTypes.time_slot, slug = drapcode_constant_1.FieldTypes.slug, json = drapcode_constant_1.FieldTypes.json, markdown = drapcode_constant_1.FieldTypes.markdown;
     var stringType = [
         createdAt.id,
         text.id,
@@ -40,6 +40,7 @@ var getFormatFieldData = function (fieldData, fieldType) {
         time_slot.id,
         slug.id,
         json.id,
+        markdown.id,
     ];
     var numberType = [number.id, unix_timestamp.id];
     var arrayType = [

package/build/utils/util.d.ts

@@ -20,7 +20,7 @@ export declare const arraysEqual: (array1: any, array2: any) => boolean;
 export declare const convertItemToArray: (itemValue: any) => any[];
 export declare const validateAlphanumericString: (str: string) => false | "String should contain only numbers and letters";
 export declare const formatCustomCSSClasses: (projectCustomCSSClasses: any) => string;
-export declare const replaceDataValueIntoExpression: (expression: string, data: any, user: any, sessionValue: any, envConstants: any, sessionFormValue: any) => string;
+export declare const replaceDataValueIntoExpression: (expression: string, data: any, user: any, tenant: any, sessionValue: any, envConstants: any, sessionFormValue: any) => string;
 export declare const parseJsonString: (str: string) => any;
 export declare const parseValueFromData: (data: any, fieldName: string) => any;
 export declare const unflattenObject: (obj: any) => {};

package/build/utils/util.js

@@ -248,7 +248,7 @@ var formatCustomCSSClasses = function (projectCustomCSSClasses) {
     return projectCustomCSSClassesData;
 };
 exports.formatCustomCSSClasses = formatCustomCSSClasses;
-var replaceDataValueIntoExpression = function (expression, data, user, sessionValue, envConstants, sessionFormValue) {
+var replaceDataValueIntoExpression = function (expression, data, user, tenant, sessionValue, envConstants, sessionFormValue) {
     var _a;
     var contentList = (_a = expression
         .match(/{{(.*?)}}/g)) === null || _a === void 0 ? void 0 : _a.map(function (b) { return b.replace(/{{(.*?)}}/g, "$1"); });
@@ -261,6 +261,12 @@ var replaceDataValueIntoExpression = function (expression, data, user, sessionVa
                 dataOfItem = exports.parseValueFromData(user, prop);
             }
         }
+        else if (prop.includes("current_tenant")) {
+            prop = prop.replace("current_tenant.", "");
+            if (Object.keys(tenant).length > 0) {
+                dataOfItem = exports.parseValueFromData(tenant, prop);
+            }
+        }
         else if (prop.includes("current_session")) {
             prop = prop.replace("current_session.", "");
             if (Object.keys(sessionValue).length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",