Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit284a651

Browse files
committed
chore: address comments
1 parent773b289 commit284a651

File tree

9 files changed

+18
-20
lines changed

9 files changed

+18
-20
lines changed

‎coderd/database/dbauthz/dbauthz.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5475,13 +5475,13 @@ func (q *querier) UpdateUserStatus(ctx context.Context, arg database.UpdateUserS
54755475
returnupdateWithReturn(q.log,q.auth,fetch,q.db.UpdateUserStatus)(ctx,arg)
54765476
}
54775477

5478-
func (q*querier)UpdateUserTaskNotificationAlertDismissed(ctx context.Context,arg database.UpdateUserTaskNotificationAlertDismissedParams) (database.UserConfig,error) {
5478+
func (q*querier)UpdateUserTaskNotificationAlertDismissed(ctx context.Context,arg database.UpdateUserTaskNotificationAlertDismissedParams) (bool,error) {
54795479
user,err:=q.db.GetUserByID(ctx,arg.UserID)
54805480
iferr!=nil {
5481-
returndatabase.UserConfig{},err
5481+
returnfalse,err
54825482
}
54835483
iferr:=q.authorizeContext(ctx,policy.ActionUpdatePersonal,user);err!=nil {
5484-
returndatabase.UserConfig{},err
5484+
returnfalse,err
54855485
}
54865486
returnq.db.UpdateUserTaskNotificationAlertDismissed(ctx,arg)
54875487
}

‎coderd/database/dbauthz/dbauthz_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1490,8 +1490,8 @@ func (s *MethodTestSuite) TestUser() {
14901490
userConfigValue,_:=strconv.ParseBool(userConfig.Value)
14911491
arg:= database.UpdateUserTaskNotificationAlertDismissedParams{UserID:user.ID,TaskNotificationAlertDismissed:userConfigValue}
14921492
dbm.EXPECT().GetUserByID(gomock.Any(),user.ID).Return(user,nil).AnyTimes()
1493-
dbm.EXPECT().UpdateUserTaskNotificationAlertDismissed(gomock.Any(),arg).Return(userConfig,nil).AnyTimes()
1494-
check.Args(arg).Asserts(user,policy.ActionUpdatePersonal).Returns(userConfig)
1493+
dbm.EXPECT().UpdateUserTaskNotificationAlertDismissed(gomock.Any(),arg).Return(false,nil).AnyTimes()
1494+
check.Args(arg).Asserts(user,policy.ActionUpdatePersonal).Returns(userConfigValue)
14951495
}))
14961496
s.Run("UpdateUserStatus",s.Mocked(func(dbm*dbmock.MockStore,faker*gofakeit.Faker,check*expects) {
14971497
u:=testutil.Fake(s.T(),faker, database.User{})

‎coderd/database/dbmetrics/querymetrics.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/querier.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎coderd/database/queries/users.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ SET
189189
value= @task_notification_alert_dismissed
190190
WHEREuser_configs.user_id= @user_id
191191
ANDuser_configs.key='preference_task_notification_alert_dismissed'
192-
RETURNING*;
192+
RETURNINGvalue::booleanAS task_notification_alert_dismissed;
193193

194194
-- name: UpdateUserRoles :one
195195
UPDATE

‎coderd/users.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"fmt"
88
"net/http"
99
"slices"
10-
"strconv"
1110

1211
"github.com/go-chi/chi/v5"
1312
"github.com/google/uuid"
@@ -1140,10 +1139,9 @@ func (api *API) putUserPreferenceSettings(rw http.ResponseWriter, r *http.Reques
11401139
})
11411140
return
11421141
}
1143-
taskAlertDismissedBool,_:=strconv.ParseBool(updatedTaskAlertDismissed.Value)
11441142

11451143
httpapi.Write(ctx,rw,http.StatusOK, codersdk.UserPreferenceSettings{
1146-
TaskNotificationAlertDismissed:taskAlertDismissedBool,
1144+
TaskNotificationAlertDismissed:updatedTaskAlertDismissed,
11471145
})
11481146
}
11491147

‎site/src/pages/TasksPage/TasksPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@ const TasksPage: FC = () => {
136136
updatePreferenceSettings(queryClient),
137137
);
138138

139-
constalertDismissed=
139+
consttaskNotificationAlertDismissed=
140140
preferencesQuery.data?.task_notification_alert_dismissed??false;
141141

142142
return(
143143
<>
144144
<title>{pageTitle("AI Tasks")}</title>
145145
<Margins>
146-
{allTaskNotificationsDisabled&&!alertDismissed&&(
146+
{allTaskNotificationsDisabled&&!taskNotificationAlertDismissed&&(
147147
<divclassName="mt-6">
148148
<Alert
149149
severity="warning"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp