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.

Sign up for GitHub

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

Addon-interactions: Fix using dates in expect statements #28413

Open
wants to merge 15 commits into
base: next-8.5
Choose a base branch
from
Open

Addon-interactions: Fix using dates in expect statements #28413

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d8b9664
fix: Using dates in expect statements with the interactions add-on ca…
yann-combarnous Jul 1, 2024
ec0348e
chore: refactor
yann-combarnous Jul 1, 2024
fa49f1a
fix: catch invalid dates
yann-combarnous Jul 2, 2024
16bfd9d
Merge branch 'next' into fix/interaction-call-date-param
yann-combarnous Jul 3, 2024
aa39329
refactor: decouple logic and display
yann-combarnous Jul 16, 2024
a6e65bd
Merge branch 'next' into fix/interaction-call-date-param
yann-combarnous Jul 16, 2024
01b1d5c
define `generateStoryUIdFromRawStoryUid()`
Dec 20, 2024
5edc995
apply `generateStoryUIdFromRawStoryUid()`
Dec 20, 2024
96f8bb9
add a missing period
Dec 20, 2024
d65dcd0
Manager: Escape single quotes in dynamic import paths in wrapManagerE…
valentinpalkovic Dec 24, 2024
2c40552
Merge pull request #30137 from storybookjs/valentin/escape-apostrophe…
valentinpalkovic Dec 24, 2024
b982c44
Merge pull request #30114 from msmx-mnakagawa/fix-angular-accent-char…
valentinpalkovic Dec 24, 2024
529e939
Merge branch 'next' into fix/interaction-call-date-param
valentinpalkovic Dec 24, 2024
b266da8
Merge branch 'next-8.5' into fix/interaction-call-date-param
valentinpalkovic Dec 24, 2024
7fbcbcb
Merge branch 'next-8.5' into fix/interaction-call-date-param
valentinpalkovic Feb 12, 2025
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
Prev Previous commit
Next Next commit
chore: refactor
  • Loading branch information
@yann-combarnous
yann-combarnous committed Jul 1, 2024
commit ec0348e2e691379da55552e2ae39440622a5caec
2 changes: 1 addition & 1 deletion code/addons/interactions/src/components/MethodCall.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ export const ElementNode = ({
};

export const DateNode = ({ value }: { value: string | Date }) => {
const [date, time, ms] = (value instanceof Date ? value.toISOString() : value).split(/[T.Z]/);
const [date, time, ms] = new Date(value).toISOString().split(/[T.Z]/);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change assumes value can always be converted to a valid Date. However, if value is an invalid date string, new Date(value) will result in an invalid Date object (Invalid Date).

It can lead to runtime errors if value is not a valid date string. Consider adding error handling for invalid dates.

Suggestion: To handle potential invalid date values, add error handling and validate the date conversion.

Something like this:

export const DateNode = ({ value }: { value: string | Date }) => {
  let dateStr, time, ms;

  try {
    const dateObj = new Date(value);
    if (isNaN(dateObj.getTime())) {
      throw new Error('Invalid date');
    }
    [dateStr, time, ms] = dateObj.toISOString().split(/[T.Z]/);
  } catch (error) {
    console.error('Invalid date value provided to DateNode:', value);
    [dateStr, time, ms] = ['Invalid date', '', ''];
  }

  const colors = useThemeColors();
  return (
    <span style={{ whiteSpace: 'nowrap', color: colors.date }}>
      {dateStr} {time} {ms}
    </span>
  );
}

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx @jadehamel , updated PR with catch for invalid date.

Copy link
Member

@ghengeveld ghengeveld Jul 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a good suggestion. I think we can even make do without the try/catch by omitting the getTime call. I left a review with my take on it.

const colors = useThemeColors();
return (
<span style={{ whiteSpace: 'nowrap', color: colors.date }}>
Expand Down