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

Stable Release #2978

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1db37e0
Stage Release (#2871)
github-actions[bot] Jul 24, 2024
bc3337e
Resolve merge conflicts (#2878)
agalin920 Jul 25, 2024
55fdb6b
Stage merge conflicts (#2880)
agalin920 Jul 25, 2024
27b2b83
Stage merge conflicts 2 (#2893)
agalin920 Jul 30, 2024
71e4c82
Stage Release (#2885)
github-actions[bot] Jul 30, 2024
fa8c77b
Chore/resolve stage conflicts (#2895)
finnar-bin Jul 31, 2024
ccb121c
Stage Release (#2894)
github-actions[bot] Jul 31, 2024
954b4a0
Chore/resolve stage conflicts 3 (#2903)
finnar-bin Aug 1, 2024
d1f6f29
Stage Release (#2900)
github-actions[bot] Aug 1, 2024
a0841f3
Fix/resolve stage conflicts (#2907)
finnar-bin Aug 2, 2024
58f0bcb
Stage Release (#2906)
github-actions[bot] Aug 2, 2024
17151b5
Chore/resolve stage conflicts (#2912)
finnar-bin Aug 6, 2024
4541c18
Stage Release (#2910)
github-actions[bot] Aug 6, 2024
0ec8716
Chore/resolve dev stage conflicts (#2931)
finnar-bin Aug 27, 2024
04baa91
Stage Release (#2924)
github-actions[bot] Aug 27, 2024
84b5ce4
Chore/resolve stage conflicts (#2944)
finnar-bin Sep 4, 2024
dcdb274
Stage Release (#2935)
github-actions[bot] Sep 4, 2024
7876c43
Chore/resolve stage conflicts (#2949)
finnar-bin Sep 5, 2024
0501032
Stage Release (#2946)
github-actions[bot] Sep 5, 2024
754e42d
Chore/resolve merge conflicts (#2955)
finnar-bin Sep 12, 2024
c44b38f
Stage Release (#2950)
github-actions[bot] Sep 12, 2024
2ef5b94
Chore/resolve stage conflicts (#2964)
finnar-bin Sep 20, 2024
deeb2f5
Stage Release (#2957)
github-actions[bot] Sep 20, 2024
f151682
Chore/fix merge issues (#2968)
finnar-bin Sep 24, 2024
b48e55b
Chore/fix merge issues (#2969)
finnar-bin Sep 24, 2024
4a95625
Chore/resolve merge conflicts (#2971)
finnar-bin Sep 25, 2024
33208b5
Stage Release (#2967)
github-actions[bot] Sep 25, 2024
c5d02f9
Chore/resolve beta conflicts (#2976)
finnar-bin Sep 26, 2024
c66a379
Stage Release (#2973)
github-actions[bot] Sep 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions cypress/e2e/content/actions.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ describe("Actions in content editor", () => {
});

cy.get("input[name=title]", { timeout: 5000 }).click().type(timestamp);
cy.getBySelector("metaDescription")
.find("textarea")
.first()
.type(timestamp);
cy.getBySelector("CreateItemSaveButton").click();

cy.contains("Created Item", { timeout: 5000 }).should("exist");
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/content/analyticsDashboard.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe("Analytics dashboard", () => {
before(() => {
cy.waitOn("*getPropertyList*", () => {
cy.waitOn("*properties*", () => {
cy.visit("/content");
});
});
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/content/content.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ describe("Content Specs", () => {
});

it("Currency Field", () => {
cy.get("#12-b35c68-jd1s8s input[type=number]")
cy.get("#12-b35c68-jd1s8s input")
.focus()
.clear()
.type("100.00")
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/content/singlePageAnalytics.spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
describe("Single Page Analytics", () => {
before(() => {
cy.waitOn("*getPropertyList*", () => {
cy.waitOn("*properties*", () => {
cy.visit("/content/6-a1a600-k0b6f0/7-a1be38-1b42ht/analytics");
});
});
Expand Down
40 changes: 40 additions & 0 deletions cypress/e2e/schema/field.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ const SELECTORS = {
FIELD_SELECT_MEDIA: "FieldItem_images",
FIELD_SELECT_BOOLEAN: "FieldItem_yes_no",
FIELD_SELECT_ONE_TO_ONE: "FieldItem_one_to_one",
FIELD_SELECT_CURRENCY: "FieldItem_currency",
MEDIA_CHECKBOX_LIMIT: "MediaCheckbox_limit",
MEDIA_CHECKBOX_LOCK: "MediaCheckbox_group_id",
DROPDOWN_ADD_OPTION: "DropdownAddOption",
DROPDOWN_DELETE_OPTION: "DeleteOption",
AUTOCOMPLETE_MODEL_ZUID: "Autocomplete_relatedModelZUID",
AUTOCOMPLETE_FIELED_ZUID: "Autocomplete_relatedFieldZUID",
AUTOCOMPLETE_FIELD_CURRENCY: "Autocomplete_currency",
INPUT_LABEL: "FieldFormInput_label",
INPUT_NAME: "FieldFormInput_name",
INPUT_OPTION_LABEL: "OptionLabel",
Expand Down Expand Up @@ -357,6 +359,44 @@ describe("Schema: Fields", () => {
cy.getBySelector(`Field_${fieldName}`).should("exist");
});

it("Creates a currency field", () => {
cy.intercept("**/fields?showDeleted=true").as("getFields");

const fieldLabel = `Currency ${timestamp}`;
const fieldName = `currency_${timestamp}`;

// Open the add field modal
cy.getBySelector(SELECTORS.ADD_FIELD_BTN).should("exist").click();
cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("exist");

// Select one-to-one relationship field
cy.getBySelector(SELECTORS.FIELD_SELECT_CURRENCY).should("exist").click();

// Select default currency
cy.getBySelector(SELECTORS.AUTOCOMPLETE_FIELD_CURRENCY).type("phil");
cy.get("[role=listbox] [role=option]").first().click();

// Fill up fields
cy.getBySelector(SELECTORS.INPUT_LABEL).should("exist").type(fieldLabel);

// Navigate to rules tab and add default value
cy.getBySelector(SELECTORS.RULES_TAB_BTN).click();
// click on the default value checkbox
cy.getBySelector(SELECTORS.DEFAULT_VALUE_CHECKBOX).click();
// enter a default value
cy.getBySelector(SELECTORS.DEFAULT_VALUE_INPUT).type("1000.50");
// Verify default currency
cy.getBySelector(SELECTORS.DEFAULT_VALUE_INPUT).contains("PHP");
// Click done
cy.getBySelector(SELECTORS.SAVE_FIELD_BUTTON).should("exist").click();
cy.getBySelector(SELECTORS.ADD_FIELD_MODAL).should("not.exist");

cy.wait("@getFields");

// Check if field exists
cy.getBySelector(`Field_${fieldName}`).should("exist");
});

it("Creates a field via add another field button", () => {
cy.intercept("**/fields?showDeleted=true").as("getFields");

Expand Down
15 changes: 7 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@tinymce/tinymce-react": "^4.3.0",
"@welldone-software/why-did-you-render": "^6.1.1",
"@zesty-io/core": "1.10.0",
"@zesty-io/material": "^0.15.2",
"@zesty-io/material": "^0.15.5",
"chart.js": "^3.8.0",
"chartjs-adapter-moment": "^1.0.1",
"chartjs-plugin-datalabels": "^2.0.0",
Expand Down
Loading
Loading