Jan 19, 2024 · Jan 18, 2024 · Jan 18, 2024 · Jan 18, 2024 · Jan 18, 2024 · Jan 19, 2024
diff --git a/enterprise/coderd/templates_test.go b/enterprise/coderd/templates_test.go
 require.Empty(t, template.DeprecationMessage)
 require.False(t, template.Deprecated)
 })

 // Create a template, remove the group, see if an owner can
 // still fetch the template.
 t.Run("GetOnEveryoneRemove", func(t *testing.T) {
 t.Parallel()
 owner, first := coderdenttest.New(t, &coderdenttest.Options{
 Options: &coderdtest.Options{
 IncludeProvisionerDaemon: true,
 TemplateScheduleStore:    schedule.NewEnterpriseTemplateScheduleStore(agplUserQuietHoursScheduleStore()),
 },
 LicenseOptions: &coderdenttest.LicenseOptions{
 Features: license.Features{
 codersdk.FeatureAccessControl: 1,
 codersdk.FeatureTemplateRBAC:  1,
 },
 },
 })

 client, _ := coderdtest.CreateAnotherUser(t, owner, first.OrganizationID, rbac.RoleTemplateAdmin())
 version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil)
 template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID)

 ctx := testutil.Context(t, testutil.WaitMedium)
 err := client.UpdateTemplateACL(ctx, template.ID, codersdk.UpdateTemplateACL{
 UserPerms: nil,
 GroupPerms: map[string]codersdk.TemplateRole{
 // OrgID is the everyone ID
 first.OrganizationID.String(): codersdk.TemplateRoleDeleted,
 },
 })
 require.NoError(t, err)

 ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 defer cancel()

 _, err = owner.Template(ctx, template.ID)
 require.NoError(t, err)
 })
 }

 func TestTemplateACL(t *testing.T) {
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
 export const updateTemplateMeta = async (
  templateId: string,
  data: TypesGen.UpdateTemplateMeta,
 ): Promise<TypesGen.Template> => {
 ): Promise<TypesGen.Template | null> => {
  const response = await axios.patch<TypesGen.Template>(
    `/api/v2/templates/${templateId}`,
    data,
  );
  // On 304 response there is no data payload.
  if (response.status === 304) {
    return null;
  }

  return response.data;
 };

diff --git a/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.tsx b/site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.tsx
    (data: UpdateTemplateMeta) => updateTemplateMeta(template.id, data),
    {
      onSuccess: async (data) => {
        // we use data.name because an admin may have updated templateName to something new
        await queryClient.invalidateQueries(
          templateByNameKey(orgId, data.name),
        );
        // This update has a chance to return a 304 which means nothing was updated.
        // In this case, the return payload will be empty and we should use the
        // original template data.
        if (!data) {
          data = template;
        } else {
          // Only invalid the query if data is returned, indicating at least one field was updated.
          //
          // we use data.name because an admin may have updated templateName to something new
          await queryClient.invalidateQueries(
            templateByNameKey(orgId, data.name),
          );
        }
        displaySuccess("Template updated successfully");
        navigate(`/templates/${data.name}`);
      },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -687,6 +687,44 @@ func TestTemplates(t *testing.T) {
		require.Empty(t, template.DeprecationMessage)
		require.False(t, template.Deprecated)
		})

		// Create a template, remove the group, see if an owner can
		// still fetch the template.
		t.Run("GetOnEveryoneRemove", func(t *testing.T) {
Comment on lines +691 to +693 Copy link MemberAuthor EmyrkJan 18, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Probably worth keeping, it was the original report.
		t.Parallel()
		owner, first := coderdenttest.New(t, &coderdenttest.Options{
		Options: &coderdtest.Options{
		IncludeProvisionerDaemon: true,
		TemplateScheduleStore: schedule.NewEnterpriseTemplateScheduleStore(agplUserQuietHoursScheduleStore()),
		},
		LicenseOptions: &coderdenttest.LicenseOptions{
		Features: license.Features{
		codersdk.FeatureAccessControl: 1,
		codersdk.FeatureTemplateRBAC: 1,
		},
		},
		})

		client, _ := coderdtest.CreateAnotherUser(t, owner, first.OrganizationID, rbac.RoleTemplateAdmin())
		version := coderdtest.CreateTemplateVersion(t, client, first.OrganizationID, nil)
		template := coderdtest.CreateTemplate(t, client, first.OrganizationID, version.ID)

		ctx := testutil.Context(t, testutil.WaitMedium)
		err := client.UpdateTemplateACL(ctx, template.ID, codersdk.UpdateTemplateACL{
		UserPerms: nil,
		GroupPerms: map[string]codersdk.TemplateRole{
		// OrgID is the everyone ID
		first.OrganizationID.String(): codersdk.TemplateRoleDeleted,
		},
		})
		require.NoError(t, err)

		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
		defer cancel()

		_, err = owner.Template(ctx, template.ID)
		require.NoError(t, err)
		})
		}

		func TestTemplateACL(t *testing.T) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -414,11 +414,16 @@ export const unarchiveTemplateVersion = async (templateVersionId: string) => {
		export const updateTemplateMeta = async (
		templateId: string,
		data: TypesGen.UpdateTemplateMeta,
		): Promise<TypesGen.Template> => {
		): Promise<TypesGen.Template \| null> => {
		const response = await axios.patch<TypesGen.Template>(
		`/api/v2/templates/${templateId}`,
		data,
		);
		// On 304 response there is no data payload.
		if (response.status === 304) {
		return null;
		}

		return response.data;
		};

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,10 +29,19 @@ export const TemplateSettingsPage: FC = () => {
		(data: UpdateTemplateMeta) => updateTemplateMeta(template.id, data),
		{
		onSuccess: async (data) => {
		// we use data.name because an admin may have updated templateName to something new
		await queryClient.invalidateQueries(
		templateByNameKey(orgId, data.name),
		);
		// This update has a chance to return a 304 which means nothing was updated.
		// In this case, the return payload will be empty and we should use the
		// original template data.
		if (!data) {
		data = template;
		} else {
		// Only invalid the query if data is returned, indicating at least one field was updated.
		//
		// we use data.name because an admin may have updated templateName to something new
		await queryClient.invalidateQueries(
		templateByNameKey(orgId, data.name),
		);
		}
		displaySuccess("Template updated successfully");
		navigate(`/templates/${data.name}`);
		},
Expand Down