From fa3659fcf69678fd20b0998bf436ae1410c5edf6 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Thu, 20 Apr 2023 10:46:58 -0700
Subject: [PATCH] fix user password edit and fix prisma schema for updated_at
 columns

---
 components/pages/settings/teams/TeamAddWebsiteForm.js | 2 +-
 components/pages/settings/users/UserEditForm.js       | 2 +-
 db/mysql/schema.prisma                                | 8 ++++----
 db/postgresql/schema.prisma                           | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/components/pages/settings/teams/TeamAddWebsiteForm.js b/components/pages/settings/teams/TeamAddWebsiteForm.js
index 457a9adb..55472943 100644
--- a/components/pages/settings/teams/TeamAddWebsiteForm.js
+++ b/components/pages/settings/teams/TeamAddWebsiteForm.js
@@ -44,7 +44,7 @@ export default function TeamAddWebsiteForm({ teamId, onSave, onClose }) {
     <>
       <Form onSubmit={handleSubmit} error={error} ref={formRef}>
         <FormRow label={formatMessage(labels.websites)}>
-          <Dropdown items={websites} onChange={handleAddWebsite}>
+          <Dropdown items={websites} onChange={handleAddWebsite} style={{ width: 300 }}>
             {({ id, name }) => <Item key={id}>{name}</Item>}
           </Dropdown>
         </FormRow>
diff --git a/components/pages/settings/users/UserEditForm.js b/components/pages/settings/users/UserEditForm.js
index 373d1dbe..ef79815c 100644
--- a/components/pages/settings/users/UserEditForm.js
+++ b/components/pages/settings/users/UserEditForm.js
@@ -46,7 +46,7 @@ export default function UserEditForm({ userId, data, onSave }) {
       </FormRow>
       <FormRow label={formatMessage(labels.password)}>
         <FormInput
-          name="newPassword"
+          name="password"
           rules={{
             minLength: { value: 8, message: formatMessage(messages.minPasswordLength, { n: 8 }) },
           }}
diff --git a/db/mysql/schema.prisma b/db/mysql/schema.prisma
index 92f28268..6455c8c0 100644
--- a/db/mysql/schema.prisma
+++ b/db/mysql/schema.prisma
@@ -14,7 +14,7 @@ model User {
   password  String    @db.VarChar(60)
   role      String    @map("role") @db.VarChar(50)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
-  updatedAt DateTime? @map("updated_at") @db.Timestamp(0)
+  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamp(0)
   deletedAt DateTime? @map("deleted_at") @db.Timestamp(0)
 
   website  Website[]
@@ -53,7 +53,7 @@ model Website {
   resetAt   DateTime? @map("reset_at") @db.Timestamp(0)
   userId    String?   @map("user_id") @db.VarChar(36)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
-  updatedAt DateTime? @map("updated_at") @db.Timestamp(0)
+  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamp(0)
   deletedAt DateTime? @map("deleted_at") @db.Timestamp(0)
 
   user        User?         @relation(fields: [userId], references: [id])
@@ -117,7 +117,7 @@ model Team {
   name       String    @db.VarChar(50)
   accessCode String?   @unique @map("access_code") @db.VarChar(50)
   createdAt  DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
-  updatedAt  DateTime? @map("updated_at") @db.Timestamp(0)
+  updatedAt  DateTime? @map("updated_at") @updatedAt @db.Timestamp(0)
 
   teamUser    TeamUser[]
   teamWebsite TeamWebsite[]
@@ -132,7 +132,7 @@ model TeamUser {
   userId    String    @map("user_id") @db.VarChar(36)
   role      String    @map("role") @db.VarChar(50)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamp(0)
-  updatedAt DateTime? @map("updated_at") @db.Timestamp(0)
+  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamp(0)
 
   team Team @relation(fields: [teamId], references: [id])
   user User @relation(fields: [userId], references: [id])
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index 245b2e7c..b336bce4 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -14,7 +14,7 @@ model User {
   password  String    @db.VarChar(60)
   role      String    @map("role") @db.VarChar(50)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
-  updatedAt DateTime? @map("updated_at") @db.Timestamptz(6)
+  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamptz(6)
   deletedAt DateTime? @map("deleted_at") @db.Timestamptz(6)
 
   website  Website[]
@@ -53,7 +53,7 @@ model Website {
   resetAt   DateTime? @map("reset_at") @db.Timestamptz(6)
   userId    String?   @map("user_id") @db.Uuid
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
-  updatedAt DateTime? @map("updated_at") @db.Timestamptz(6)
+  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamptz(6)
   deletedAt DateTime? @map("deleted_at") @db.Timestamptz(6)
 
   user        User?         @relation(fields: [userId], references: [id])
@@ -116,7 +116,7 @@ model Team {
   name       String    @db.VarChar(50)
   accessCode String?   @unique @map("access_code") @db.VarChar(50)
   createdAt  DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
-  updatedAt  DateTime? @map("updated_at") @db.Timestamptz(6)
+  updatedAt  DateTime? @map("updated_at") @updatedAt @db.Timestamptz(6)
 
   teamUser    TeamUser[]
   teamWebsite TeamWebsite[]
@@ -131,7 +131,7 @@ model TeamUser {
   userId    String    @map("user_id") @db.Uuid
   role      String    @map("role") @db.VarChar(50)
   createdAt DateTime? @default(now()) @map("created_at") @db.Timestamptz(6)
-  updatedAt DateTime? @map("updated_at") @db.Timestamptz(6)
+  updatedAt DateTime? @map("updated_at") @updatedAt @db.Timestamptz(6)
 
   team Team @relation(fields: [teamId], references: [id])
   user User @relation(fields: [userId], references: [id])