added test

coder · Kira-Pilot · Jun 12, 2023 · Jun 1, 2023 · Jun 2, 2023 · Jun 5, 2023
commit c1c3040de0442336be2b54898ea4cf2634fe3fb4
diff --git a/coderd/workspaces_test.go b/coderd/workspaces_test.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -1007,6 +1008,61 @@ func TestWorkspaceFilterManual(t *testing.T) {
 			return workspaces.Count == 1
 		}, testutil.IntervalMedium, "agent status timeout")
 	})
+
+	t.Run("FilterQueryHasDeletingBy", func(t *testing.T) {
+		t.Parallel()
+		inactivityTTL := 1 * 24 * time.Hour
+		var setCalled int64
+
+		client := coderdtest.New(t, &coderdtest.Options{
+			IncludeProvisionerDaemon: true,
+			TemplateScheduleStore: schedule.MockTemplateScheduleStore{
+				SetFn: func(ctx context.Context, db database.Store, template database.Template, options schedule.TemplateScheduleOptions) (database.Template, error) {
+					if atomic.AddInt64(&setCalled, 1) == 2 {
+						require.Equal(t, inactivityTTL, options.InactivityTTL)
+					}
+					template.InactivityTTL = int64(options.InactivityTTL)
+					return template, nil
+				},
+			},
+		})
+		user := coderdtest.CreateFirstUser(t, client)
+		authToken := uuid.NewString()
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
+			Parse:          echo.ParseComplete,
+			ProvisionPlan:  echo.ProvisionComplete,
+			ProvisionApply: echo.ProvisionApplyWithAgent(authToken),
+		})
+		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
+		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
+
+		// update template with inactivity ttl
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		template, err := client.UpdateTemplateMeta(ctx, template.ID, codersdk.UpdateTemplateMeta{
+			InactivityTTLMillis: inactivityTTL.Milliseconds(),
+		})
+
+		require.NoError(t, err)
+		require.Equal(t, inactivityTTL.Milliseconds(), template.InactivityTTLMillis)
+
+		workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
+		coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
+
+		// stop build so workspace is inactive
+		stopBuild := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop)
+		coderdtest.AwaitWorkspaceBuildJob(t, client, stopBuild.ID)
+
+		res, err := client.Workspaces(ctx, codersdk.WorkspaceFilter{
+			FilterQuery: fmt.Sprintf("deleting_by:%s", time.Now().Add(inactivityTTL).Format("2006-01-02")),
+		})
+
+		require.NoError(t, err)
+		require.Len(t, res.Workspaces, 1)
+		require.Equal(t, workspace.ID, res.Workspaces[0].ID)
+	})
+
 }
 
 func TestOffsetLimit(t *testing.T) {

diff --git a/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm.tsx
@@ -20,6 +20,7 @@ import Checkbox from "@mui/material/Checkbox"
 import FormControlLabel from "@mui/material/FormControlLabel"
 import Switch from "@mui/material/Switch"
 import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"
+import { useWorkspacesData } from "pages/WorkspacesPage/data"
 
 const TTLHelperText = ({
   ttl,
@@ -149,25 +150,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
       if (form.values.inactivity_cleanup_enabled) {
         setIsInactivityDialogOpen(true)
       } else {
-        actuallySubmit(formData)
-        // on submit, convert from hours => ms
-        // onSubmit({
-        //   default_ttl_ms: formData.default_ttl_ms
-        //     ? formData.default_ttl_ms * MS_HOUR_CONVERSION
-        //     : undefined,
-        //   max_ttl_ms: formData.max_ttl_ms
-        //     ? formData.max_ttl_ms * MS_HOUR_CONVERSION
-        //     : undefined,
-        //   failure_ttl_ms: formData.failure_ttl_ms
-        //     ? formData.failure_ttl_ms * MS_DAY_CONVERSION
-        //     : undefined,
-        //   inactivity_ttl_ms: formData.inactivity_ttl_ms
-        //     ? formData.inactivity_ttl_ms * MS_DAY_CONVERSION
-        //     : undefined,
-
-        //   allow_user_autostart: formData.allow_user_autostart,
-        //   allow_user_autostop: formData.allow_user_autostop,
-        // })
+        submitValues(formData)
       }
     },
     initialTouched,
@@ -181,6 +164,35 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
   const [isInactivityDialogOpen, setIsInactivityDialogOpen] =
     useState<boolean>(false)
 
+  const submitValues = (formData: TemplateScheduleFormValues) => {
+    // on submit, convert from hours => ms
+    onSubmit({
+      default_ttl_ms: formData.default_ttl_ms
+        ? formData.default_ttl_ms * MS_HOUR_CONVERSION
+        : undefined,
+      max_ttl_ms: formData.max_ttl_ms
+        ? formData.max_ttl_ms * MS_HOUR_CONVERSION
+        : undefined,
+      failure_ttl_ms: formData.failure_ttl_ms
+        ? formData.failure_ttl_ms * MS_DAY_CONVERSION
+        : undefined,
+      inactivity_ttl_ms: formData.inactivity_ttl_ms
+        ? formData.inactivity_ttl_ms * MS_DAY_CONVERSION
+        : undefined,
+
+      allow_user_autostart: formData.allow_user_autostart,
+      allow_user_autostop: formData.allow_user_autostop,
+    })
+  }
+
+  const { data: workspacesData, error: getWorkspacesError } = useWorkspacesData(
+    {
+      query: "deleting_by:2023-05-12",
+    },
+  )
+
+  console.log("workspacesData", workspacesData)
+
   const handleToggleFailureCleanup = async (e: ChangeEvent) => {
     form.handleChange(e)
     if (!form.values.failure_cleanup_enabled) {
@@ -219,27 +231,6 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
     }
   }
 
-  const actuallySubmit = (formData: any) => {
-    // on submit, convert from hours => ms
-    onSubmit({
-      default_ttl_ms: formData.default_ttl_ms
-        ? formData.default_ttl_ms * MS_HOUR_CONVERSION
-        : undefined,
-      max_ttl_ms: formData.max_ttl_ms
-        ? formData.max_ttl_ms * MS_HOUR_CONVERSION
-        : undefined,
-      failure_ttl_ms: formData.failure_ttl_ms
-        ? formData.failure_ttl_ms * MS_DAY_CONVERSION
-        : undefined,
-      inactivity_ttl_ms: formData.inactivity_ttl_ms
-        ? formData.inactivity_ttl_ms * MS_DAY_CONVERSION
-        : undefined,
-
-      allow_user_autostart: formData.allow_user_autostart,
-      allow_user_autostop: formData.allow_user_autostop,
-    })
-  }
-
   return (
     <HorizontalForm
       onSubmit={form.handleSubmit}
@@ -422,7 +413,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
       <ConfirmDialog
         type="delete"
         open={isInactivityDialogOpen}
-        onConfirm={() => actuallySubmit(form.values)}
+        onConfirm={() => submitValues(form.values)}
         onClose={() => setIsInactivityDialogOpen(false)}
         title="Delete inactive workspaces"
         confirmText="Delete Workspaces"

diff --git a/site/src/pages/WorkspacesPage/data.ts b/site/src/pages/WorkspacesPage/data.ts
@@ -16,8 +16,8 @@ import { useState } from "react"
 import { useTranslation } from "react-i18next"
 
 type UseWorkspacesDataParams = {
-  page: number
-  limit: number
+  page?: number
+  limit?: number
   query: string
 }
 
@@ -34,7 +34,7 @@ export const useWorkspacesData = ({
       getWorkspaces({
         q: query,
         limit: limit,
-        offset: page <= 0 ? 0 : (page - 1) * limit,
+        offset: page && limit && (page <= 0 ? 0 : (page - 1) * limit),
       }),
     onSuccess: () => {
       setShouldRefetch(true)