From 63527e3caec95118025bee1bba133116e3f5f1eb Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Mon, 4 Mar 2024 11:32:42 +0800
Subject: [PATCH] fix: typos (#359)

* Fix typos

* chore: solve conflict

---------

Co-authored-by: nathan <nathan@appflowy.io>
---
 .../templates/components/admin_sso_list.html         |  2 +-
 admin_frontend/templates/components/admin_users.html |  2 +-
 libs/database/src/collab/collab_db_ops.rs            |  6 +++---
 libs/database/src/pg_row.rs                          | 12 ++++++------
 migrations/20231130140000_user_delete_trigger.sql    |  4 ++--
 src/biz/casbin/adapter.rs                            |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/admin_frontend/templates/components/admin_sso_list.html b/admin_frontend/templates/components/admin_sso_list.html
index 320617e4..cdaadc69 100644
--- a/admin_frontend/templates/components/admin_sso_list.html
+++ b/admin_frontend/templates/components/admin_sso_list.html
@@ -20,7 +20,7 @@
           More Info
         </button>
         <button
-          class="deletUserBtn button red"
+          class="deleteUserBtn button red"
           hx-delete="/web-api/admin/sso/{{ sso_provider.id|escape }}"
           hx-confirm="Are you sure?"
           hx-target="closest tr"
diff --git a/admin_frontend/templates/components/admin_users.html b/admin_frontend/templates/components/admin_users.html
index 1d9bf76d..4bcb3e4a 100644
--- a/admin_frontend/templates/components/admin_users.html
+++ b/admin_frontend/templates/components/admin_users.html
@@ -19,7 +19,7 @@
           More Info
         </button>
         <button
-          class="deletUserBtn button red"
+          class="deleteUserBtn button red"
           hx-delete="/web-api/admin/user/{{ user.id|escape }}"
           hx-confirm="Are you sure?"
           hx-target="closest tr"
diff --git a/libs/database/src/collab/collab_db_ops.rs b/libs/database/src/collab/collab_db_ops.rs
index ee305933..373e8e81 100644
--- a/libs/database/src/collab/collab_db_ops.rs
+++ b/libs/database/src/collab/collab_db_ops.rs
@@ -6,7 +6,7 @@ use database_entity::dto::{
 };
 
 use crate::collab::SNAPSHOT_PER_HOUR;
-use crate::pg_row::AFCollabMemerAccessLevelRow;
+use crate::pg_row::AFCollabMemberAccessLevelRow;
 use crate::pg_row::AFSnapshotRow;
 use app_error::AppError;
 use chrono::{Duration, Utc};
@@ -474,9 +474,9 @@ pub async fn delete_collab_member(
 
 pub fn select_collab_member_access_level(
   pg_pool: &PgPool,
-) -> BoxStream<'_, sqlx::Result<AFCollabMemerAccessLevelRow>> {
+) -> BoxStream<'_, sqlx::Result<AFCollabMemberAccessLevelRow>> {
   sqlx::query_as!(
-    AFCollabMemerAccessLevelRow,
+    AFCollabMemberAccessLevelRow,
     r#"
       SELECT
           uid, oid, access_level
diff --git a/libs/database/src/pg_row.rs b/libs/database/src/pg_row.rs
index 302e7cec..209a1833 100644
--- a/libs/database/src/pg_row.rs
+++ b/libs/database/src/pg_row.rs
@@ -25,10 +25,10 @@ impl TryFrom<AFWorkspaceRow> for AFWorkspace {
   fn try_from(value: AFWorkspaceRow) -> Result<Self, Self::Error> {
     let owner_uid = value
       .owner_uid
-      .ok_or(AppError::Internal(anyhow!("Unexpect empty owner_uid")))?;
+      .ok_or(AppError::Internal(anyhow!("Unexpected empty owner_uid")))?;
     let database_storage_id = value
       .database_storage_id
-      .ok_or(AppError::Internal(anyhow!("Unexpect empty workspace_id")))?;
+      .ok_or(AppError::Internal(anyhow!("Unexpected empty workspace_id")))?;
 
     let workspace_name = value.workspace_name.unwrap_or_default();
     let created_at = value.created_at.unwrap_or_else(Utc::now);
@@ -89,12 +89,12 @@ impl TryFrom<AFUserProfileRow> for AFUserProfile {
   fn try_from(value: AFUserProfileRow) -> Result<Self, Self::Error> {
     let uid = value
       .uid
-      .ok_or(AppError::Internal(anyhow!("Unexpect empty uid")))?;
+      .ok_or(AppError::Internal(anyhow!("Unexpected empty uid")))?;
     let uuid = value
       .uuid
-      .ok_or(AppError::Internal(anyhow!("Unexpect empty uuid")))?;
+      .ok_or(AppError::Internal(anyhow!("Unexpected empty uuid")))?;
     let latest_workspace_id = value.latest_workspace_id.ok_or(AppError::Internal(anyhow!(
-      "Unexpect empty latest_workspace_id"
+      "Unexpected empty latest_workspace_id"
     )))?;
     Ok(Self {
       uid,
@@ -126,7 +126,7 @@ pub struct AFWorkspaceMemberRow {
 }
 
 #[derive(FromRow)]
-pub struct AFCollabMemerAccessLevelRow {
+pub struct AFCollabMemberAccessLevelRow {
   pub uid: i64,
   pub oid: String,
   pub access_level: AFAccessLevel,
diff --git a/migrations/20231130140000_user_delete_trigger.sql b/migrations/20231130140000_user_delete_trigger.sql
index c89c669a..19739f95 100644
--- a/migrations/20231130140000_user_delete_trigger.sql
+++ b/migrations/20231130140000_user_delete_trigger.sql
@@ -1,6 +1,6 @@
 GRANT SELECT, INSERT, UPDATE, DELETE ON public.af_user TO supabase_auth_admin;
 
--- Trigger Function to delete a user from the pulic.af_user table
+-- Trigger Function to delete a user from the public.af_user table
 -- when a user is deleted from auth.users table (with matching uuid) field
 CREATE OR REPLACE FUNCTION public.delete_user()
 RETURNS TRIGGER AS $$
@@ -14,7 +14,7 @@ CREATE TRIGGER delete_user_trigger
 AFTER DELETE ON auth.users
 FOR EACH ROW EXECUTE FUNCTION public.delete_user();
 
--- Trigger Function to update the 'deleted_at' field in the pulic.af_user table
+-- Trigger Function to update the 'deleted_at' field in the public.af_user table
 -- (Soft Delete)
 CREATE OR REPLACE FUNCTION public.update_af_user_deleted_at()
 RETURNS TRIGGER AS $$
diff --git a/src/biz/casbin/adapter.rs b/src/biz/casbin/adapter.rs
index 62171571..d76a90a5 100644
--- a/src/biz/casbin/adapter.rs
+++ b/src/biz/casbin/adapter.rs
@@ -9,7 +9,7 @@ use casbin::Model;
 use casbin::Result;
 
 use database::collab::select_collab_member_access_level;
-use database::pg_row::AFCollabMemerAccessLevelRow;
+use database::pg_row::AFCollabMemberAccessLevelRow;
 use database::pg_row::AFWorkspaceMemberPermRow;
 use database::workspace::select_workspace_member_perm_stream;
 use database_entity::dto::{AFAccessLevel, AFRole};
@@ -36,7 +36,7 @@ impl PgAdapter {
 }
 
 async fn load_collab_policies(
-  mut stream: BoxStream<'_, sqlx::Result<AFCollabMemerAccessLevelRow>>,
+  mut stream: BoxStream<'_, sqlx::Result<AFCollabMemberAccessLevelRow>>,
 ) -> Result<Vec<Vec<String>>> {
   let mut policies: Vec<Vec<String>> = Vec::new();