@vc-shell/framework 1.0.57 → 1.0.59

package/core/plugins/validation/rules.ts

@@ -1,44 +1,87 @@
 import { defineRule } from "vee-validate";
-import AllRules, * as veeValidate from "@vee-validate/rules";
+import AllRules from "@vee-validate/rules";
 
 Object.keys(AllRules).forEach((rule) => {
   defineRule(rule, AllRules[rule]);
 });
 
-/** @deprecated use `required` from `@vee-validate/rules` */
-export const required = veeValidate.required;
+/**
+ * Check if an image dimension larger than a given size.
+ */
+export const mindimensions = (images: HTMLInputElement, [width, height]: [string | number, string | number]) => {
+  // The field is empty so it should pass
+  if (!images?.files || !images.files?.length) {
+    return true;
+  }
 
-/** @deprecated use `min` from `@vee-validate/rules` */
-export const min = veeValidate.min;
+  const validateImage = (file: File, width: string | number, height: string | number) => {
+    const URL = window.URL || window.webkitURL;
+    return new Promise((resolve) => {
+      const image = new Image();
+      image.onerror = () => resolve(false);
+      image.onload = () => {
+        const isValid = image.width >= Number(width) && image.height >= Number(height);
+        if (isValid) {
+          resolve(true);
+        } else {
+          resolve(`Image dimensions must be greater than ${height}*${width}`);
+        }
+      };
+
+      image.src = URL.createObjectURL(file);
+    });
+  };
+  const list = [];
+  const fileList = images.files;
+  for (let i = 0; i < fileList.length; i++) {
+    if (!/\.(jpg|svg|jpeg|png|bmp|gif)$/i.test(fileList[i].name)) {
+      return Promise.resolve("Not image file");
+    }
 
-/** @deprecated use `max` from `@vee-validate/rules` */
-export const max = veeValidate.required;
+    list.push(fileList[i]);
+  }
+  return Promise.all(list.map((file) => validateImage(file, width, height))).then((res) => {
+    const isInvalid = res.find((x) => x !== true);
+    if (isInvalid === false || typeof isInvalid === "string") {
+      return isInvalid;
+    } else {
+      return true;
+    }
+  });
+};
 
-/** @deprecated use `numeric` from `@vee-validate/rules` */
-export const numeric = veeValidate.numeric;
+defineRule("mindimensions", mindimensions);
 
-/** @deprecated use `email` from `@vee-validate/rules` */
-export const email = veeValidate.email;
+/**
+ * Check if image not exceeding a given size in kilobytes
+ */
+export const fileWeight = (file: HTMLInputElement, [size]: [number]) => {
+  if (!file?.files || !file.files?.length) {
+    return true;
+  }
 
-/** @deprecated use `regex` from `@vee-validate/rules` */
-export const regex = veeValidate.regex;
+  const maxSize = size * 1000;
 
-/** @deprecated use `min_value` from `@vee-validate/rules` */
-export const min_value = veeValidate.min_value;
+  const fileSizeChecker = (file: File) => {
+    return file.size > maxSize;
+  };
 
-/** @deprecated use `max_value` from `@vee-validate/rules` */
-export const max_value = veeValidate.max_value;
+  const list = [];
+  for (let i = 0; i < file.files.length; i++) {
+    list.push(file.files[i]);
+  }
 
-/** @deprecated use `size` from `@vee-validate/rules` */
-export const size = veeValidate.size;
+  const checker = list.map((x) => fileSizeChecker(x));
 
-/** @deprecated 'maxdimensions' validation rule is deprecated, use 'dimensions' validation rule instead */
-export const maxdimensions = (images: HTMLInputElement, [width, height]: [string | number, string | number]) => {
-  console.warn("'maxdimensions' validation rule is deprecated, use 'dimensions' validation rule instead");
-  return veeValidate.dimensions(images, [width, height]);
+  const isInvalid = checker.find((x) => x === true);
+  if (isInvalid) {
+    return `File size must be maximum ${size} kb`;
+  } else {
+    return true;
+  }
 };
 
-defineRule("maxdimensions", maxdimensions);
+defineRule("fileWeight", fileWeight);
 
 const compare = (
   value: string,

package/core/types/index.ts

@@ -53,10 +53,27 @@ export interface IActionBuilderResult {
 }
 
 export interface IImage {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [x: string]: any;
   sortOrder?: number;
-  title?: string;
-  name?: string;
+  title?: string | undefined;
+  name?: string | undefined;
+  url?: string | undefined;
+}
+
+export interface Asset {
+  readableSize?: string;
+  relativeUrl?: string;
   url?: string;
+  description?: string;
+  name?: string;
+  modifiedDate?: Date;
+  id?: string;
+  altText?: string;
+  typeId?: string;
+  sortOrder?: number;
+  size?: number;
+  createdDate?: Date;
 }
 
 export interface AuthData {