From 2b1a32fd9ceb22ad6256467c58eb927ae0ee9d9c Mon Sep 17 00:00:00 2001
From: Shun Miyazawa <34241526+miya@users.noreply.github.com>
Date: Fri, 3 Jan 2025 16:38:36 +0900
Subject: [PATCH] feat: Add filter to show only apps created by the user
 (#11968)

---
 api/controllers/console/app/app.py   |  3 ++-
 api/services/app_service.py          |  5 ++++-
 web/app/(commonLayout)/apps/Apps.tsx | 13 +++++++++++--
 web/i18n/de-DE/app.ts                |  1 +
 web/i18n/en-US/app.ts                |  1 +
 web/i18n/es-ES/app.ts                |  1 +
 web/i18n/fa-IR/app.ts                |  1 +
 web/i18n/fr-FR/app.ts                |  1 +
 web/i18n/hi-IN/app.ts                |  1 +
 web/i18n/it-IT/app.ts                |  1 +
 web/i18n/ja-JP/app.ts                |  1 +
 web/i18n/ko-KR/app.ts                |  1 +
 web/i18n/pl-PL/app.ts                |  1 +
 web/i18n/pt-BR/app.ts                |  1 +
 web/i18n/ro-RO/app.ts                |  1 +
 web/i18n/ru-RU/app.ts                |  1 +
 web/i18n/sl-SI/app.ts                |  1 +
 web/i18n/th-TH/app.ts                |  1 +
 web/i18n/tr-TR/app.ts                |  1 +
 web/i18n/uk-UA/app.ts                |  1 +
 web/i18n/vi-VN/app.ts                |  1 +
 web/i18n/zh-Hans/app.ts              |  1 +
 web/i18n/zh-Hant/app.ts              |  1 +
 23 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/api/controllers/console/app/app.py b/api/controllers/console/app/app.py
index 9cd56cef0b..4aa10ac6e9 100644
--- a/api/controllers/console/app/app.py
+++ b/api/controllers/console/app/app.py
@@ -57,12 +57,13 @@ class AppListApi(Resource):
         )
         parser.add_argument("name", type=str, location="args", required=False)
         parser.add_argument("tag_ids", type=uuid_list, location="args", required=False)
+        parser.add_argument("is_created_by_me", type=inputs.boolean, location="args", required=False)
 
         args = parser.parse_args()
 
         # get app list
         app_service = AppService()
-        app_pagination = app_service.get_paginate_apps(current_user.current_tenant_id, args)
+        app_pagination = app_service.get_paginate_apps(current_user.id, current_user.current_tenant_id, args)
         if not app_pagination:
             return {"data": [], "total": 0, "page": 1, "limit": 20, "has_more": False}
 
diff --git a/api/services/app_service.py b/api/services/app_service.py
index 41c15bbf0a..1fd7cb5e33 100644
--- a/api/services/app_service.py
+++ b/api/services/app_service.py
@@ -26,9 +26,10 @@ from tasks.remove_app_and_related_data_task import remove_app_and_related_data_t
 
 
 class AppService:
-    def get_paginate_apps(self, tenant_id: str, args: dict) -> Pagination | None:
+    def get_paginate_apps(self, user_id: str, tenant_id: str, args: dict) -> Pagination | None:
         """
         Get app list with pagination
+        :param user_id: user id
         :param tenant_id: tenant id
         :param args: request args
         :return:
@@ -44,6 +45,8 @@ class AppService:
         elif args["mode"] == "channel":
             filters.append(App.mode == AppMode.CHANNEL.value)
 
+        if args.get("is_created_by_me", False):
+            filters.append(App.created_by == user_id)
         if args.get("name"):
             name = args["name"][:30]
             filters.append(App.name.ilike(f"%{name}%"))
diff --git a/web/app/(commonLayout)/apps/Apps.tsx b/web/app/(commonLayout)/apps/Apps.tsx
index 5269571c21..34a28d908e 100644
--- a/web/app/(commonLayout)/apps/Apps.tsx
+++ b/web/app/(commonLayout)/apps/Apps.tsx
@@ -25,16 +25,18 @@ import Input from '@/app/components/base/input'
 import { useStore as useTagStore } from '@/app/components/base/tag-management/store'
 import TagManagementModal from '@/app/components/base/tag-management'
 import TagFilter from '@/app/components/base/tag-management/filter'
+import CheckboxWithLabel from '@/app/components/datasets/create/website/base/checkbox-with-label'
 
 const getKey = (
   pageIndex: number,
   previousPageData: AppListResponse,
   activeTab: string,
+  isCreatedByMe: boolean,
   tags: string[],
   keywords: string,
 ) => {
   if (!pageIndex || previousPageData.has_more) {
-    const params: any = { url: 'apps', params: { page: pageIndex + 1, limit: 30, name: keywords } }
+    const params: any = { url: 'apps', params: { page: pageIndex + 1, limit: 30, name: keywords, is_created_by_me: isCreatedByMe } }
 
     if (activeTab !== 'all')
       params.params.mode = activeTab
@@ -58,6 +60,7 @@ const Apps = () => {
     defaultTab: 'all',
   })
   const { query: { tagIDs = [], keywords = '' }, setQuery } = useAppsQueryState()
+  const [isCreatedByMe, setIsCreatedByMe] = useState(false)
   const [tagFilterValue, setTagFilterValue] = useState<string[]>(tagIDs)
   const [searchKeywords, setSearchKeywords] = useState(keywords)
   const setKeywords = useCallback((keywords: string) => {
@@ -68,7 +71,7 @@ const Apps = () => {
   }, [setQuery])
 
   const { data, isLoading, setSize, mutate } = useSWRInfinite(
-    (pageIndex: number, previousPageData: AppListResponse) => getKey(pageIndex, previousPageData, activeTab, tagIDs, searchKeywords),
+    (pageIndex: number, previousPageData: AppListResponse) => getKey(pageIndex, previousPageData, activeTab, isCreatedByMe, tagIDs, searchKeywords),
     fetchAppList,
     { revalidateFirstPage: true },
   )
@@ -132,6 +135,12 @@ const Apps = () => {
           options={options}
         />
         <div className='flex items-center gap-2'>
+          <CheckboxWithLabel
+            className='mr-2'
+            label={t('app.showMyCreatedAppsOnly')}
+            isChecked={isCreatedByMe}
+            onChange={() => setIsCreatedByMe(!isCreatedByMe)}
+          />
           <TagFilter type='app' value={tagFilterValue} onChange={handleTagsChange} />
           <Input
             showLeftIcon
diff --git a/web/i18n/de-DE/app.ts b/web/i18n/de-DE/app.ts
index 69bf0bce72..4429db34bc 100644
--- a/web/i18n/de-DE/app.ts
+++ b/web/i18n/de-DE/app.ts
@@ -190,6 +190,7 @@ const translation = {
     byCategories: 'NACH KATEGORIEN',
     searchAllTemplate: 'Alle Vorlagen durchsuchen...',
   },
+  showMyCreatedAppsOnly: 'Nur meine erstellten Apps anzeigen',
 }
 
 export default translation
diff --git a/web/i18n/en-US/app.ts b/web/i18n/en-US/app.ts
index 2d3ad99cae..861827d3e3 100644
--- a/web/i18n/en-US/app.ts
+++ b/web/i18n/en-US/app.ts
@@ -169,6 +169,7 @@ const translation = {
       removeConfirmContent: 'The current configuration is in use, removing it will turn off the Tracing feature.',
     },
   },
+  showMyCreatedAppsOnly: 'Created by me',
 }
 
 export default translation
diff --git a/web/i18n/es-ES/app.ts b/web/i18n/es-ES/app.ts
index a202eb9be7..6d0cdf8fbd 100644
--- a/web/i18n/es-ES/app.ts
+++ b/web/i18n/es-ES/app.ts
@@ -183,6 +183,7 @@ const translation = {
     byCategories: 'POR CATEGORÍAS',
     searchAllTemplate: 'Buscar todas las plantillas...',
   },
+  showMyCreatedAppsOnly: 'Mostrar solo mis aplicaciones creadas',
 }
 
 export default translation
diff --git a/web/i18n/fa-IR/app.ts b/web/i18n/fa-IR/app.ts
index 8f695394e5..b387799fda 100644
--- a/web/i18n/fa-IR/app.ts
+++ b/web/i18n/fa-IR/app.ts
@@ -183,6 +183,7 @@ const translation = {
     byCategories: 'بر اساس دسته بندی ها',
     searchAllTemplate: 'همه قالب ها را جستجو کنید...',
   },
+  showMyCreatedAppsOnly: 'فقط برنامه‌های ایجاد شده توسط من را نشان بده',
 }
 
 export default translation
diff --git a/web/i18n/fr-FR/app.ts b/web/i18n/fr-FR/app.ts
index b9ee68bb4b..f55a548ae7 100644
--- a/web/i18n/fr-FR/app.ts
+++ b/web/i18n/fr-FR/app.ts
@@ -183,6 +183,7 @@ const translation = {
     byCategories: 'PAR CATÉGORIES',
     searchAllTemplate: 'Rechercher dans tous les modèles...',
   },
+  showMyCreatedAppsOnly: 'Afficher uniquement mes applications créées',
 }
 
 export default translation
diff --git a/web/i18n/hi-IN/app.ts b/web/i18n/hi-IN/app.ts
index 3499a8f420..d79d5b9771 100644
--- a/web/i18n/hi-IN/app.ts
+++ b/web/i18n/hi-IN/app.ts
@@ -183,6 +183,7 @@ const translation = {
     byCategories: 'श्रेणियों द्वारा',
     searchAllTemplate: 'सभी टेम्पलेट्स खोजें...',
   },
+  showMyCreatedAppsOnly: 'केवल मेरे बनाए गए ऐप्स दिखाएं',
 }
 
 export default translation
diff --git a/web/i18n/it-IT/app.ts b/web/i18n/it-IT/app.ts
index 5ad976598a..ec01516018 100644
--- a/web/i18n/it-IT/app.ts
+++ b/web/i18n/it-IT/app.ts
@@ -195,6 +195,7 @@ const translation = {
     byCategories: 'PER CATEGORIE',
     searchAllTemplate: 'Cerca in tutti i modelli...',
   },
+  showMyCreatedAppsOnly: 'Mostra solo le mie app create',
 }
 
 export default translation
diff --git a/web/i18n/ja-JP/app.ts b/web/i18n/ja-JP/app.ts
index 10fc2f18a4..27d6bf6787 100644
--- a/web/i18n/ja-JP/app.ts
+++ b/web/i18n/ja-JP/app.ts
@@ -184,6 +184,7 @@ const translation = {
     byCategories: 'カテゴリ別',
     searchAllTemplate: 'すべてのテンプレートを検索...',
   },
+  showMyCreatedAppsOnly: '自分が作成したアプリ',
 }
 
 export default translation
diff --git a/web/i18n/ko-KR/app.ts b/web/i18n/ko-KR/app.ts
index d10f65f704..365fecc5ee 100644
--- a/web/i18n/ko-KR/app.ts
+++ b/web/i18n/ko-KR/app.ts
@@ -179,6 +179,7 @@ const translation = {
     byCategories: '카테고리별',
     searchAllTemplate: '모든 템플릿 검색...',
   },
+  showMyCreatedAppsOnly: '내가 만든 앱만 보기',
 }
 
 export default translation
diff --git a/web/i18n/pl-PL/app.ts b/web/i18n/pl-PL/app.ts
index b36e488ec7..c2d921bfd9 100644
--- a/web/i18n/pl-PL/app.ts
+++ b/web/i18n/pl-PL/app.ts
@@ -190,6 +190,7 @@ const translation = {
     searchAllTemplate: 'Przeszukaj wszystkie szablony...',
     byCategories: 'WEDŁUG KATEGORII',
   },
+  showMyCreatedAppsOnly: 'Pokaż tylko moje utworzone aplikacje',
 }
 
 export default translation
diff --git a/web/i18n/pt-BR/app.ts b/web/i18n/pt-BR/app.ts
index 99e6465444..bf0ad15ea8 100644
--- a/web/i18n/pt-BR/app.ts
+++ b/web/i18n/pt-BR/app.ts
@@ -183,6 +183,7 @@ const translation = {
     searchAllTemplate: 'Pesquisar todos os modelos...',
     byCategories: 'POR CATEGORIAS',
   },
+  showMyCreatedAppsOnly: 'Mostrar apenas meus aplicativos criados',
 }
 
 export default translation
diff --git a/web/i18n/ro-RO/app.ts b/web/i18n/ro-RO/app.ts
index a84e2e371e..cab1556520 100644
--- a/web/i18n/ro-RO/app.ts
+++ b/web/i18n/ro-RO/app.ts
@@ -183,6 +183,7 @@ const translation = {
     searchAllTemplate: 'Căutați toate șabloanele...',
     byCategories: 'DUPĂ CATEGORII',
   },
+  showMyCreatedAppsOnly: 'Afișează doar aplicațiile create de mine',
 }
 
 export default translation
diff --git a/web/i18n/ru-RU/app.ts b/web/i18n/ru-RU/app.ts
index 132ea3d141..59d79020d7 100644
--- a/web/i18n/ru-RU/app.ts
+++ b/web/i18n/ru-RU/app.ts
@@ -183,6 +183,7 @@ const translation = {
     searchAllTemplate: 'Поиск по всем шаблонам...',
     byCategories: 'ПО КАТЕГОРИЯМ',
   },
+  showMyCreatedAppsOnly: 'Показать только созданные мной приложения',
 }
 
 export default translation
diff --git a/web/i18n/sl-SI/app.ts b/web/i18n/sl-SI/app.ts
index b5703af10a..65421aa0f6 100644
--- a/web/i18n/sl-SI/app.ts
+++ b/web/i18n/sl-SI/app.ts
@@ -183,6 +183,7 @@ const translation = {
     byCategories: 'PO KATEGORIJAH',
     searchAllTemplate: 'Preišči vse predloge ...',
   },
+  showMyCreatedAppsOnly: 'Prikaži samo aplikacije, ki sem jih ustvaril',
 }
 
 export default translation
diff --git a/web/i18n/th-TH/app.ts b/web/i18n/th-TH/app.ts
index f00e237329..a05bec8aa6 100644
--- a/web/i18n/th-TH/app.ts
+++ b/web/i18n/th-TH/app.ts
@@ -179,6 +179,7 @@ const translation = {
     searchAllTemplate: 'ค้นหาเทมเพลตทั้งหมด...',
     byCategories: 'ตามหมวดหมู่',
   },
+  showMyCreatedAppsOnly: 'แสดงเฉพาะแอปที่ฉันสร้าง',
 }
 
 export default translation
diff --git a/web/i18n/tr-TR/app.ts b/web/i18n/tr-TR/app.ts
index 29c2aeaf45..3c4c379740 100644
--- a/web/i18n/tr-TR/app.ts
+++ b/web/i18n/tr-TR/app.ts
@@ -179,6 +179,7 @@ const translation = {
     searchAllTemplate: 'Tüm şablonlarda ara...',
     byCategories: 'KATEGORILERE GÖRE',
   },
+  showMyCreatedAppsOnly: 'Sadece oluşturduğum uygulamaları göster',
 }
 
 export default translation
diff --git a/web/i18n/uk-UA/app.ts b/web/i18n/uk-UA/app.ts
index 00d6317f6a..6600622a63 100644
--- a/web/i18n/uk-UA/app.ts
+++ b/web/i18n/uk-UA/app.ts
@@ -183,6 +183,7 @@ const translation = {
     byCategories: 'ЗА КАТЕГОРІЯМИ',
     searchAllTemplate: 'Пошук по всіх шаблонах...',
   },
+  showMyCreatedAppsOnly: 'Показати лише створені мною додатки',
 }
 
 export default translation
diff --git a/web/i18n/vi-VN/app.ts b/web/i18n/vi-VN/app.ts
index c3e7ecf9ae..e0ffaa84d5 100644
--- a/web/i18n/vi-VN/app.ts
+++ b/web/i18n/vi-VN/app.ts
@@ -183,6 +183,7 @@ const translation = {
     searchAllTemplate: 'Tìm kiếm tất cả các mẫu...',
     byCategories: 'THEO DANH MỤC',
   },
+  showMyCreatedAppsOnly: 'Chỉ hiển thị ứng dụng do tôi tạo',
 }
 
 export default translation
diff --git a/web/i18n/zh-Hans/app.ts b/web/i18n/zh-Hans/app.ts
index 43486fcace..3d3e95130d 100644
--- a/web/i18n/zh-Hans/app.ts
+++ b/web/i18n/zh-Hans/app.ts
@@ -170,6 +170,7 @@ const translation = {
     },
   },
   openInExplore: '在“探索”中打开',
+  showMyCreatedAppsOnly: '我创建的',
 }
 
 export default translation
diff --git a/web/i18n/zh-Hant/app.ts b/web/i18n/zh-Hant/app.ts
index 16dfd510ee..99de5042c2 100644
--- a/web/i18n/zh-Hant/app.ts
+++ b/web/i18n/zh-Hant/app.ts
@@ -182,6 +182,7 @@ const translation = {
     searchAllTemplate: '搜尋所有樣本...',
     byCategories: '按類別',
   },
+  showMyCreatedAppsOnly: '我创建的',
 }
 
 export default translation