Skip to content

Commit

Permalink
Merge branch 'react-widgets5'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Signum.React/Scripts/Signum.Entities.ts
  • Loading branch information
olmobrutall committed Dec 19, 2020
2 parents ae8fd42 + da71d2a commit 760bdeb
Show file tree
Hide file tree
Showing 12 changed files with 410 additions and 313 deletions.
49 changes: 49 additions & 0 deletions Signum.Entities/EnumMessages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,55 @@ public enum JavascriptMessage
[Description("Show Previous Operation")]
showPreviousOperation,

[Description("Date")]
Date,
[Description("Time")]
Time,
}

//https://github.com/jquense/react-widgets/blob/5d4985c6dac0df34b86c7d8ad311ff97066977ab/packages/react-widgets/src/messages.tsx#L35
[AllowUnathenticated]
public enum ReactWidgetsMessage
{
[Description("Today")]
MoveToday,

[Description("Navigate back")]
MoveBack,
[Description("Navigate forward")]
MoveForward,
[Description("Select date")]
DateButton,
[Description("Select time")]
TimeButton,
[Description("open combobox")]
OpenCombobox,
[Description("open dropdown")]
OpenDropdown,
[Description("")]
Placeholder,
[Description("")]
FilterPlaceholder,
[Description("There are no items in this list")]
EmptyList,
[Description("The filter returned no results")]
EmptyFilter,
[Description("Create option")]
CreateOption,
[Description("Create option {0}")]
CreateOption0,
[Description("Selected items")]
TagsLabel,
[Description("Remove selected item")]
RemoveLabel,
[Description("no selected items")]
NoneSelected,
[Description("Selected items: {0}")]
SelectedItems0,
[Description("Increment value")]
IncrementValue,
[Description("Decrement value")]
DecrementValue,
}

public enum QuickLinkMessage
Expand Down
239 changes: 0 additions & 239 deletions Signum.React/Scripts/ConfigureReactWidgets.ts

This file was deleted.

Loading

2 comments on commit 760bdeb

@olmobrutall
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Upgrade to react 17.0, react-widgets 5.0.0-beta.22, d3 6.0 etc..

This merge and the following commits upgrades almost all npm dependencies to the latest version, the most important ones:

How to upgrade

Just run Upgrade_20201220_React17

@MehdyKarimpour
Copy link
Contributor

@MehdyKarimpour MehdyKarimpour commented on 760bdeb Dec 20, 2020 via email

Choose a reason for hiding this comment

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

Please sign in to comment.