Merge branch 'refs/heads/main' into forman-refactorings_2

# Conflicts:
#	dashi/src/actions/applyPropertyChange.ts

Author: forman

dashi/src/actions/setComponentVisibility.ts

@@ -1,10 +1,9 @@
+import { fetchInitialComponentState } from "../api";
 import appStore from "../store/appStore";
+import { ContribPoint } from "../model/extension";
 import fetchApiResult from "../utils/fetchApiResult";
-import { fetchInitialComponentState } from "../api";
 import { updateContributionState } from "./updateContributionState";
 
-import { ContribPoint } from "../model/extension";
-
 export function setComponentVisibility(
   contribPoint: ContribPoint,
   panelIndex: number,

dashi/src/actions/updateContributionState.ts

@@ -1,7 +1,6 @@
 import appStore from "../store/appStore";
 import { updateArray } from "../utils/updateArray";
 import { ContributionState } from "../state/contribution";
-
 import { ContribPoint } from "../model/extension";
 
 export function updateContributionState(

dashi/src/app/App.tsx

@@ -1,14 +1,10 @@
-import {
-  CssBaseline,
-  ThemeProvider,
-  createTheme,
-  Typography,
-} from "@mui/material";
+import { CssBaseline, ThemeProvider, createTheme } from "@mui/material";
+import Typography from "@mui/material/Typography";
 
+import { initAppStore } from "../actions/initAppStore";
 import ExtensionsInfo from "./ExtensionInfo";
 import PanelsControl from "./PanelsControl";
 import PanelsRow from "./PanelsRow";
-import { initAppStore } from "../actions/initAppStore";
 
 initAppStore();
 

dashi/src/app/ExtensionInfo.tsx

@@ -1,5 +1,6 @@
+import Typography from "@mui/material/Typography";
+
 import useAppStore from "../store/appStore";
-import { Typography } from "@mui/material";
 
 function ExtensionsInfo() {
   const contributionsResult = useAppStore((state) => state.contributionsResult);
@@ -22,7 +23,7 @@ function ExtensionsInfo() {
   } else if (contributionsResult.error) {
     return <div>Error: {contributionsResult.error.message}</div>;
   } else if (contributionsResult.status === "pending") {
-    return <div>{`Loading contributions...`}</div>;
+    return <div>{`Loading extensions...`}</div>;
   }
   return null;
 }

dashi/src/app/Panel.tsx

@@ -1,5 +1,5 @@
 import { CSSProperties, ReactElement } from "react";
-import { CircularProgress } from "@mui/material";
+import CircularProgress from "@mui/material/CircularProgress";
 
 import { PropertyChangeHandler } from "../model/event";
 import { Contribution } from "../model/contribution";

dashi/src/app/PanelsRow.tsx

@@ -1,7 +1,7 @@
 import useAppStore from "../store/appStore";
-import Panel from "./Panel";
 import applyPropertyChange from "../actions/applyPropertyChange";
 import { PropertyChangeEvent } from "../model/event";
+import Panel from "./Panel";
 
 const contribPoint = "panels";
 

dashi/src/components/DashiBox.tsx

@@ -1,7 +1,8 @@
+import Box from "@mui/material/Box";
+
 import { BoxState } from "../state/component";
-import DashiChildren from "./DashiChildren";
-import { Box } from "@mui/material";
 import { PropertyChangeHandler } from "../model/event";
+import DashiChildren from "./DashiChildren";
 
 export interface DashiBoxProps extends Omit<BoxState, "type"> {
   onPropertyChange: PropertyChangeHandler;

dashi/src/components/DashiButton.tsx

@@ -1,6 +1,7 @@
 import { MouseEvent } from "react";
-import { ButtonState } from "../state/component";
 import Button from "@mui/material/Button";
+
+import { ButtonState } from "../state/component";
 import { PropertyChangeHandler } from "../model/event";
 
 export interface DashiButtonProps extends Omit<ButtonState, "type"> {

dashi/src/components/DashiChildren.tsx

@@ -1,6 +1,6 @@
+import { PropertyChangeHandler } from "../model/event";
 import { ComponentState } from "../state/component";
 import DashiComponent from "./DashiComponent";
-import { PropertyChangeHandler } from "../model/event";
 
 export interface DashiChildrenProps {
   components?: ComponentState[];

dashi/src/components/DashiComponent.tsx

@@ -1,9 +1,9 @@
 import { ComponentState } from "../state/component";
+import { PropertyChangeHandler } from "../model/event";
 import DashiPlot, { DashiPlotProps } from "./DashiPlot";
 import DashiButton, { DashiButtonProps } from "./DashiButton";
 import DashiBox, { DashiBoxProps } from "./DashiBox";
 import DashiDropdown, { DashiDropdownProps } from "./DashiDropdown";
-import { PropertyChangeHandler } from "../model/event";
 
 export interface DashiComponentProps extends ComponentState {
   onPropertyChange: PropertyChangeHandler;