Skip to content

Commit

Permalink
Update package-lock.json
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed Jul 10, 2024
1 parent ecfbce5 commit 63438aa
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 17 deletions.
2 changes: 1 addition & 1 deletion packages/admin/src-admin/src/bootstrap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { createRoot } from 'react-dom/client';
import * as Sentry from '@sentry/browser';

import './index.css';
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
import { LocalizationProvider } from '@mui/x-date-pickers';

import version from './version.json';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';

import { DatePicker, LocalizationProvider, TimePicker } from '@mui/x-date-pickers';
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';

import {
Dialog,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component, createRef } from 'react';

import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
import { DatePicker, LocalizationProvider, TimePicker } from '@mui/x-date-pickers';
import {
Button,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component } from 'react';

import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFnsV3';
import { LocalizationProvider, TimePicker, DatePicker } from '@mui/x-date-pickers';

import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,7 @@ class WizardSettingsTab extends Component<WizardSettingsTabProps, WizardSettings
this.props.socket.getCompactSystemConfig(true)
.then(obj => this.setState(
{
// @ts-expect-error will be fixed in js-controller
tempUnit: obj.common.tempUnit,
// @ts-expect-error will be fixed in js-controller
currency: obj.common.currency,
dateFormat: obj.common.dateFormat,
isFloatComma: obj.common.isFloatComma,
Expand All @@ -186,7 +184,6 @@ class WizardSettingsTab extends Component<WizardSettingsTabProps, WizardSettings
address: '',
longitude: obj.common.longitude,
latitude: obj.common.latitude,
// @ts-expect-error will be fixed in js-controller
firstDayOfWeek: obj.common.firstDayOfWeek || 'monday',
},
() => this.updateMap(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ class SystemSettingsDialog extends Component<SystemSettingsDialogProps, SystemSe
ownerGroup: 'system.group.administrator',
};

// @ts-expect-error will be fixed in js-controller
systemConfig.common.firstDayOfWeek = systemConfig.common.firstDayOfWeek || 'monday';

newState.diagData = await this.props.socket.getDiagData(this.props.currentHost, systemConfig.common.diag);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
if (!this.map || this.map !== map) {
this.map = map;
const center: LatLngTuple = [
parseFloat(this.props.data.common.latitude !== undefined ? this.props.data.common.latitude : '50') || 0,
parseFloat(this.props.data.common.longitude !== undefined ? this.props.data.common.longitude : '10') || 0,
parseFloat(this.props.data.common.latitude !== undefined ? this.props.data.common.latitude as any as string : '50') || 0,
parseFloat(this.props.data.common.longitude !== undefined ? this.props.data.common.longitude as any as string : '10') || 0,
];

this.marker = new Marker(
Expand Down Expand Up @@ -465,8 +465,8 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
this.latLongTimer && clearTimeout(this.latLongTimer);
this.latLongTimer = setTimeout(() => {
this.latLongTimer = null;
this.map.flyTo([parseFloat(this.props.data.common.latitude), parseFloat(this.props.data.common.longitude)]);
this.marker.setLatLng([parseFloat(this.props.data.common.latitude), parseFloat(this.props.data.common.longitude)]);
this.map.flyTo([parseFloat(this.props.data.common.latitude as any as string), parseFloat(this.props.data.common.longitude as any as string)]);
this.marker.setLatLng([parseFloat(this.props.data.common.latitude as any as string), parseFloat(this.props.data.common.longitude as any as string)]);
}, 500);
}
};
Expand Down Expand Up @@ -526,8 +526,8 @@ class MainSettingsDialog extends BaseSystemSettingsDialog<Props, State> {
const selectors = this.getSettings().map((e, i) => this.getSelect(e, i));

const center: LatLngTuple = [
parseFloat(this.props.data.common.latitude !== undefined ? this.props.data.common.latitude : '50') || 0,
parseFloat(this.props.data.common.longitude !== undefined ? this.props.data.common.longitude : '10') || 0,
parseFloat(this.props.data.common.latitude !== undefined ? this.props.data.common.latitude as any as string : '50') || 0,
parseFloat(this.props.data.common.longitude !== undefined ? this.props.data.common.longitude as any as string : '10') || 0,
];

const { zoom } = this.state;
Expand Down
2 changes: 1 addition & 1 deletion packages/admin/src-admin/src/version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "7.0.10"
"version": "7.0.11"
}
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ class ConfigCoordinates extends ConfigGeneric<ConfigCoordinatesProps, ConfigCoor
latitude: obj.common.latitude,
},
async () => {
await this.onChange(this.props.schema.longitudeName, (obj.common.longitude || '').trim());
await this.onChange(this.props.schema.latitudeName, (obj.common.latitude || '').trim());
await this.onChange(this.props.schema.longitudeName, obj.common.longitude);
await this.onChange(this.props.schema.latitudeName, obj.common.latitude);
},
);
} else {
Expand Down

0 comments on commit 63438aa

Please sign in to comment.