Merge branch 'main' into 19836-new-tooltip-impl
authorDaniel Kutyła <daniel.kutyla@contractors.roche.com>
Fri, 10 Feb 2023 17:12:47 +0000 (18:12 +0100)
committerDaniel Kutyła <daniel.kutyla@contractors.roche.com>
Fri, 10 Feb 2023 21:44:14 +0000 (22:44 +0100)
Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>

1  2 
.licenseignore
src/common/config.ts
src/store/store.ts

diff --cc .licenseignore
index 2440cc334e144c8aecc3fa8a8952069c16634b68,2440cc334e144c8aecc3fa8a8952069c16634b68..2d7deb739d1d54b1a9168b05c35c7cbee81f3254
@@@ -16,6 -16,6 +16,8 @@@ src/lib/cwl-svg/
  tools/arvados_config.yml
  cypress/fixtures/files/5mb.bin
  cypress/fixtures/files/cat.png
++cypress/fixtures/files/banner.html
++cypress/fixtures/files/tooltips.txt
  cypress/fixtures/webdav-propfind-outputs.xml
  .yarn/releases/*
  package.json
index 2c7995f582f397b49590c93d90814b4ea10ff794,a6eabdadf9b8ae409f3fa234be59a9d1ce719f82..9b0542820db85e16315f009d59c587c90f5a1f28
@@@ -281,16 -281,16 +281,16 @@@ export const mockClusterConfigJSON = 
      WebDAVDownload: { ExternalURL: '' },
      WebShell: { ExternalURL: '' },
      Workbench: {
 -        DisableSharingURLsUI: false,
 -        ArvadosDocsite: "",
 -        FileViewersConfigURL: "",
 -        WelcomePageHTML: "",
 -        InactivePageHTML: "",
 -        SSHHelpPageHTML: "",
 -        SSHHelpHostSuffix: "",
 -        SiteName: "",
 -        IdleTimeout: "0s"
 -    }
 +      DisableSharingURLsUI: false,
 +      ArvadosDocsite: "",
 +      FileViewersConfigURL: "",
 +      WelcomePageHTML: "",
 +      InactivePageHTML: "",
 +      SSHHelpPageHTML: "",
 +      SSHHelpHostSuffix: "",
 +      SiteName: "",
-       IdleTimeout: "0s",
++      IdleTimeout: "0s"
 +    },
    },
    Workbench: {
      DisableSharingURLsUI: false,
index 52bb73338431546dcb6012e5ccf2dfac7f0a2c06,4ef5e3d0e5c45d4bb29bcc8f701f701dd65d7af7..1501fd4fb5be80db4e03d9f832e59116ec95b6f9
@@@ -74,11 -74,9 +74,10 @@@ import { ALL_PROCESSES_PANEL_ID } from 
  import { Config } from 'common/config';
  import { pluginConfig } from 'plugins';
  import { MiddlewareListReducer } from 'common/plugintypes';
- import { sidePanelReducer } from './side-panel/side-panel-reducer';
 +import { tooltipsMiddleware } from './tooltips/tooltips-middleware';
+ import { sidePanelReducer } from './side-panel/side-panel-reducer'
  import { bannerReducer } from './banner/banner-reducer';
  
  declare global {
      interface Window {
          __REDUX_DEVTOOLS_EXTENSION_COMPOSE__?: typeof compose;