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

fix: change order of eventtypes and routingforms #17615

Merged
merged 11 commits into from
Nov 25, 2024
Merged

fix: change order of eventtypes and routingforms #17615

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e9334e5
change order of eventtypes and routingforms
vijayraghav-io Nov 13, 2024
c1b34cb
for workflows
vijayraghav-io Nov 13, 2024
457b409
for filtered workflows
vijayraghav-io Nov 13, 2024
2009ddb
update slug of first expected event-type
vijayraghav-io Nov 13, 2024
e89a423
Merge branch 'main' into fix_changedisplayOrder
anikdhabal Nov 20, 2024
a598e8e
Merge branch 'main' into fix_changedisplayOrder
PeerRich Nov 20, 2024
d680f74
updated due to latest merges
vijayraghav-io Nov 21, 2024
769b6e6
Merge branch 'main' of https://github.com/calcom/cal.com into fix_cha…
vijayraghav-io Nov 21, 2024
1998801
test to ensure new eventtype added is first in the list
vijayraghav-io Nov 21, 2024
f25e323
Merge branch 'main' of https://github.com/calcom/cal.com into fix_cha…
vijayraghav-io Nov 23, 2024
0b44c86
test for workflows
vijayraghav-io Nov 23, 2024
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
12 changes: 6 additions & 6 deletions apps/web/playwright/embed-code-generator.e2e.ts
View file
Open in desktop
Praashh marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ test.describe("Embed Code Generator Tests", () => {
await page.waitForTimeout(1000);
await expectToContainValidPreviewIframe(page, {
embedType: "inline",
calLink: `${pro.username}/30-min`,
calLink: `${pro.username}/multiple-duration`,
});
});

Expand Down Expand Up @@ -102,7 +102,7 @@ test.describe("Embed Code Generator Tests", () => {
await page.waitForTimeout(1000);
await expectToContainValidPreviewIframe(page, {
embedType: "floating-popup",
calLink: `${pro.username}/30-min`,
calLink: `${pro.username}/multiple-duration`,
});
});

Expand Down Expand Up @@ -140,7 +140,7 @@ test.describe("Embed Code Generator Tests", () => {
await page.waitForTimeout(1000);
await expectToContainValidPreviewIframe(page, {
embedType: "element-click",
calLink: `${pro.username}/30-min`,
calLink: `${pro.username}/multiple-duration`,
});
});
});
Expand Down Expand Up @@ -238,7 +238,7 @@ test.describe("Embed Code Generator Tests", () => {
await page.waitForTimeout(1000);
await expectToContainValidPreviewIframe(page, {
embedType: "inline",
calLink: `${user.username}/30-min`,
calLink: `${user.username}/multiple-duration`,
bookerUrl: getOrgFullOrigin(org?.slug ?? ""),
});
});
Expand Down Expand Up @@ -279,7 +279,7 @@ test.describe("Embed Code Generator Tests", () => {
await page.waitForTimeout(1000);
await expectToContainValidPreviewIframe(page, {
embedType: "floating-popup",
calLink: `${user.username}/30-min`,
calLink: `${user.username}/multiple-duration`,
bookerUrl: getOrgFullOrigin(org?.slug ?? ""),
});
});
Expand Down Expand Up @@ -319,7 +319,7 @@ test.describe("Embed Code Generator Tests", () => {
await page.waitForTimeout(1000);
await expectToContainValidPreviewIframe(page, {
embedType: "element-click",
calLink: `${user.username}/30-min`,
calLink: `${user.username}/multiple-duration`,
bookerUrl: getOrgFullOrigin(org?.slug ?? ""),
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/app-store/routing-forms/trpc/forms.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const formsHandler = async ({ ctx, input }: FormsHandlerOptions) => {
position: "desc",
},
{
createdAt: "asc",
createdAt: "desc",
},
],
include: {
Expand Down
4 changes: 2 additions & 2 deletions packages/lib/server/repository/workflow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export class WorkflowRepository {
position: "desc",
},
{
id: "asc",
id: "desc",
},
],
});
Expand Down Expand Up @@ -267,7 +267,7 @@ export class WorkflowRepository {
where,
include: includedFields,
orderBy: {
id: "asc",
id: "desc",
},
});

Expand Down
4 changes: 2 additions & 2 deletions packages/trpc/server/routers/viewer/eventTypes/getEventTypesFromGroup.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const getEventTypesFromGroup = async ({
position: "desc",
},
{
id: "asc",
id: "desc",
},
],
limit,
Expand Down Expand Up @@ -136,7 +136,7 @@ export const getEventTypesFromGroup = async ({
position: "desc",
},
{
id: "asc",
id: "desc",
},
],
})) ?? [];
Expand Down
Loading