Skip to content

Commit

Permalink
Stage Release (#2714)
Browse files Browse the repository at this point in the history
Created by Github action
  • Loading branch information
shrunyan authored May 23, 2024
2 parents 0c984b2 + b56963f commit ac4e765
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/cd-beta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:
- name: Create Stable Release
if: "!steps.check.outputs.skip"

run: gh pr create -B stable -H beta --title 'Stable Release' --body 'Created by Github action'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15 changes: 15 additions & 0 deletions cypress/e2e/content/actions.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,21 @@ describe("Actions in content editor", () => {
);
});

it("Fills in default values for a new item", () => {
cy.waitOn("/v1/content/models*", () => {
cy.visit("/content/6-a1a600-k0b6f0/new");
});

cy.get("#12-0c3934-8dz720 input").should(
"have.value",
"default single line text field"
);
cy.get("#12-d39a38-85sqdt").contains("zesty-io-logo-horizontal-dark.png");
cy.get("#12-bcd1dcc5f4-2rpm9p").contains(
"5 Tricks to Teach Your Pitbull: Fun & Easy Tips for You & Your Dog!"
);
});

it("Creates a new item", () => {
cy.waitOn("/v1/content/models*", () => {
cy.visit("/content/6-a1a600-k0b6f0/new");
Expand Down
15 changes: 8 additions & 7 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.13.1",
"@zesty-io/material": "^0.13.2",
"chart.js": "^3.8.0",
"chartjs-adapter-moment": "^1.0.1",
"chartjs-plugin-datalabels": "^2.0.0",
Expand Down
8 changes: 7 additions & 1 deletion src/shell/components/FieldTypeDateTime/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const FieldTypeDateTime = ({
if (showTimezonePicker) {
return `Stored in UTC as ${moment
.utc(moment.tz(value, timezone))
.format("yyyy-MM-DD HH:mm:ss.ssssss")}`;
.format()}`;
}

if (dateString && timeString) {
Expand Down Expand Up @@ -271,6 +271,7 @@ export const FieldTypeDateTime = ({
),
timezonePicker: showTimezonePicker && (
<Autocomplete
autoHighlight
fullWidth
disableClearable
size="small"
Expand All @@ -294,6 +295,11 @@ export const FieldTypeDateTime = ({
setTimezone(value.id);
onTimezoneChange && onTimezoneChange(value.id);
}}
ListboxProps={{
sx: {
maxHeight: 320,
},
}}
/>
),
}}
Expand Down
1 change: 1 addition & 0 deletions src/shell/components/favicon/favicon.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ export default connect((state) => {
name={"favicon"}
onChange={handleImage}
hideDrag
images={[]}
/>
{imageModal && (
<MemoryRouter>
Expand Down

0 comments on commit ac4e765

Please sign in to comment.