@duetds/components 5.3.2 → 5.3.5

package/lib/collection/components/duet-upload/errorcodes.utils.js

@@ -2,13 +2,14 @@
  * Built with Duet Design System
  */
 import { getLocaleString } from "../../utils/language-utils";
-import errorCodes from "./errorcodes.json";
-export const getError = (code) => {
+import { parsePossibleJSON } from "../../utils/string-utils";
+export const getError = (code, errorCodes) => {
   let error = {
     type: undefined,
     system_message: undefined,
     message: undefined,
   };
+  errorCodes = parsePossibleJSON(errorCodes);
   error = errorCodes.filter(errorItem => {
     // the == is intentional we may be comparing numbers to strings - and that is ok here
     return errorItem.type == code;
@@ -20,8 +21,8 @@ export const getError = (code) => {
   }
   return error;
 };
-export const getI18nError = (errorCode) => {
-  const errorFromJson = getError(errorCode);
+export const getI18nError = (errorCode, errorCodes) => {
+  const errorFromJson = getError(errorCode, errorCodes);
   const i18String = getLocaleString(errorFromJson.message);
   if (i18String === "" || !i18String) {
     return errorFromJson.system_message;

package/lib/collection/components/duet-upload/mock.helpers.js

@@ -1,10 +1,19 @@
 /*!
  * Built with Duet Design System
  */
+import errorCodes from "./errorcodes.json";
 /** list of mock File elements to pass the duet-upload component */
+import { getI18nError } from "./errorcodes.utils";
 //mock functions to show uploaded file state
 export function getBrowsedFiles() {
   return fileListFromArray([
+    mockFileCreator({
+      name: "action-buy-insurance-default-error.svg",
+      type: "image/svg",
+      size: 11 * 10000,
+      lastModified: new Date(),
+      error: "default",
+    }),
     mockFileCreator({
       name: "action-add-circle.svg",
       type: "image/svg",
@@ -75,11 +84,13 @@ function fileListFromArray(files) {
       item: obj.file,
       size: obj.file.size,
       valid: isValid,
-      error: {
-        type: isValid ? undefined : obj.error,
-        message: isValid ? undefined : "Random error message",
-        system_message: isValid ? undefined : "Random system error message",
-      },
+      error: isValid
+        ? undefined
+        : {
+          type: obj.error,
+          message: isValid ? undefined : getI18nError(obj.error, errorCodes),
+          system_message: isValid ? undefined : getI18nError(obj.error, errorCodes),
+        },
       progress: 100,
       deleted: false,
       xhr: false,

package/lib/collection/components/duet-upload/upload-editable-item-error.js

@@ -3,14 +3,14 @@
  */
 import { h } from "@stencil/core";
 import { getI18nError } from "./errorcodes.utils";
-export const ErrorItem = ({ data }) => {
+export const ErrorItem = ({ data, errorCodes }) => {
   const { item, error } = data;
   const { name } = item;
   const { type } = error;
   return (h("span", { class: "duet-upload-item-error", role: "status" },
     h("duet-paragraph", { class: "duet-upload-item-name", color: "danger", margin: "none", weight: "semi-bold" },
-      h("duet-icon", { margin: "none", size: "xx-small", name: "messaging-attachment" }),
-      " ",
+      h("duet-icon", { margin: "none", size: "x-small", name: "messaging-attachment" }),
+      h("duet-spacer", { size: "xx-small", direction: "horizontal" }),
       name),
-    h("duet-paragraph", { class: "duet-upload-item-error-label", size: "small", margin: "none", color: "danger" }, getI18nError(type))));
+    h("duet-paragraph", { class: "duet-upload-item-error-label", size: "small", margin: "none", color: "danger" }, getI18nError(type, errorCodes))));
 };

package/lib/collection/components/duet-upload/upload-editable-item-inprogres.js

@@ -2,6 +2,9 @@
  * Built with Duet Design System
  */
 import { h } from "@stencil/core";
-export const ProgressItem = ({ progress, name }) => (h("span", null,
-  h("duet-paragraph", { color: "secondary", margin: "none", size: "small" }, name),
+export const ProgressItem = ({ progress, name }) => (h("span", { class: "duet-upload-item-name" },
+  h("duet-icon", { margin: "none", size: "x-small", name: "messaging-attachment" }),
+  h("duet-spacer", { size: "xx-small", direction: "horizontal" }),
+  name,
+  h("br", null),
   h("duet-progress", { progress: Math.ceil(progress), "aria-hidden": true })));

package/lib/collection/components/duet-upload/upload-editable-item-pending.js

@@ -2,6 +2,7 @@
  * Built with Duet Design System
  */
 import { h } from "@stencil/core";
-export const PendingItem = ({ name }) => (h("span", null,
-  h("duet-paragraph", { color: "secondary", margin: "none", size: "small" }, name),
-  h("duet-spacer", { size: "xx-small" })));
+export const PendingItem = ({ name }) => (h("span", { class: "duet-upload-item-name" },
+  h("duet-icon", { margin: "none", size: "x-small", name: "messaging-attachment" }),
+  h("duet-spacer", { size: "xx-small", direction: "horizontal" }),
+  name));

package/lib/collection/components/duet-upload/upload-validators.js

@@ -33,23 +33,23 @@ export const validateFileSize = (size, maxBytes) => {
   }
   return maxBytes >= size;
 };
-export const validateFile = (item, validators) => {
+export const validateFile = (item, validators, errorCodes) => {
   const { allowedMimetypes, allowedExtensions, maxBytes } = validators;
   let valid = false;
-  let errorMessage = getError("default");
+  let errorMessage = getError("default", errorCodes);
   if (item) {
     const { name, type, size } = item;
     const mime = validateFileMime(type, allowedMimetypes);
     const ext = validateFileExtension(name.toLowerCase(), allowedExtensions);
     const bytes = validateFileSize(size, maxBytes);
     if (!mime) {
-      errorMessage = getError("duet-upload-101");
+      errorMessage = getError("duet-upload-101", errorCodes);
     }
     if (!ext) {
-      errorMessage = getError("duet-upload-100");
+      errorMessage = getError("duet-upload-100", errorCodes);
     }
     if (!bytes) {
-      errorMessage = getError("duet-upload-201");
+      errorMessage = getError("duet-upload-201", errorCodes);
     }
     valid = mime && ext && bytes;
   }
@@ -71,7 +71,7 @@ export const validateTotalSizeIsAboveMax = (filelist, maxTotalBytes) => {
         total += item.size;
       }
     });
-    if (total < maxTotalBytes) {
+    if (total > maxTotalBytes) {
       return true;
     }
   }

package/lib/collection/components/duet-upload/xhr.helpers.js

@@ -2,6 +2,7 @@
  * Built with Duet Design System
  */
 export const makeXhrRequest = ({ payload, options, onFailure, onSuccess, onProgress }) => {
+  // @ts-ignore
   const { type = "POST", xhr, uri, argument = null, headers = null } = options;
   xhr.open(type, `${uri}${argument || ""}`, true);
   const { data, name } = payload;