Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
* development:
  bump version
  avoid reloading app after loading feedback component
  • Loading branch information
MiquelAdell committed Jun 7, 2024
2 parents dcb3f2e + 437c8ef commit c33feed
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "metadata-synchronization",
"description": "Advanced metadata & data synchronization utility",
"version": "2.18.1",
"version": "2.18.2",
"license": "GPL-3.0",
"author": "EyeSeeTea team",
"homepage": ".",
Expand Down
7 changes: 3 additions & 4 deletions src/presentation/webapp/WebApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { LoadingProvider, SnackbarProvider } from "@eyeseetea/d2-ui-components";
import { MuiThemeProvider } from "@material-ui/core/styles";
import { createGenerateClassName, StylesProvider } from "@material-ui/styles";
import { init } from "d2";
import _ from "lodash";
//@ts-ignore
import OldMuiThemeProvider from "material-ui/styles/MuiThemeProvider";
import { useEffect, useState } from "react";
Expand Down Expand Up @@ -33,7 +32,6 @@ const App = () => {
const { baseUrl } = useConfig();
const [appContext, setAppContext] = useState<AppContextState | null>(null);
const [username, setUsername] = useState("");
const [showShareButton, setShowShareButton] = useState(false);
const [appConfig, setAppConfig] = useState<Maybe<AppConfig>>();
const migrations = useMigrations(appContext);

Expand Down Expand Up @@ -63,14 +61,15 @@ const App = () => {
setAppContext({ d2: d2 as object, api, compositionRoot });

Object.assign(window, { d2, api });
setShowShareButton(_(appConfig).get("appearance.showShareButton") || false);
setUsername(currentUser.username);
setAppConfig(configFromJson);
await initializeAppRoles(baseUrl);
};

run();
}, [appConfig, baseUrl]);
}, [baseUrl]);

const showShareButton = appConfig?.appearance.showShareButton || false;

if (migrations.state.type === "pending") {
return (
Expand Down

0 comments on commit c33feed

Please sign in to comment.