Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(react-components): timestamp bar correct date #2872

Merged
merged 1 commit into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React, { useCallback, useEffect, useState } from 'react';
import { Viewport, registerPlugin } from '@iot-app-kit/core';
import { ComponentMeta, ComponentStory } from '@storybook/react';

Expand All @@ -10,6 +10,17 @@ import {
import { DEFAULT_REGION } from '~/msw/constants';
import { useWorker } from '~/msw/useWorker';
import { RefreshRate } from '~/components/refreshRate/types';
import {
DateRangePicker,
DateRangePickerProps,
FormField,
} from '@cloudscape-design/components';
import { Controller, useForm } from 'react-hook-form';
import {
dateRangeToViewport,
rangeValidator,
viewportToDateRange,
} from '@iot-app-kit/core-util';

/**
* Data is mocked by the service worker started above.
Expand Down Expand Up @@ -63,8 +74,56 @@ export default {
],
} as ComponentMeta<typeof Dashboard>;

const ViewportPicker = (props: {
onChangeValue: (value: DateRangePickerProps.Value) => void;
viewport?: Viewport;
}) => {
const { control, setValue, clearErrors } = useForm<{
currentViewport: Viewport | undefined;
}>({
mode: 'onChange',
});

useEffect(() => {
clearErrors();
}, [clearErrors, setValue]);

return (
<Controller
control={control}
name='currentViewport'
render={({ field, fieldState }) => {
return (
<FormField label='asjdalksdlka' errorText={fieldState.error?.message}>
<DateRangePicker
expandToViewport={true}
onChange={({ detail: { value } }) => {
if (!value) return;
field.onChange(value);
props.onChangeValue(value);
}}
value={viewportToDateRange(props.viewport)}
showClearButton={false}
relativeOptions={[]}
isValidRange={rangeValidator({
dateRangeIncompleteError: 'no',
dateRangeInvalidError: 'yes no',
})}
/>
</FormField>
);
}}
/>
);
};

export const Empty: ComponentStory<typeof Dashboard> = () => {
const [viewmode, setViewmode] = useState<'edit' | 'preview'>('edit');
const [viewport, setViewport] = useState<Viewport | undefined>(undefined);
const onViewportChange = useCallback(
(v: Viewport) => setViewport(v),
[setViewport]
);

const customToolbar = ({
viewmode,
Expand All @@ -90,8 +149,14 @@ export const Empty: ComponentStory<typeof Dashboard> = () => {
<button
onClick={() => setViewmode(viewmode === 'edit' ? 'preview' : 'edit')}
>
Change viewmode
viewmode
</button>
<ViewportPicker
viewport={viewport}
onChangeValue={(value: DateRangePickerProps.Value) => {
setViewport(dateRangeToViewport(value));
}}
/>
</div>
);
};
Expand All @@ -100,7 +165,10 @@ export const Empty: ComponentStory<typeof Dashboard> = () => {
<Dashboard
{...emptyDashboardConfiguration}
initialViewMode={viewmode}
currentViewport={viewport}
onViewportChange={onViewportChange}
toolbar={customToolbar}
onDashboardConfigurationChange={(config) => console.log('##', config)}
/>
);
};
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ const BaseChart = ({
isLoading={isPropertiesRefreshing}
showLoadingIndicator={true}
styleProps={timestampStyle}
viewport={utilizedViewport}
/>
</div>
{options.legend?.visible && (
Expand Down
Loading