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,10 +1321,11 @@ 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 &&
useNotebook.getState().isPhoenixNotebooks || (userContext.features.notebooksDownBanner ||
useNotebook.getState().isPhoenixFeatures); useNotebook.getState().isPhoenixNotebooks ||
useNotebook.getState().isPhoenixFeatures);
useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled); useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);
useNotebook useNotebook
.getState() .getState()

View File

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

@ -1,208 +1,208 @@
import { Theme, createTheme } from "@fluentui/react"; import { Theme, createTheme } from "@fluentui/react";
export const appThemeFabric: Theme = createTheme({ export const appThemeFabric: Theme = createTheme({
palette: { palette: {
/** /**
* Color code for themeDarker. * Color code for themeDarker.
*/ */
themeDarker: "#033f38", themeDarker: "#033f38",
/** /**
* Color code for themeDark. * Color code for themeDark.
*/ */
themeDark: "#0a5c50", themeDark: "#0a5c50",
/** /**
* Color code for themeDarkAlt. * Color code for themeDarkAlt.
*/ */
themeDarkAlt: "#0c695a", themeDarkAlt: "#0c695a",
/** /**
* Color code for themePrimary. * Color code for themePrimary.
*/ */
themePrimary: "#117865", themePrimary: "#117865",
/** /**
* Color code for themeSecondary. * Color code for themeSecondary.
*/ */
themeSecondary: "#1f937e", themeSecondary: "#1f937e",
/** /**
* Color code for themeTertiary. * Color code for themeTertiary.
*/ */
themeTertiary: "#52c7aa", themeTertiary: "#52c7aa",
/** /**
* Color code for themeLight. * Color code for themeLight.
*/ */
themeLight: "#9ee0cb", themeLight: "#9ee0cb",
/** /**
* Color code for themeLighter. * Color code for themeLighter.
*/ */
themeLighter: "#c0ecdd", themeLighter: "#c0ecdd",
/** /**
* Color code for themeLighterAlt. * Color code for themeLighterAlt.
*/ */
themeLighterAlt: "#e3f7ef", themeLighterAlt: "#e3f7ef",
/** /**
* Color code for the strongest color, which is black in the default theme. * Color code for the strongest color, which is black in the default theme.
* This is a very light color in inverted themes. * This is a very light color in inverted themes.
*/ */
black: "#000000", black: "#000000",
/** /**
* Color code for blackTranslucent40. * Color code for blackTranslucent40.
*/ */
blackTranslucent40: "rgba(0, 0, 0, 0.4)", blackTranslucent40: "rgba(0, 0, 0, 0.4)",
/** /**
* Color code for neutralDark. * Color code for neutralDark.
*/ */
neutralDark: "#141414", neutralDark: "#141414",
/** /**
* Color code for neutralPrimary. * Color code for neutralPrimary.
*/ */
neutralPrimary: "#242424", neutralPrimary: "#242424",
/** /**
* Color code for neutralPrimaryAlt. * Color code for neutralPrimaryAlt.
*/ */
neutralPrimaryAlt: "#383838", neutralPrimaryAlt: "#383838",
/** /**
* Color code for neutralSecondary. * Color code for neutralSecondary.
*/ */
neutralSecondary: "#5c5c5c", neutralSecondary: "#5c5c5c",
/** /**
* Color code for neutralSecondaryAlt. * Color code for neutralSecondaryAlt.
*/ */
neutralSecondaryAlt: "#858585", neutralSecondaryAlt: "#858585",
/** /**
* Color code for neutralTertiary. * Color code for neutralTertiary.
*/ */
neutralTertiary: "#9e9e9e", neutralTertiary: "#9e9e9e",
/** /**
* Color code for neutralTertiaryAlt. * Color code for neutralTertiaryAlt.
*/ */
neutralTertiaryAlt: "#c7c7c7", neutralTertiaryAlt: "#c7c7c7",
/** /**
* Color code for neutralQuaternary. * Color code for neutralQuaternary.
*/ */
neutralQuaternary: "#d1d1d1", neutralQuaternary: "#d1d1d1",
/** /**
* Color code for neutralQuaternaryAlt. * Color code for neutralQuaternaryAlt.
*/ */
neutralQuaternaryAlt: "#e0e0e0", neutralQuaternaryAlt: "#e0e0e0",
/** /**
* Color code for neutralLight. * Color code for neutralLight.
*/ */
neutralLight: "#ebebeb", neutralLight: "#ebebeb",
/** /**
* Color code for neutralLighter. * Color code for neutralLighter.
*/ */
neutralLighter: "#f5f5f5", neutralLighter: "#f5f5f5",
/** /**
* Color code for neutralLighterAlt. * Color code for neutralLighterAlt.
*/ */
neutralLighterAlt: "#fafafa", neutralLighterAlt: "#fafafa",
/** /**
* Color code for the accent. * Color code for the accent.
*/ */
accent: "#117865", accent: "#117865",
/** /**
* Color code for the softest color, which is white in the default theme. This is a very dark color in dark themes. * Color code for the softest color, which is white in the default theme. This is a very dark color in dark themes.
* This is the page background. * This is the page background.
*/ */
white: "#ffffff", white: "#ffffff",
/** /**
* Color code for whiteTranslucent40 * Color code for whiteTranslucent40
*/ */
whiteTranslucent40: "rgba(255, 255, 255, 0.4)", whiteTranslucent40: "rgba(255, 255, 255, 0.4)",
/** /**
* Color code for yellowDark. * Color code for yellowDark.
*/ */
yellowDark: "#d39300", yellowDark: "#d39300",
/** /**
* Color code for yellow. * Color code for yellow.
*/ */
yellow: "#fde300", yellow: "#fde300",
/** /**
* Color code for yellowLight. * Color code for yellowLight.
*/ */
yellowLight: "#fef7b2", yellowLight: "#fef7b2",
/** /**
* Color code for orange. * Color code for orange.
*/ */
orange: "#f7630c", orange: "#f7630c",
/** /**
* Color code for orangeLight. * Color code for orangeLight.
*/ */
orangeLight: "#f98845", orangeLight: "#f98845",
/** /**
* Color code for orangeLighter. * Color code for orangeLighter.
*/ */
orangeLighter: "#fdcfb4", orangeLighter: "#fdcfb4",
/** /**
* Color code for redDark. * Color code for redDark.
*/ */
redDark: "#750b1c", redDark: "#750b1c",
/** /**
* Color code for red. * Color code for red.
*/ */
red: "#d13438", red: "#d13438",
/** /**
* Color code for magentaDark. * Color code for magentaDark.
*/ */
magentaDark: "#6b0043", magentaDark: "#6b0043",
/** /**
* Color code for magenta. * Color code for magenta.
*/ */
magenta: "#bf0077", magenta: "#bf0077",
/** /**
* Color code for magentaLight. * Color code for magentaLight.
*/ */
magentaLight: "#d957a8", magentaLight: "#d957a8",
/** /**
* Color code for purpleDark. * Color code for purpleDark.
*/ */
purpleDark: "#401b6c", purpleDark: "#401b6c",
/** /**
* Color code for purple. * Color code for purple.
*/ */
purple: "#5c2e91", purple: "#5c2e91",
/** /**
* Color code for purpleLight. * Color code for purpleLight.
*/ */
purpleLight: "#c6b1de", purpleLight: "#c6b1de",
/** /**
* Color code for blueDark. * Color code for blueDark.
*/ */
blueDark: "#003966", blueDark: "#003966",
/** /**
* Color code for blueMid. * Color code for blueMid.
*/ */
blueMid: "#004e8c", blueMid: "#004e8c",
/** /**
* Color code for blue. * Color code for blue.
*/ */
blue: "#0078d4", blue: "#0078d4",
/** /**
* Color code for blueLight. * Color code for blueLight.
*/ */
blueLight: "#3a96dd", blueLight: "#3a96dd",
/** /**
* Color code for tealDark. * Color code for tealDark.
*/ */
tealDark: "#006666", tealDark: "#006666",
/** /**
* Color code for teal. * Color code for teal.
*/ */
teal: "#038387", teal: "#038387",
/** /**
* Color code for tealLight. * Color code for tealLight.
*/ */
tealLight: "#00b7c3", tealLight: "#00b7c3",
/** /**
* Color code for greenDark. * Color code for greenDark.
*/ */
greenDark: "#0b6a0b", greenDark: "#0b6a0b",
/** /**
* Color code for green. * Color code for green.
*/ */
green: "#107c10", green: "#107c10",
/** /**
* 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) {