@beinformed/ui 1.16.1 → 1.17.2

package/src/redux/actions/FormAttributeSet.js

@@ -31,7 +31,7 @@ export const updateFormAttribute =
   (dispatch: Dispatch) => {
     const newForm = form.clone();
 
-    if (!options.validate) {
+    if (options.validate === undefined) {
       options.validate = true;
     }
 
@@ -74,3 +74,12 @@ export const updateFormAttribute =
 
     return dispatch(updateModel(newForm));
   };
+
+/**
+ * Validate an attribute on a form
+ */
+export const validateFormAttribute =
+  (form: FormModel): ThunkAction =>
+  (dispatch: Dispatch) => {
+    return dispatch(validateFormObject(form));
+  };

package/src/utils/helpers/__tests__/checkResource.spec.js

@@ -3,6 +3,8 @@ import {
   resourceRedirectsToSecureLogin,
 } from "../checkResource";
 
+import Href from "../../../models/href/Href";
+
 const mockXMLHttpRequest = () => {
   const mock = {
     open: jest.fn(),
@@ -26,22 +28,22 @@ describe("checkResource", () => {
     const mock = mockXMLHttpRequest();
     mock.status = 200;
 
-    expect.assertions(1);
-
     const exists = resourceExists("/");
-
     expect(exists).toBe(true);
+
+    const hrefExists = resourceExists(new Href("/caseview"));
+    expect(hrefExists).toBe(true);
   });
 
   it("indicates a resource does not exists if it has a status code of 404", () => {
     const mock = mockXMLHttpRequest();
     mock.status = 404;
 
-    expect.assertions(1);
-
     const exists = resourceExists("/");
-
     expect(exists).toBe(false);
+
+    const hrefExists = resourceExists(new Href("/caseview"));
+    expect(hrefExists).toBe(false);
   });
 
   it("indicates resource request redirects to secureLogin", () => {
@@ -50,7 +52,9 @@ describe("checkResource", () => {
     mock.status = 400;
 
     const toLogin = resourceRedirectsToSecureLogin("/");
-
     expect(toLogin).toBe(true);
+
+    const hrefToLogin = resourceExists(new Href("/caseview"));
+    expect(hrefToLogin).toBe(true);
   });
 });

package/src/utils/helpers/checkResource.js

@@ -1,5 +1,5 @@
 // @flow
-import { BASE } from "../../constants/Constants";
+import Href from "../../models/href/Href";
 
 /**
  * Checks if a given url to a modular ui resource exists using a HEAD request to the resource (synchronous)
@@ -8,8 +8,10 @@ import { BASE } from "../../constants/Constants";
  * @param url
  * @returns {boolean}
  */
-export const resourceExists = (url: string): boolean => {
-  const fullUrl = `${BASE}/${url}`.replace(/\/\//g, "/");
+export const resourceExists = (url: string | Href): boolean => {
+  const fullUrl = new Href(url).absolutehref;
+
+  // const fullUrl = `${BASE}/${url}`.replace(/\/\//g, "/");
 
   const xhr = new XMLHttpRequest();
   xhr.open("HEAD", fullUrl, false);
@@ -25,8 +27,8 @@ export const resourceExists = (url: string): boolean => {
  * @param url
  * @returns {boolean}
  */
-export const resourceRedirectsToSecureLogin = (url: string): boolean => {
-  const fullUrl = `${BASE}/${url}`.replace(/\/\//g, "/");
+export const resourceRedirectsToSecureLogin = (url: string | Href): boolean => {
+  const fullUrl = new Href(url).absolutehref;
 
   const xhr = new XMLHttpRequest();
   xhr.open("HEAD", fullUrl, false);