Fix code formatting issues

This commit is contained in:
Sevo Kukol 2023-09-12 14:46:04 +02:00
parent 70682128bf
commit 8c74353794
9 changed files with 247 additions and 235 deletions

View File

@ -1,9 +1,9 @@
import { Platform, configContext } from "../ConfigContext"; import { Platform, configContext } from "../ConfigContext";
export let StyleConstants = require("less-vars-loader!../../less/Common/Constants.less"); export const StyleConstants = require("less-vars-loader!../../less/Common/Constants.less");
export function updateStyles(): void { export function updateStyles(): void {
if (configContext.platform == Platform.Fabric) { if (configContext.platform === Platform.Fabric) {
StyleConstants.AccentMediumHigh = StyleConstants.FabricAccentMediumHigh; StyleConstants.AccentMediumHigh = StyleConstants.FabricAccentMediumHigh;
StyleConstants.AccentMedium = StyleConstants.FabricAccentMedium; StyleConstants.AccentMedium = StyleConstants.FabricAccentMedium;
StyleConstants.AccentLight = StyleConstants.FabricAccentLight; StyleConstants.AccentLight = StyleConstants.FabricAccentLight;

View File

@ -1321,8 +1321,9 @@ export default class Explorer {
await useNotebook.getState().refreshNotebooksEnabledStateForAccount(); await useNotebook.getState().refreshNotebooksEnabledStateForAccount();
// TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
const isNotebookEnabled = configContext.platform != Platform.Fabric && ( const isNotebookEnabled =
userContext.features.notebooksDownBanner || configContext.platform !== Platform.Fabric &&
(userContext.features.notebooksDownBanner ||
useNotebook.getState().isPhoenixNotebooks || useNotebook.getState().isPhoenixNotebooks ||
useNotebook.getState().isPhoenixFeatures); useNotebook.getState().isPhoenixFeatures);
useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled); useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);

View File

@ -83,16 +83,19 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
); );
} }
const rootStyle = configContext.platform == Platform.Fabric ? { const rootStyle =
configContext.platform == Platform.Fabric
? {
root: { root: {
backgroundColor: "transparent", backgroundColor: "transparent",
padding: "0px 14px 0px 14px" padding: "0px 14px 0px 14px",
},
} }
} : { : {
root: { root: {
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
} },
} };
return ( return (
<div className="commandBarContainer"> <div className="commandBarContainer">

View File

@ -54,7 +54,12 @@ export function createStaticCommandBarButtons(
const buttons: CommandButtonComponentProps[] = []; const buttons: CommandButtonComponentProps[] = [];
buttons.push(newCollectionBtn); buttons.push(newCollectionBtn);
if (userContext.apiType !== "Tables" && userContext.apiType !== "Cassandra" && configContext.platform != Platform.Fabric) { if (
configContext.platform !== Platform.Fabric &&
userContext.apiType !== "Tables" &&
userContext.apiType !== "Cassandra"
) {
const addSynapseLink = createOpenSynapseLinkDialogButton(container); const addSynapseLink = createOpenSynapseLinkDialogButton(container);
if (addSynapseLink) { if (addSynapseLink) {
@ -257,7 +262,9 @@ export function createDivider(): CommandButtonComponentProps {
} }
function areScriptsSupported(): boolean { function areScriptsSupported(): boolean {
return configContext.platform != Platform.Fabric && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin"); return (
configContext.platform !== Platform.Fabric && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin")
);
} }
function createNewCollectionGroup(container: Explorer): CommandButtonComponentProps { function createNewCollectionGroup(container: Explorer): CommandButtonComponentProps {

View File

@ -26,7 +26,8 @@ import { MemoryTracker } from "./MemoryTrackerComponent";
export const convertButton = (btns: CommandButtonComponentProps[], backgroundColor: string): ICommandBarItemProps[] => { export const convertButton = (btns: CommandButtonComponentProps[], backgroundColor: string): ICommandBarItemProps[] => {
const buttonHeightPx = StyleConstants.CommandBarButtonHeight; const buttonHeightPx = StyleConstants.CommandBarButtonHeight;
const hoverColor = configContext.platform == Platform.Fabric ? StyleConstants.FabricAccentLight : StyleConstants.AccentLight; const hoverColor =
configContext.platform == Platform.Fabric ? StyleConstants.FabricAccentLight : StyleConstants.AccentLight;
const getFilter = (isDisabled: boolean): string => { const getFilter = (isDisabled: boolean): string => {
if (isDisabled) { if (isDisabled) {

View File

@ -144,14 +144,15 @@ const App: React.FunctionComponent = () => {
ReactDOM.render(<App />, document.body); ReactDOM.render(<App />, document.body);
function LoadFabricOverrides(): JSX.Element { function LoadFabricOverrides(): JSX.Element {
if (configContext.platform === Platform.Fabric) {
if (configContext.platform == Platform.Fabric) {
const FabricStyle = React.lazy(() => import("./Platform/Fabric/FabricPlatform")); const FabricStyle = React.lazy(() => import("./Platform/Fabric/FabricPlatform"));
return ( return (
<React.Suspense fallback={<div></div>}><FabricStyle /></React.Suspense> <React.Suspense fallback={<div></div>}>
) <FabricStyle />
</React.Suspense>
);
} else { } else {
return (<></>); return <></>;
} }
} }

View File

@ -1,7 +1,5 @@
import React from "react"; import React from "react";
import "../../../less/documentDBFabric.less"; import "../../../less/documentDBFabric.less";
export default function InitFabric() { export default function InitFabric() {
return ( return <></>;
<></>
);
} }

View File

@ -204,5 +204,5 @@ export const appThemeFabric: Theme = createTheme({
* Color code for greenLight. * Color code for greenLight.
*/ */
greenLight: "#13a10e", greenLight: "#13a10e",
} },
}); });

View File

@ -5,7 +5,8 @@ export const getDataExplorerWindow = (currentWindow: Window): Window | undefined
if (currentWindow.parent === currentWindow) { if (currentWindow.parent === currentWindow) {
return undefined; return undefined;
} }
if (currentWindow.parent.parent === currentWindow.top) { // Fabric if (currentWindow.parent.parent === currentWindow.top) {
// Fabric
return currentWindow; return currentWindow;
} }
if (currentWindow.parent === currentWindow.top) { if (currentWindow.parent === currentWindow.top) {