fix: ensure loading new type (#470)

qlik-oss · Jul 2, 2020 · 2ef51a1 · 2ef51a1
1 parent 8c95dde
commit 2ef51a1
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 22 deletions.
diff --git a/apis/nucleus/src/components/Cell.jsx b/apis/nucleus/src/components/Cell.jsx
@@ -31,6 +31,7 @@ const initialState = (err) => ({
   longRunningQuery: false,
   error: err ? { title: err.message } : null,
   sn: null,
+  visualization: null,
 });
 
 const contentReducer = (state, action) => {
@@ -50,6 +51,7 @@ const contentReducer = (state, action) => {
         longRunningQuery: false,
         error: null,
         sn: action.sn,
+        visualization: action.visualization,
       };
     }
     case 'RENDER': {
@@ -253,14 +255,9 @@ const getType = async ({ types, name, version }) => {
   return SN;
 };
 
-const loadType = async ({ dispatch, types, name, version, layout, model, app, selections }) => {
+const loadType = async ({ dispatch, types, visualization, version, model, app, selections }) => {
   try {
-    const snType = await getType({ types, name, version });
-    // Layout might have changed since we requested the new type -> quick return
-    if (layout.visualization !== name) {
-      return undefined;
-    }
-
+    const snType = await getType({ types, name: visualization, version });
     const sn = snType.create({
       model,
       app,
@@ -310,7 +307,7 @@ const Cell = forwardRef(({ halo, model, initialSnOptions, initialError, onMount
   };
 
   useEffect(() => {
-    if (initialError || !appLayout) {
+    if (initialError || !appLayout || !layout) {
       return undefined;
     }
     const validate = async (sn) => {
@@ -322,35 +319,31 @@ const Cell = forwardRef(({ halo, model, initialSnOptions, initialError, onMount
       }
       handleModal({ sn: state.sn, layout, model });
     };
-    const load = async (withLayout, version) => {
+    const load = async (visualization, version) => {
       dispatch({ type: 'LOADING' });
       const sn = await loadType({
         dispatch,
         types,
-        name: withLayout.visualization,
+        visualization,
         version,
-        layout,
         model,
         app,
         selections,
       });
       if (sn) {
-        dispatch({ type: 'LOADED', sn });
+        dispatch({ type: 'LOADED', sn, visualization });
         onMount();
       }
       return undefined;
     };
 
-    if (!layout) {
-      return undefined;
-    }
-
-    if (state.sn) {
+    // Validate if it's still the same type
+    if (state.visualization === layout.visualization && state.sn) {
       validate(state.sn);
       return undefined;
     }
 
-    // Load supernova h
+    // Load supernova
     const withVersion = types.getSupportedVersion(layout.visualization, layout.version);
     if (!withVersion) {
       dispatch({
@@ -361,7 +354,7 @@ const Cell = forwardRef(({ halo, model, initialSnOptions, initialError, onMount
       });
       return undefined;
     }
-    load(layout, withVersion);
+    load(layout.visualization, withVersion);
 
     return () => {};
   }, [types, state.sn, model, layout, appLayout, language]);

diff --git a/apis/nucleus/src/components/__tests__/cell.spec.jsx b/apis/nucleus/src/components/__tests__/cell.spec.jsx
@@ -30,7 +30,7 @@ describe('<Cell />', () => {
     Header = () => 'Header';
     InstanceContext = React.createContext();
     appLayout = { foo: 'app-layout' };
-    layout = { qSelectionInfo: {} };
+    layout = { qSelectionInfo: {}, visualization: '' };
     layoutState = { validating: true, canCancel: false, canRetry: false };
     longrunning = { cancel: sandbox.spy(), retry: sandbox.spy() };
     useLayout = sandbox.stub().returns([layout, layoutState, longrunning]);
@@ -223,6 +223,42 @@ describe('<Cell />', () => {
       expect(ftypes).to.have.length(1);
     });
 
+    it('should render new type', async () => {
+      const sn = {
+        generator: {
+          qae: {
+            data: {
+              targets: [],
+            },
+          },
+        },
+      };
+      const sn1 = {
+        generator: {
+          qae: {
+            data: {
+              targets: [],
+            },
+          },
+        },
+      };
+      const types = {
+        get: sandbox.stub().callsFake(({ name }) => {
+          return {
+            supernova: async () => ({ create: () => (name === 'sn1' ? sn1 : sn) }),
+          };
+        }),
+        getSupportedVersion: sandbox.stub().returns('1.0.0'),
+      };
+      await render({ types });
+      const renderedSn = renderer.root.findByType(Supernova);
+      expect(renderedSn.props.sn).to.equal(sn);
+      sandbox.stub(layout, 'visualization').value('sn1');
+      await render({ types });
+      const renderedSn1 = renderer.root.findByType(Supernova);
+      expect(renderedSn1.props.sn).to.equal(sn1);
+    });
+
     it('should render requirements', async () => {
       const localLayout = { visualization: 'sn', foo: { qDimensionInfo: [], qMeasureInfo: [] } };
       const sn = {

diff --git a/test/mashup/visualize/life.int.js b/test/mashup/visualize/life.int.js
@@ -58,9 +58,9 @@ describe('object lifecycle', () => {
     await waitForTextStatus('.pages', '4001', { timeout: 5000 });
   });
 
-  it.skip('should render when requirements are fulfilled', async () => {
+  it('should render other type', async () => {
     await page.click('button[data-phase="set-the-other-type"]');
-    await waitForTextStatus('.njs-viz', 'The other type!');
+    await waitForTextStatus('.njs-viz', 'The other one!');
   });
 
   it('should destroy', async () => {