feat: Read settings from props/server config when available

packages/code-studio/src/main/AppInit.tsx

@@ -41,7 +41,6 @@ import {
   setWorkspaceStorage as setWorkspaceStorageAction,
   setServerConfigValues as setServerConfigValuesAction,
   User,
-  Workspace,
   WorkspaceStorage,
   ServerConfigValues,
   WorkspaceSettings,
@@ -59,7 +58,7 @@ import GrpcFileStorage from '../storage/grpc/GrpcFileStorage';
 const log = Log.module('AppInit');
 
 interface AppInitProps {
-  workspace: Workspace;
+  workspace: CustomizableWorkspace;
   workspaceStorage: WorkspaceStorage;
 
   setActiveTool: (type: (typeof ToolType)[keyof typeof ToolType]) => void;

packages/code-studio/src/main/AppMainContainer.tsx

@@ -71,11 +71,11 @@ import {
   setActiveTool as setActiveToolAction,
   updateWorkspaceData as updateWorkspaceDataAction,
   getPlugins,
-  Workspace,
   WorkspaceData,
   RootState,
   User,
   ServerConfigValues,
+  CustomizableWorkspace,
 } from '@deephaven/redux';
 import { bindAllMethods, PromiseUtils } from '@deephaven/utils';
 import GoldenLayout from '@deephaven/golden-layout';
@@ -130,7 +130,7 @@ interface AppMainContainerProps {
   updateDashboardData: (id: string, data: Partial<AppDashboardData>) => void;
   updateWorkspaceData: (workspaceData: Partial<WorkspaceData>) => void;
   user: User;
-  workspace: Workspace;
+  workspace: CustomizableWorkspace;
   plugins: PluginModuleMap;
   serverConfigValues: ServerConfigValues;
 }

packages/code-studio/src/settings/ColumnSpecificSectionContent.test.tsx

@@ -25,7 +25,7 @@ function renderContent({
   timeZone = '',
   truncateNumbersWithPound = false,
   settings = {} as WorkspaceSettings,
-  saveSettings = jest.fn(),
+  updateSettings = jest.fn(),
   scrollTo = undefined,
   defaultDecimalFormatOptions = {
     defaultFormatString: DEFAULT_DECIMAL_STRING,
@@ -45,7 +45,7 @@ function renderContent({
         timeZone={timeZone}
         truncateNumbersWithPound={truncateNumbersWithPound}
         settings={settings}
-        saveSettings={saveSettings}
+        updateSettings={updateSettings}
         scrollTo={scrollTo}
         defaultDecimalFormatOptions={defaultDecimalFormatOptions}
         defaultIntegerFormatOptions={defaultIntegerFormatOptions}

packages/code-studio/src/settings/ColumnSpecificSectionContent.tsx

@@ -28,7 +28,7 @@ import {
   getTimeZone,
   getShowTimeZone,
   getShowTSeparator,
-  saveSettings as saveSettingsAction,
+  updateSettings as updateSettingsAction,
   RootState,
   WorkspaceSettings,
 } from '@deephaven/redux';
@@ -49,14 +49,14 @@ import DateTimeOptions from './DateTimeOptions';
 
 export interface ColumnSpecificSectionContentProps {
   dh: DhType;
-  formatter?: FormatterItem[];
-  showTimeZone?: boolean;
-  showTSeparator?: boolean;
-  timeZone?: string;
-  saveSettings: (settings: Partial<WorkspaceSettings>) => void;
+  formatter: FormatterItem[];
+  showTimeZone: boolean;
+  showTSeparator: boolean;
+  timeZone: string;
+  updateSettings: (settings: Partial<WorkspaceSettings>) => void;
   scrollTo: (x: number, y: number) => void;
-  defaultDecimalFormatOptions?: FormatOption;
-  defaultIntegerFormatOptions?: FormatOption;
+  defaultDecimalFormatOptions: FormatOption;
+  defaultIntegerFormatOptions: FormatOption;
 }
 
 interface ColumnSpecificSectionContentState {
@@ -74,19 +74,6 @@ export class ColumnSpecificSectionContent extends PureComponent<
 > {
   static defaultProps = {
     scrollTo: (): void => undefined,
-    defaults: {
-      defaultDateTimeFormat:
-        DateTimeColumnFormatter.DEFAULT_DATETIME_FORMAT_STRING,
-      defaultDecimalFormatOptions: {
-        defaultFormatString: DecimalColumnFormatter.DEFAULT_FORMAT_STRING,
-      },
-      defaultIntegerFormatOptions: {
-        defaultFormatString: IntegerColumnFormatter.DEFAULT_FORMAT_STRING,
-      },
-      showTimeZone: false,
-      showTSeparator: true,
-      timeZone: DateTimeColumnFormatter.DEFAULT_TIME_ZONE_ID,
-    },
   };
 
   static inputDebounceTime = 250;
@@ -106,11 +93,6 @@ export class ColumnSpecificSectionContent extends PureComponent<
 
     const { formatter, showTimeZone, showTSeparator, timeZone } = props;
 
-    assertNotNull(formatter);
-    assertNotNull(showTimeZone);
-    assertNotNull(showTSeparator);
-    assertNotNull(timeZone);
-
     const formatSettings = formatter.map((item, i) => ({
       ...item,
       id: i,
@@ -275,11 +257,11 @@ export class ColumnSpecificSectionContent extends PureComponent<
         )
         .map(removeFormatRuleExtraProps) ?? [];
 
-    const { saveSettings } = this.props;
+    const { updateSettings } = this.props;
     const newSettings = {
       formatter: formatter as FormattingRule[],
     };
-    saveSettings(newSettings);
+    updateSettings(newSettings);
   }
 
   scrollToFormatBlockBottom(): void {
@@ -342,7 +324,6 @@ export class ColumnSpecificSectionContent extends PureComponent<
     switch (TableUtils.getNormalizedType(columnType)) {
       case TableUtils.dataType.INT: {
         const { defaultIntegerFormatOptions } = this.props;
-        assertNotNull(defaultIntegerFormatOptions);
         const { defaultFormatString: defaultIntegerFormatString } =
           defaultIntegerFormatOptions;
         return IntegerColumnFormatter.makeFormat(
@@ -356,7 +337,6 @@ export class ColumnSpecificSectionContent extends PureComponent<
 
       case TableUtils.dataType.DECIMAL: {
         const { defaultDecimalFormatOptions } = this.props;
-        assertNotNull(defaultDecimalFormatOptions);
         const { defaultFormatString: defaultDecimalFormatString } =
           defaultDecimalFormatOptions;
         return DecimalColumnFormatter.makeFormat(
@@ -565,7 +545,6 @@ export class ColumnSpecificSectionContent extends PureComponent<
     isInvalid: boolean
   ): ReactElement {
     const { defaultDecimalFormatOptions } = this.props;
-    assertNotNull(defaultDecimalFormatOptions);
     const { defaultFormatString } = defaultDecimalFormatOptions;
 
     const value = format.formatString ?? '';
@@ -643,7 +622,7 @@ export class ColumnSpecificSectionContent extends PureComponent<
 
 const mapStateToProps = (
   state: RootState
-): Omit<ColumnSpecificSectionContentProps, 'saveSettings' | 'scrollTo'> => ({
+): Omit<ColumnSpecificSectionContentProps, 'updateSettings' | 'scrollTo'> => ({
   formatter: getFormatter(state),
   defaultDecimalFormatOptions: getDefaultDecimalFormatOptions(state),
   defaultIntegerFormatOptions: getDefaultIntegerFormatOptions(state),
@@ -654,7 +633,7 @@ const mapStateToProps = (
 });
 
 const ConnectedColumnSpecificSectionContent = connect(mapStateToProps, {
-  saveSettings: saveSettingsAction,
+  updateSettings: updateSettingsAction,
 })(ColumnSpecificSectionContent);
 
 export default ConnectedColumnSpecificSectionContent;

packages/code-studio/src/settings/FormattingSectionContent.test.tsx

@@ -35,7 +35,7 @@ function renderSectionContent({
   showTSeparator = false,
   timeZone = '',
   defaultDateTimeFormat = '',
-  saveSettings = jest.fn(),
+  updateSettings = jest.fn(),
   scrollTo = jest.fn(),
   defaultDecimalFormatOptions = {
     defaultFormatString: DEFAULT_DECIMAL_STRING,
@@ -57,7 +57,7 @@ function renderSectionContent({
         timeZone={timeZone}
         defaultDateTimeFormat={defaultDateTimeFormat}
         truncateNumbersWithPound={truncateNumbersWithPound}
-        saveSettings={saveSettings}
+        updateSettings={updateSettings}
         scrollTo={scrollTo}
         defaultDecimalFormatOptions={defaultDecimalFormatOptions}
         defaultIntegerFormatOptions={defaultIntegerFormatOptions}
@@ -90,16 +90,18 @@ describe('default decimal formatting', () => {
 
   it('updates settings when value is changed', async () => {
     const user = userEvent.setup({ delay: null });
-    const saveSettings = jest.fn();
-    const { getByLabelText, unmount } = renderSectionContent({ saveSettings });
+    const updateSettings = jest.fn();
+    const { getByLabelText, unmount } = renderSectionContent({
+      updateSettings,
+    });
     const newFormat = '00.0';
     const input = getByLabelText('Decimal');
     await user.clear(input);
     await user.type(input, newFormat);
 
     jest.runOnlyPendingTimers();
 
-    expect(saveSettings).toHaveBeenCalledWith(
+    expect(updateSettings).toHaveBeenCalledWith(
       expect.objectContaining({
         defaultDecimalFormatOptions: { defaultFormatString: newFormat },
       })
@@ -110,12 +112,12 @@ describe('default decimal formatting', () => {
 
   it('resets to default', async () => {
     const user = userEvent.setup({ delay: null });
-    const saveSettings = jest.fn();
+    const updateSettings = jest.fn();
     const defaultFormatOptions = {
       defaultFormatString: DEFAULT_DECIMAL_STRING,
     };
     renderSectionContent({
-      saveSettings,
+      updateSettings,
       defaultDecimalFormatOptions: {
         defaultFormatString: '000',
       },
@@ -131,7 +133,7 @@ describe('default decimal formatting', () => {
 
     jest.runOnlyPendingTimers();
 
-    expect(saveSettings).toHaveBeenCalledWith(
+    expect(updateSettings).toHaveBeenCalledWith(
       expect.objectContaining({
         defaultDecimalFormatOptions: undefined,
       })
@@ -150,8 +152,10 @@ describe('default integer formatting', () => {
 
   it('updates settings when value is changed', async () => {
     const user = userEvent.setup({ delay: null });
-    const saveSettings = jest.fn();
-    const { getByLabelText, unmount } = renderSectionContent({ saveSettings });
+    const updateSettings = jest.fn();
+    const { getByLabelText, unmount } = renderSectionContent({
+      updateSettings,
+    });
     const newFormat = '000,000';
 
     const input = getByLabelText('Integer');
@@ -160,7 +164,7 @@ describe('default integer formatting', () => {
 
     jest.runOnlyPendingTimers();
 
-    expect(saveSettings).toHaveBeenCalledWith(
+    expect(updateSettings).toHaveBeenCalledWith(
       expect.objectContaining({
         defaultIntegerFormatOptions: { defaultFormatString: newFormat },
       })
@@ -171,12 +175,12 @@ describe('default integer formatting', () => {
 
   it('resets to default', async () => {
     const user = userEvent.setup({ delay: null });
-    const saveSettings = jest.fn();
+    const updateSettings = jest.fn();
     const defaultFormatOptions = {
       defaultFormatString: DEFAULT_INTEGER_STRING,
     };
     renderSectionContent({
-      saveSettings,
+      updateSettings,
       defaultIntegerFormatOptions: {
         defaultFormatString: '000',
       },
@@ -192,7 +196,7 @@ describe('default integer formatting', () => {
 
     jest.runOnlyPendingTimers();
 
-    expect(saveSettings).toHaveBeenCalledWith(
+    expect(updateSettings).toHaveBeenCalledWith(
       expect.objectContaining({
         defaultIntegerFormatOptions: undefined,
       })