Skip to content

Commit

Permalink
[Bugfix] Fix sonar bugs (#6395)
Browse files Browse the repository at this point in the history
Co-authored-by: Kristian Hein <[email protected]>
  • Loading branch information
webviewer-ui and kristianhein committed Mar 15, 2023
1 parent 7230d5f commit e2755ea
Show file tree
Hide file tree
Showing 3 changed files with 577 additions and 2 deletions.
16 changes: 14 additions & 2 deletions src/components/App/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import actions from 'actions';

import Accessibility from 'components/Accessibility';
import Header from 'components/Header';
import OfficeEditorToolsHeader from 'components/Header/OfficeEditorToolsHeader';
import ViewControlsOverlay from 'components/ViewControlsOverlay';
import MenuOverlay from 'components/MenuOverlay';
import AnnotationContentOverlay from 'components/AnnotationContentOverlay';
Expand Down Expand Up @@ -80,6 +81,7 @@ import Events from 'constants/events';
import overlays from 'constants/overlays';
import setLanguage from 'src/apis/setLanguage';
import { panelNames } from 'constants/panel';
import { isOfficeEditorMode } from 'helpers/officeEditor';

import './App.scss';
import FlyoutContainer from 'components/ModularComponents/FlyoutContainer';
Expand Down Expand Up @@ -115,10 +117,19 @@ const App = ({ removeEventHandlers }) => {
'*',
);

function loadInitialDocument() {
async function loadInitialDocument() {
let initialDoc = getHashParameters('d', '');
const isOfficeEditingEnabled = getHashParameters('enableOfficeEditing', false);
if (!initialDoc && isOfficeEditingEnabled) {
loadDocument(dispatch, (await core.getEmptyWordDocument()).default, {
filename: 'Untitled.docx',
});

return;
}

const state = store.getState();
const doesAutoLoad = getHashParameters('auto_load', true);
let initialDoc = getHashParameters('d', '');
initialDoc = initialDoc ? JSON.parse(initialDoc) : '';
initialDoc = Array.isArray(initialDoc) ? initialDoc : [initialDoc];
const isMultiTabAlreadyEnabled = state.viewer.isMultiTab;
Expand Down Expand Up @@ -227,6 +238,7 @@ const App = ({ removeEventHandlers }) => {
<FlyoutContainer/>
<Accessibility/>
<Header />
{isOfficeEditorMode() && <OfficeEditorToolsHeader/>}
<TopHeader />
<div className="content">
<LeftHeader />
Expand Down
Loading

0 comments on commit e2755ea

Please sign in to comment.