Merge branch 'pr-1683' into dev

Author: dacowan404

cypress/e2e/ingestion/files-ui.cy.ts

@@ -5,8 +5,9 @@ import { byTestId, testIds } from '../../support/selectors';
 
 describe('File Handling and Processing', () => {
   const nodeFile = 'AngularTesting_nodelist_withseqs_TN93_BS.csv';
+  const compatibleNodeFile = 'AngularTesting_nodes_Map.csv';
   const linkFile = 'AngularTesting_Epi_linklist_BS.csv';
-  const additionalNodeFile = 'AngularTesting_nodes_Map.csv';
+  const additionalNodeFile = compatibleNodeFile;
   const loadNodeFile = () => cy.loadFiles([{ name: nodeFile, datatype: 'node' }]);
 
   beforeEach(() => {
@@ -235,4 +236,155 @@ describe('File Handling and Processing', () => {
       expect(fileNames).to.include.members([nodeFile, linkFile, additionalNodeFile]);
     });
   });
+
+  it('preserves analysis styling when files are removed and added back', () => {
+    const customNodeColor = '#cc3366';
+
+    cy.loadFiles([
+      { name: nodeFile, datatype: 'node' },
+      { name: linkFile, datatype: 'link' },
+    ]);
+
+    cy.get('#launch').click({ force: true });
+    cy.window({ timeout: 30000 })
+      .its('commonService.session.network.isFullyLoaded')
+      .should('be.true');
+
+    cy.window().then((win) => {
+      const microbeTrace = win.commonService.visuals.microbeTrace;
+      microbeTrace.SelectedNodeColorVariable = customNodeColor;
+      microbeTrace.onNodeColorChanged(true);
+    });
+    cy.window()
+      .its('commonService.session.style.widgets.node-color')
+      .should('equal', customNodeColor);
+
+    cy.contains('#file-table .file-table-row', linkFile)
+      .find('.flaticon-delete-1')
+      .click({ force: true });
+    cy.contains('#file-table .file-table-row', linkFile).should('not.exist');
+    cy.get('#launch').click({ force: true });
+    cy.window({ timeout: 30000 })
+      .its('commonService.session.network.isFullyLoaded')
+      .should('be.true');
+    cy.window()
+      .its('commonService.session.style.widgets.node-color')
+      .should('equal', customNodeColor);
+
+    cy.loadFiles([{ name: linkFile, datatype: 'link' }]);
+    cy.get('#launch').click({ force: true });
+    cy.window({ timeout: 30000 })
+      .its('commonService.session.network.isFullyLoaded')
+      .should('be.true');
+    cy.window()
+      .its('commonService.session.style.widgets.node-color')
+      .should('equal', customNodeColor);
+  });
+
+  it('preserves field-backed styling when files are updated without resetting settings', () => {
+    const customNodeColor = '#cc3366';
+    const shapeVariable = 'subtype';
+
+    cy.loadFiles([
+      { name: nodeFile, datatype: 'node' },
+      { name: linkFile, datatype: 'link' },
+    ]);
+
+    cy.get('#launch').click({ force: true });
+    cy.window({ timeout: 30000 })
+      .its('commonService.session.network.isFullyLoaded')
+      .should('be.true');
+
+    cy.window().then((win) => {
+      const microbeTrace = win.commonService.visuals.microbeTrace;
+      microbeTrace.SelectedNodeColorVariable = customNodeColor;
+      microbeTrace.onNodeColorChanged(true);
+      microbeTrace.onNodeShapeByChanged(true, false, shapeVariable);
+    });
+    cy.window()
+      .its('commonService.session.style.widgets.node-color')
+      .should('equal', customNodeColor);
+    cy.window()
+      .its('commonService.session.style.widgets.node-symbol-variable')
+      .should('equal', shapeVariable);
+
+    cy.contains('#file-table .file-table-row', nodeFile)
+      .find('.flaticon-delete-1')
+      .click({ force: true });
+    cy.get('#launch').click({ force: true });
+    cy.window({ timeout: 30000 })
+      .its('commonService.session.network.isFullyLoaded')
+      .should('be.true');
+    cy.window().then((win) => {
+      expect(win.commonService.session.data.nodeFields).not.to.include(shapeVariable);
+      expect(win.commonService.session.style.widgets['node-symbol-variable']).to.equal(shapeVariable);
+      expect(win.commonService.GlobalSettingsModel.SelectedNodeSymbolVariable).to.equal(shapeVariable);
+      expect(win.commonService.session.style.widgets['node-color']).to.equal(customNodeColor);
+    });
+
+    cy.loadFiles([{ name: compatibleNodeFile, datatype: 'node', field1: '_id', field2: 'seq' }]);
+    cy.get('#launch').should('contain.text', 'Update').click({ force: true });
+    cy.window({ timeout: 30000 })
+      .its('commonService.session.network.isFullyLoaded')
+      .should('be.true');
+    cy.window().then((win) => {
+      expect(win.commonService.session.data.nodeFields).to.include(shapeVariable);
+      expect(win.commonService.session.style.widgets['node-symbol-variable']).to.equal(shapeVariable);
+      expect(win.commonService.GlobalSettingsModel.SelectedNodeSymbolVariable).to.equal(shapeVariable);
+      expect(win.commonService.session.style.widgets['node-color']).to.equal(customNodeColor);
+    });
+  });
+
+  it('resets all settings when files are updated with reset settings', () => {
+    const customNodeColor = '#cc3366';
+    const shapeVariable = 'subtype';
+
+    cy.loadFiles([
+      { name: nodeFile, datatype: 'node' },
+      { name: linkFile, datatype: 'link' },
+    ]);
+
+    cy.get('#launch').click({ force: true });
+    cy.window({ timeout: 30000 })
+      .its('commonService.session.network.isFullyLoaded')
+      .should('be.true');
+
+    cy.window().then((win) => {
+      const microbeTrace = win.commonService.visuals.microbeTrace;
+      microbeTrace.SelectedNodeColorVariable = customNodeColor;
+      microbeTrace.onNodeColorChanged(true);
+      microbeTrace.onNodeShapeByChanged(true, false, shapeVariable);
+      win.commonService.session.style.widgets['default-distance-metric'] = 'tn93';
+      win.commonService.session.style.widgets['link-threshold'] = 0.015;
+      win.commonService.session.style.widgets['default-view'] = 'Map';
+      win.commonService.GlobalSettingsModel.SelectedDistanceMetricVariable = 'tn93';
+      win.commonService.GlobalSettingsModel.SelectedLinkThresholdVariable = 0.015;
+    });
+
+    cy.contains('#file-table .file-table-row', nodeFile)
+      .find('.flaticon-delete-1')
+      .click({ force: true });
+    cy.get('#launch-reset-settings', { timeout: 20000 })
+      .should('exist')
+      .click({ force: true });
+    cy.window({ timeout: 30000 })
+      .its('commonService.session.network.isFullyLoaded')
+      .should('be.true');
+
+    cy.window().then((win) => {
+      const widgets = win.commonService.session.style.widgets;
+
+      expect(win.commonService.session.data.nodeFields).not.to.include(shapeVariable);
+      expect(widgets['node-color']).to.equal('#1f77b4');
+      expect(win.commonService.session.style.widgets['node-symbol-variable']).to.equal('None');
+      expect(widgets['default-distance-metric']).to.equal('snps');
+      expect(widgets['link-threshold']).to.equal(16);
+      expect(widgets['default-view']).to.equal('2D Network');
+      expect(win.commonService.GlobalSettingsModel.SelectedNodeSymbolVariable).to.equal('None');
+      expect(win.commonService.GlobalSettingsModel.SelectedDistanceMetricVariable).to.equal('snps');
+      expect(win.commonService.GlobalSettingsModel.SelectedLinkThresholdVariable).to.equal(16);
+      expect(win.commonService.session.style.nodeColorsTable).to.deep.equal({});
+      expect(win.commonService.session.style.nodeSymbolsTable).to.deep.equal({});
+    });
+  });
 });