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

28/10 Daily Promotion #37113

Merged
merged 11 commits into from
Oct 28, 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
Expand Up @@ -19,7 +19,7 @@ describe(

// ADS changes to date input property causes this test to fail
// skipping it temporarily.
it.skip("DatePicker-Date Name validation", function () {
it("DatePicker-Date Name validation", function () {
// changing the date to today
cy.get(formWidgetsPage.defaultDate).click();
cy.SetDateToToday();
Expand All @@ -36,10 +36,8 @@ describe(

/**
* setDate--> is a Command to select the date in the date picker
* @param1 --> its takes currentday+ <future day> eg: 1
* @param2 --> user date formate
*/
cy.setDate(1, "ddd MMM DD YYYY");
cy.setDate(1);
const nextDay = dayjs().add(1, "days").format("DD/MM/YYYY");
cy.log(nextDay);
cy.get(formWidgetsPage.datepickerWidget + " .bp3-input").should(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ describe(
});

// to work on redesign of the test, commenting for now
it.skip("7. Verify colors, borders and shadows", () => {
it("7. Verify colors, borders and shadows", () => {
// Verify font color picker opens up
propPane.MoveToTab("Style");
agHelper.GetNClick(propPane._propertyControlColorPicker("accentcolor"));
Expand Down Expand Up @@ -220,11 +220,16 @@ describe(
// Border Color
propPane.SelectColorFromColorPicker("bordercolor", 13);
assertHelper.AssertNetworkStatus("@updateLayout");
agHelper.AssertCSS(
tabs._tabsWidgetStyle,
"border-color",
"rgb(185, 28, 28)",
);

agHelper
.GetWidgetCSSFrAttribute(propPane._borderColorCursor, "color")
.then((color) => {
agHelper
.GetWidgetCSSFrAttribute(locators._widgetBorder, "color", 1)
.then((bgcolor) => {
expect(color).to.eq(bgcolor);
});
});

agHelper.AssertAttribute(propPane._colorPickerInput, "type", "text", 2);
propPane.TogglePropertyState("bordercolor", "On", "");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { dataSources, agHelper } from "../../../../support/Objects/ObjectsCore";
describe(
describe.skip(
"Switch datasource",
{ tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
function () {
Expand Down
1 change: 1 addition & 0 deletions app/client/cypress/support/Objects/CommonLocators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -341,4 +341,5 @@ export class CommonLocators {
_saveDatasource = `[data-testid='t--store-as-datasource']`;
_propertyCollapseBody = ".bp3-collapse-body";
_propertyCollapse = ".bp3-collapse";
_widgetBorder = ".t--draggable-tabswidget div div div";
}
5 changes: 3 additions & 2 deletions app/client/cypress/support/Pages/AggregateHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1191,11 +1191,12 @@ export class AggregateHelper {

public ActionContextMenuSubItem({
force = false,
index = 0,
subAction,
toastToValidate = "",
}: SubActionParams) {
this.GetNClick(this.locator._contextMenuItem(subAction), index, force);
cy.xpath(this.locator._contextMenuItem(subAction)).trigger("click", {
force: force,
});
this.Sleep(500);
toastToValidate && this.AssertContains(toastToValidate);
}
Expand Down
1 change: 1 addition & 0 deletions app/client/cypress/support/Pages/PropertyPane.ts
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ export class PropertyPane {
_dataIcon = (icon: string) => `[data-icon="${icon}"]`;
_iconDropdown = "[data-test-id='virtuoso-scroller']";
_dropdownControlError = "[data-testid='t---dropdown-control-error']";
_borderColorCursor = ".t--property-control-bordercolor .bp3-input-group div";

public OpenJsonFormFieldSettings(fieldName: string) {
this.agHelper.GetNClick(this._jsonFieldEdit(fieldName));
Expand Down
7 changes: 3 additions & 4 deletions app/client/cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -524,10 +524,9 @@ Cypress.Commands.add("getDate", (date, dateFormate) => {
return eDate;
});

Cypress.Commands.add("setDate", (date, dateFormate) => {
const expDate = dayjs().add(date, "days").format(dateFormate);
const sel = `.DayPicker-Day[aria-label=\"${expDate}\"]`;
cy.get(sel).click();
Cypress.Commands.add("setDate", (date) => {
const expDate = dayjs().add(date, "days").format("dddd, MMMM DD");
cy.get(`.react-datepicker__day[aria-label^="Choose ${expDate}"]`).click();
});

Cypress.Commands.add("validateDisableWidget", (widgetCss, disableCss) => {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const createHeading = (
fontWeight={fontWeight}
ref={ref as Ref<HTMLDivElement>}
size={size}
wordBreak="break-word"
>
{children}
</Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ export const a = (props: LinkProps) => {
const { children, href } = props;

return (
<Link data-component="a" href={href} rel="noreferrer" target="_blank">
<Link
data-component="a"
href={href}
rel="noreferrer"
target="_blank"
wordBreak="break-word"
>
{children}
</Link>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
.markdown {
color: var(--color-fg);

&::after,
&::before {
/* This is required to remove the compensators of capsizing that comes up due to use of `wds-body-text` class */
content: none !important;
}

table {
border: var(--border-width-1) solid var(--color-bd);
border-collapse: separate;
Expand Down Expand Up @@ -97,7 +91,7 @@
background-color: var(--color-bg-elevation-2);
border-radius: var(--border-radius-elevation-3);
outline: var(--border-width-1) solid var(--color-bg-neutral-subtle);
margin-bottom: var(--spacing-2);
margin-bottom: var(--inner-spacing-2);
overflow: auto;
}

Expand Down
1 change: 0 additions & 1 deletion app/client/packages/design-system/widgets/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export * from "./components/Radio";
export * from "./components/ListBox";
export * from "./components/ListBoxItem";
export * from "./components/MenuItem";
export * from "./components/Avatar";
export * from "./components/Markdown";

export * from "./utils";
Expand Down
Loading
Loading