Skip to content

feat(site): display version message #8435

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

Merged
merged 14 commits into from
Jul 13, 2023
Merged

feat(site): display version message #8435

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5bc48df
Add base
BrunoQuaresma Jul 11, 2023
42643b6
Add more info to outdated tooltip
BrunoQuaresma Jul 11, 2023
3936a13
Fix link
BrunoQuaresma Jul 12, 2023
3496e4d
Fix test
BrunoQuaresma Jul 12, 2023
e01ac01
feat(coderd): allow template version message to be set to empty
mafredri Jul 12, 2023
273061a
fix(coderd): fix bug in template creation that resets the message
mafredri Jul 12, 2023
ebd8e0d
make gen
mafredri Jul 12, 2023
5904c6d
fix patch in template editor
mafredri Jul 12, 2023
9cdce40
fix comment
mafredri Jul 12, 2023
46ac0d6
Fix test
BrunoQuaresma Jul 12, 2023
434cf2b
Fix fmt
BrunoQuaresma Jul 12, 2023
4fff5e2
Fix storybook
BrunoQuaresma Jul 12, 2023
4d610e1
Merge branch 'main' into bq/add-version-message
BrunoQuaresma Jul 12, 2023
e4196c4
Merge branch 'main' into bq/add-version-message
BrunoQuaresma Jul 12, 2023
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
Fix test
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Jul 12, 2023
commit 46ac0d629482ee03b18b2c071d31fbb2b685782a
17 changes: 12 additions & 5 deletions ...rc/pages/TemplateVersionPage/TemplateVersionEditorPage/TemplateVersionEditorPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,11 @@ test("Do not mark as active if promote is not checked", async () => {
expect(updateActiveTemplateVersion).toBeCalledTimes(0)
})

test("Patch request is not send when the name is not updated", async () => {
test("Patch request is not send when there are no changes", async () => {
const MockTemplateVersionWithEmptyMessage = {
...MockTemplateVersion,
message: "",
}
const user = userEvent.setup()
renderWithAuth(<TemplateVersionEditorPage />, {
extraRoutes: [
Expand All @@ -160,10 +164,13 @@ test("Patch request is not send when the name is not updated", async () => {
jest.spyOn(api, "uploadTemplateFile").mockResolvedValueOnce({ hash: "hash" })
jest
.spyOn(api, "createTemplateVersion")
.mockResolvedValueOnce(MockTemplateVersion)
.mockResolvedValueOnce(MockTemplateVersionWithEmptyMessage)
jest
.spyOn(api, "getTemplateVersion")
.mockResolvedValue({ ...MockTemplateVersion, id: "new-version-id" })
.mockResolvedValue({
...MockTemplateVersionWithEmptyMessage,
id: "new-version-id",
})
jest
.spyOn(api, "watchBuildLogsByTemplateVersionId")
.mockImplementation((_, options) => {
Expand All @@ -179,7 +186,7 @@ test("Patch request is not send when the name is not updated", async () => {
// Publish
const patchTemplateVersion = jest
.spyOn(api, "patchTemplateVersion")
.mockResolvedValue(MockTemplateVersion)
.mockResolvedValue(MockTemplateVersionWithEmptyMessage)
await within(topbar).findByText("Success")
const publishButton = within(topbar).getByRole("button", {
name: "Publish version",
Expand All @@ -188,7 +195,7 @@ test("Patch request is not send when the name is not updated", async () => {
const publishDialog = await screen.findByTestId("dialog")
// It is using the name from the template version
const nameField = within(publishDialog).getByLabelText("Version name")
expect(nameField).toHaveValue(MockTemplateVersion.name)
expect(nameField).toHaveValue(MockTemplateVersionWithEmptyMessage.name)
// Publish
await user.click(
within(publishDialog).getByRole("button", { name: "Publish" }),
Expand Down
4 changes: 2 additions & 2 deletions site/src/xServices/templateVersionEditor/templateVersionEditorXService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,9 +395,9 @@ export const templateVersionEditorMachine = createMachine(
if (!templateId) {
throw new Error("Template is not set")
}
const haveChanges = name !== version.name || message !== version.message
await Promise.all([
// Only do a patch if the data has changed.
name !== version.name || message !== version.message
haveChanges
? API.patchTemplateVersion(version.id, { name, message })
: Promise.resolve(),
isActiveVersion
Expand Down