Skip to content

feat: edit org display names and descriptions #13474

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 8 commits into from
Jun 6, 2024
Merged

feat: edit org display names and descriptions #13474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6e2ffd1
feat: allow editing org display name and description
aslilac Jun 4, 2024
3904a07
fix dbmem and add additional tests
aslilac Jun 5, 2024
50d046f
🧹
aslilac Jun 5, 2024
7e77d6a
🔮
aslilac Jun 5, 2024
55be1bc
tweak validation
aslilac Jun 5, 2024
78c19b7
fix migration order
aslilac Jun 5, 2024
c5f8ccb
make display name optional to avoid breakage
aslilac Jun 5, 2024
24af34e
✏️
aslilac Jun 5, 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
Prev Previous commit
Next Next commit
🧹
  • Loading branch information
@aslilac
aslilac committed Jun 5, 2024
commit 50d046f7c2a994a2c0373ae8ffa08a5e16de94a9
1 change: 1 addition & 0 deletions coderd/database/dbgen/dbgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@ func Organization(t testing.TB, db database.Store, orig database.Organization) d
org, err := db.InsertOrganization(genCtx, database.InsertOrganizationParams{
ID: takeFirst(orig.ID, uuid.New()),
Name: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
DisplayName: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
Description: takeFirst(orig.Description, namesgenerator.GetRandomName(1)),
CreatedAt: takeFirst(orig.CreatedAt, dbtime.Now()),
UpdatedAt: takeFirst(orig.UpdatedAt, dbtime.Now()),
Expand Down
4 changes: 2 additions & 2 deletions coderd/organizations_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func TestPostOrganizationsByUser(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitLong)

_, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
Name: "A name which is definitely! not! url! safe!",
Name: "A name which is definitely not url safe",
DisplayName: "New",
})
var apiErr *codersdk.Error
Expand Down Expand Up @@ -207,7 +207,7 @@ func TestPatchOrganizationsByUser(t *testing.T) {
require.NoError(t, err)

_, err = client.UpdateOrganization(ctx, o.ID.String(), codersdk.UpdateOrganizationRequest{
Name: "something! unique! but not! url! safe!",
Name: "something unique but not url safe",
})
var apiErr *codersdk.Error
require.ErrorAs(t, err, &apiErr)
Expand Down