@beseif-solutions/prow-core 0.3.11 → 0.3.13

package/dist/minified-utils/fields.d.ts

@@ -12,6 +12,7 @@ type Common = {
     as_password?: boolean;
     show?: boolean;
     show_label?: boolean;
+    t?: string;
 } & ({
     as_array?: false;
 } | {

package/dist/minified-utils/fields.js

@@ -21,6 +21,7 @@ const commonFieldSchema = () => joi_1.default.object({
     as_password: joi_1.default.bool(),
     show: joi_1.default.bool(),
     show_label: joi_1.default.bool().default(true),
+    t: joi_1.default.string(),
     as_array: joi_1.default.bool(),
     array_min: joi_1.default.when(`as_array`, {
         is: true,
@@ -101,7 +102,7 @@ const numberInputFieldSchema = () => joi_1.default.object({
     float: joi_1.default.bool(),
     decimals: joi_1.default.when(`float`, {
         is: true,
-        then: joi_1.default.number().required(),
+        then: joi_1.default.number(),
         otherwise: joi_1.default.forbidden(),
     }),
 })
@@ -318,12 +319,12 @@ const getSimpleFieldSchema = (field) => {
                 typeSchema = typeSchema.max(field.max);
             }
             if (typeof field.float === `boolean`) {
-                if (field.float) {
-                    typeSchema = typeSchema.precision(field.decimals || 2);
-                }
-                else {
+                if (!field.float) {
                     typeSchema = typeSchema.precision(0);
                 }
+                else if (field.decimals) {
+                    typeSchema = typeSchema.precision(field.decimals);
+                }
             }
             break;
         case `dict`:

package/dist/minified-utils/locales.js

@@ -93,18 +93,19 @@ const i18n = (options) => {
     }
 };
 exports.i18n = i18n;
-const localizeField = (t, element, field, parent = ``) => {
-    const key = lodash_1.default.compact([parent, field.key]).join(`.`);
-    field.label = t(`${element}.fields.${key}.label`, { fallback: true });
-    field.help = t(`${element}.fields.${key}.help`);
+const localizeField = (t, element, field, recursive = {}) => {
+    const key = lodash_1.default.compact([recursive.parent, field.key]).join(`.`);
+    const root = field.t || recursive.t || `${element}.fields`;
+    field.label = t(`${root}.${key}.label`, { fallback: true });
+    field.help = t(`${root}.${key}.help`);
     if (field.type === `dict` && field.items) {
-        field.items = field.items.map((f) => localizeField(t, element, f, `${key}.items`));
+        field.items = field.items.map((f) => localizeField(t, element, f, { parent: `${key}.items`, t: field.t }));
     }
     else if (`format` in field && field.format === `select` && lodash_1.default.isArray(field.choices)) {
         field.choices = field.choices.map((fc) => ({
             ...fc,
-            label: t(`${element}.fields.${key}.choices.${fc.key}.label`, { fallback: true }),
-            help: t(`${element}.fields.${key}.choices.${fc.key}.help`),
+            label: t(`${root}.${key}.choices.${fc.key}.label`, { fallback: true }),
+            help: t(`${root}.${key}.choices.${fc.key}.help`),
         }));
     }
     return field;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beseif-solutions/prow-core",
-  "version": "0.3.11",
+  "version": "0.3.13",
   "description": "Prow core functionalities and classes",
   "main": "dist/index.js",
   "scripts": {

package/src/minified-utils/fields.ts

@@ -17,6 +17,7 @@ type Common = {
   as_password?: boolean,
   show?: boolean,
   show_label?: boolean,
+  t?: string,
 } & ({
   as_array?: false,
 } | {
@@ -194,6 +195,7 @@ const commonFieldSchema = () =>
     as_password: Joi.bool(),
     show: Joi.bool(),
     show_label: Joi.bool().default(true),
+    t: Joi.string(),
     as_array: Joi.bool(),
     array_min: Joi.when(`as_array`, {
       is: true,
@@ -302,7 +304,7 @@ const numberInputFieldSchema = () =>
     float: Joi.bool(),
     decimals: Joi.when(`float`, {
       is: true,
-      then: Joi.number().required(),
+      then: Joi.number(),
       otherwise: Joi.forbidden(),
     }),
   })
@@ -521,10 +523,10 @@ const getSimpleFieldSchema = (field: Field) => {
       if (field.max) { typeSchema = (typeSchema as NumberSchema).max(field.max); }
       // don't check precision if float is not set
       if (typeof field.float === `boolean`) {
-        if (field.float) {
-          typeSchema = (typeSchema as NumberSchema).precision(field.decimals || 2);
-        } else {
+        if (!field.float) {
           typeSchema = (typeSchema as NumberSchema).precision(0);
+        } else if (field.decimals) {
+          typeSchema = (typeSchema as NumberSchema).precision(field.decimals);
         }
       }
 

package/src/minified-utils/locales.ts

@@ -134,19 +134,22 @@ const localizeField = (
   t: ReturnType<typeof i18n>[`t`],
   element: string,
   field: Field<LocalizedField>,
-  parent = ``,
+  recursive: { parent?: string, t?: string } = {},
 ): Field<LocalizedField> => {
-  const key = _.compact([parent, field.key]).join(`.`);
-  field.label = t(`${element}.fields.${key}.label`, { fallback: true });
-  field.help = t(`${element}.fields.${key}.help`);
+  const key = _.compact([recursive.parent, field.key]).join(`.`);
+
+  const root = field.t || recursive.t || `${element}.fields`;
+
+  field.label = t(`${root}.${key}.label`, { fallback: true });
+  field.help = t(`${root}.${key}.help`);
 
   if (field.type === `dict` && field.items) {
-    field.items = field.items.map((f) => localizeField(t, element, f, `${key}.items`));
+    field.items = field.items.map((f) => localizeField(t, element, f, { parent: `${key}.items`, t: field.t }));
   } else if (`format` in field && field.format === `select` && _.isArray(field.choices)) {
     field.choices = field.choices.map((fc: SelectFieldChoice<any, LocalizedField>) => ({
       ...fc,
-      label: t(`${element}.fields.${key}.choices.${fc.key}.label`, { fallback: true }),
-      help: t(`${element}.fields.${key}.choices.${fc.key}.help`),
+      label: t(`${root}.${key}.choices.${fc.key}.label`, { fallback: true }),
+      help: t(`${root}.${key}.choices.${fc.key}.help`),
     }));
   }