Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
Expand Up @@ -19,6 +19,76 @@ describe("DatePicker Widget Property pane tests with js bindings", function() {
);
});

it("Datepicker default time picker validation by Time precision", function() {
// default value in property pane
cy.openPropertyPane("datepickerwidget2");
cy.get(".t--property-control-timeprecision span[type='p1']").should(
"have.text",
"Minute",
);

// default in date picker
cy.get(".t--widget-datepickerwidget2 input").click();
cy.wait(200);
// datepicker is open
cy.get(".bp3-popover .bp3-datepicker").should("exist");
// checking timepicker
cy.get(".bp3-datepicker-timepicker-wrapper .bp3-timepicker-input-row")
.children()
.should("have.length", 3);
cy.closePropertyPane();
});

it("Hide Time picker from Datepicker", function() {
// default value in property pane
cy.openPropertyPane("datepickerwidget2");

cy.get(".t--property-control-timeprecision .bp3-popover-target")
.last()
.click();
cy.get(".t--dropdown-option")
.children()
.contains("None")
.click();
cy.wait("@updateLayout");
// default in date picker

cy.get(".t--widget-datepickerwidget2 input").click();
cy.wait(200);
// datepicker is open
cy.get(".bp3-popover .bp3-datepicker").should("exist");
// checking timepicker not showing
cy.get(
".bp3-datepicker-timepicker-wrapper .bp3-timepicker-input-row",
).should("not.exist");
cy.closePropertyPane();
});

it("set second field in time picker for Datepicker", function() {
// default value in property pane
cy.openPropertyPane("datepickerwidget2");

cy.get(".t--property-control-timeprecision .bp3-popover-target")
.last()
.click();
cy.get(".t--dropdown-option")
.children()
.contains("Second")
.click();
cy.wait("@updateLayout");
// default in date picker

cy.get(".t--widget-datepickerwidget2 input").click();
cy.wait(200);
// datepicker is open
cy.get(".bp3-popover .bp3-datepicker").should("exist");
// checking timepicker
cy.get(".bp3-datepicker-timepicker-wrapper .bp3-timepicker-input-row")
.children()
.should("have.length", 5);
cy.closePropertyPane();
});

it("Text widgets binding with datepicker", function() {
cy.SearchEntityandOpen("Text1");
cy.testJsontext("text", "{{DatePicker1.formattedDate}}");
Expand Down
7 changes: 6 additions & 1 deletion app/client/src/widgets/DatePickerWidget2/component/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,11 @@ class DatePickerComponent extends React.Component<
}}
shortcuts={this.props.shortcuts}
showActionsBar
timePrecision={TimePrecision.MINUTE}
timePrecision={
this.props.timePrecision === "None"
? undefined
: this.props.timePrecision
}
value={value}
/>
</ErrorTooltip>
Expand Down Expand Up @@ -258,6 +262,7 @@ interface DatePickerComponentProps extends ComponentProps {
withoutPortal?: boolean;
closeOnSelection: boolean;
shortcuts: boolean;
timePrecision: TimePrecision | "None";
}

interface DatePickerComponentState {
Expand Down
2 changes: 2 additions & 0 deletions app/client/src/widgets/DatePickerWidget2/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Widget from "./widget";
import IconSVG from "./icon.svg";
import moment from "moment";
import { GRID_DENSITY_MIGRATION_V1 } from "widgets/constants";
import { TimePrecision } from "@blueprintjs/datetime";

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Lets use our TimePrecision


export const CONFIG = {
type: Widget.getWidgetType(),
Expand All @@ -23,6 +24,7 @@ export const CONFIG = {
isRequired: false,
closeOnSelection: false,
shortcuts: false,
timePrecision: TimePrecision.MINUTE,
},
properties: {
derived: Widget.getDerivedPropertiesMap(),
Expand Down
38 changes: 38 additions & 0 deletions app/client/src/widgets/DatePickerWidget2/widget/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import BaseWidget, { WidgetProps, WidgetState } from "widgets/BaseWidget";
import { WidgetType } from "constants/WidgetConstants";
import { EventType } from "constants/AppsmithActionConstants/ActionConstants";
import DatePickerComponent from "../component";
import { TimePrecision } from "@blueprintjs/datetime";

import { ValidationTypes } from "constants/WidgetValidation";
import { DerivedPropertiesMap } from "utils/WidgetFactory";
Expand Down Expand Up @@ -195,6 +196,41 @@ class DatePickerWidget extends BaseWidget<DatePickerWidget2Props, WidgetState> {
isTriggerProperty: false,
validation: { type: ValidationTypes.DATE_ISO_STRING },
},
{
propertyName: "timePrecision",
label: "Time precision",
controlType: "DROP_DOWN",
helpText: "Sets the different time picker or hide.",
defaultValue: TimePrecision.MINUTE,
options: [
{
label: "None",
value: "None",
},
{
label: "Minute",
value: TimePrecision.MINUTE,
},
{
label: "Second",
value: TimePrecision.SECOND,
},
],
isJSConvertible: true,
isBindProperty: true,
isTriggerProperty: false,
validation: {
type: ValidationTypes.TEXT,
params: {
allowedValues: [
"None",
TimePrecision.MINUTE,
TimePrecision.SECOND,
],
default: TimePrecision.MINUTE,
},
},
},
],
},
{
Expand Down Expand Up @@ -247,6 +283,7 @@ class DatePickerWidget extends BaseWidget<DatePickerWidget2Props, WidgetState> {
onDateSelected={this.onDateSelected}
selectedDate={this.props.value}
shortcuts={this.props.shortcuts}
timePrecision={this.props.timePrecision}
widgetId={this.props.widgetId}
/>
);
Expand Down Expand Up @@ -282,6 +319,7 @@ export interface DatePickerWidget2Props extends WidgetProps {
isRequired?: boolean;
closeOnSelection: boolean;
shortcuts: boolean;
timePrecision: TimePrecision | "None";
}

export default DatePickerWidget;
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { RenderOptionWrapper } from "./TableStyledWrappers";

//TODO(abhinav): Fix this cross import between widgets
import DatePickerComponent from "widgets/DatePickerWidget2/component";
import { TimePrecision } from "@blueprintjs/datetime";

const StyledRemoveIcon = styled(
ControlIcons.CLOSE_CIRCLE_CONTROL as AnyStyledComponent,
Expand Down Expand Up @@ -572,6 +573,7 @@ function Fields(props: CascadeFieldProps & { state: CascadeFieldState }) {
onDateSelected={onDateSelected}
selectedDate={value}
shortcuts={false}
timePrecision={TimePrecision.MINUTE}
widgetId=""
withoutPortal
/>
Expand Down