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

Jump to bottom

Added adaptivecards-fabric #3106

Merged
merged 7 commits into from
Jun 25, 2019
Merged

Added adaptivecards-fabric #3106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a23c389
added adaptive cards fabric; added tests
Jun 25, 2019
913e1ba
updated build scripts
Jun 25, 2019
f7c8371
input validation
Jun 25, 2019
220043d
reverted unintended changes
Jun 25, 2019
9f5cbb1
moved jest config to package.json; moved tests into src directory
Jun 25, 2019
41335be
CR feedback. updated string parsing; updated number parsing
Jun 25, 2019
7f18fb0
updated snapshots; minor cleanups
Jun 25, 2019
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
input validation
  • Loading branch information
Denis Fisenko committed Jun 25, 2019
commit f7c83713c791bd70855c95446e6f7450ec1ccf9a
20 changes: 10 additions & 10 deletions source/nodejs/adaptivecards-fabric/src/Actions/Actions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import * as AC from "adaptivecards";
import * as Shared from "../Utils/shared";
import { ActionButton } from "./ActionButton";

export function createActionDiv(
export const createActionDiv = (
title: string,
iconUrl: string,
baseCssClass: string,
iconPlacement: AC.ActionIconPlacement,
iconSize: number): HTMLDivElement {
iconSize: number): HTMLDivElement => {
const div = Shared.getDiv();
ReactDOM.render(
<ActionButton
Expand All @@ -22,7 +22,7 @@ export function createActionDiv(
iconPlacement={iconPlacement}
iconSize={iconSize}></ActionButton>, div);
return div;
}
};

export class OpenUrlActionFabric extends AC.OpenUrlAction {

Expand All @@ -41,13 +41,13 @@ export class OpenUrlActionFabric extends AC.OpenUrlAction {

export class SubmitActionFabric extends AC.SubmitAction {

private internalRenderedElement: any;
private internalRenderedElement: HTMLElement;

get renderedElement(): HTMLElement {
return this.internalRenderedElement;
}

public render(baseCssClass?: string) {
public render(baseCssClass?: string): void {
let actionsConfig = this.parent.hostConfig.actions;
const div = createActionDiv(this.title, this.iconUrl, baseCssClass, actionsConfig.iconPlacement, actionsConfig.iconSize);
this.internalRenderedElement = div;
Expand All @@ -56,13 +56,13 @@ export class SubmitActionFabric extends AC.SubmitAction {

export class ShowCardActionFabric extends AC.ShowCardAction {

private internalRenderedElement: any;
private internalRenderedElement: HTMLElement;

get renderedElement(): HTMLElement {
return this.internalRenderedElement;
}

public render(baseCssClass?: string) {
public render(baseCssClass?: string): void {
let actionsConfig = this.parent.hostConfig.actions;
const div = createActionDiv(this.title, this.iconUrl, baseCssClass, actionsConfig.iconPlacement, actionsConfig.iconSize);
this.internalRenderedElement = div;
Expand All @@ -71,14 +71,14 @@ export class ShowCardActionFabric extends AC.ShowCardAction {

export class ToggleVisibilityActionFabric extends AC.ToggleVisibilityAction {

private internalRenderedElement: any;
private internalRenderedElement: HTMLElement;

get renderedElement(): HTMLElement {
return this.internalRenderedElement;
}

public render(baseCssClass?: string) {
const div = document.createElement("div");
public render(baseCssClass?: string): void {
const div = Shared.getDiv();
ReactDOM.render(<ActionButton text={this.title} className={baseCssClass} />, div);
this.internalRenderedElement = div;
}
Expand Down
26 changes: 21 additions & 5 deletions source/nodejs/adaptivecards-fabric/src/Components/Inputs/InputDateFabric.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,29 @@ export class InputDateFabric extends Shared.ReactInputElement {
public getJsonTypeName = (): string => "Input.Date";

public parse = (json: any, errors?: AC.IValidationError[]) => {
const dateString = AC.getStringValue(json.value);
this.value = dateString;
this.date = dateString ? new Date(dateString) : new Date();
this.id = AC.getStringValue(json.id);
this.minDate = json.min ? new Date(AC.getStringValue(json.min)) : null;
this.maxDate = json.max ? new Date(AC.getStringValue(json.max)) : null;
this.placeholder = AC.getStringValue(json.placeholder);
this.parseDates(json, errors);
}

private parseDates = (json: any, errors?: AC.IValidationError[]) => {
const dateString = AC.getStringValue(json.value);
this.value = dateString;
this.date = dateString ? this.getDate(dateString) : new Date();
this.minDate = json.min ? this.getDate(AC.getStringValue(json.min)) : undefined;
this.maxDate = json.max ? this.getDate(AC.getStringValue(json.max)) : undefined;
}

private getDate = (dateString: string, errors?: AC.IValidationError[]): Date => {
try {
return new Date(dateString);
} catch (error) {
Shared.raiseParseError({
error: AC.ValidationError.InvalidPropertyValue,
message: error,
}, errors);
return undefined;
}
}

private buildDatePicker = () => {
Expand Down
4 changes: 2 additions & 2 deletions source/nodejs/adaptivecards-fabric/src/Components/Inputs/InputNumberFabric.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export class InputNumberFabric extends Shared.ReactInputElement {
public parse = (json: any, errors?: AC.IValidationError[]) => {
this.value = json.value;
this.id = AC.getStringValue(json.id);
this.min = json.min ? parseInt(AC.getStringValue(json.min), 10) : null;
this.max = json.max ? parseInt(AC.getStringValue(json.max), 10) : null;
this.min = json.min ? parseInt(AC.getStringValue(json.min), 10) : undefined;
this.max = json.max ? parseInt(AC.getStringValue(json.max), 10) : undefined;
this.placeholder = AC.getStringValue(json.placeholder);
}

Expand Down
2 changes: 1 addition & 1 deletion source/nodejs/adaptivecards-fabric/src/Components/Inputs/InputTextFabric.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class InputTextFabric extends Shared.ReactInputElement {
this.value = json.value;
this.id = AC.getStringValue(json.id);
this.isMultiline = AC.getBoolValue(json.isMultiline, false);
this.maxLength = json.maxLength ? parseInt(AC.getStringValue(json.maxLength), 10) : null;
this.maxLength = json.maxLength ? parseInt(AC.getStringValue(json.maxLength), 10) : undefined;
this.placeholder = AC.getStringValue(json.placeholder);
this.label = AC.getStringValue(json.label);
}
Expand Down
4 changes: 2 additions & 2 deletions source/nodejs/adaptivecards-fabric/src/Components/Inputs/InputTimeFabric.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export class InputTimeFabric extends Shared.ReactInputElement {
this.id = AC.getStringValue(json.id);
this.value = json.value;
this.placeholder = AC.getStringValue(json.placeholder);
this.min = AC.getStringValue(json.min);
this.max = AC.getStringValue(json.max);
this.min = json.min ? AC.getStringValue(json.min) : undefined;
dfisenko marked this conversation as resolved.
Show resolved Hide resolved
this.max = json.max ? AC.getStringValue(json.max) : undefined;
}

protected renderReact = (): JSX.Element => {
Expand Down