Skip to content

📨 The ultimate agentic social media scheduling tool 🤖

feat(groups): rename a channel group from the channel menu

Gilad Resisi80dacd71e041
diff --git a/apps/backend/src/api/routes/integrations.controller.ts b/apps/backend/src/api/routes/integrations.controller.ts
index 3b719f2a6..46acab6c4 100644
--- a/apps/backend/src/api/routes/integrations.controller.ts
+++ b/apps/backend/src/api/routes/integrations.controller.ts
@@ -20,6 +20,7 @@ import { ApiTags } from '@nestjs/swagger';
import { GetUserFromRequest } from '@gitroom/nestjs-libraries/user/user.from.request';
import { PostsService } from '@gitroom/nestjs-libraries/database/prisma/posts/posts.service';
import { IntegrationTimeDto } from '@gitroom/nestjs-libraries/dtos/integrations/integration.time.dto';
+import { CustomerNameDto } from '@gitroom/nestjs-libraries/dtos/integrations/customer.name.dto';
import { PlugDto } from '@gitroom/nestjs-libraries/dtos/plugs/plug.dto';
import {
Disconnect,
@@ -66,6 +67,15 @@ export class IntegrationsController {
return this._integrationService.customers(org.id);
}
+ @Put('/customers/:id')
+ async updateCustomerName(
+ @GetOrgFromRequest() org: Organization,
+ @Param('id') id: string,
+ @Body() body: CustomerNameDto
+ ) {
+ return this._integrationService.updateCustomerName(org.id, id, body.name);
+ }
+
@Put('/:id/group')
async updateIntegrationGroup(
@GetOrgFromRequest() org: Organization,
diff --git a/apps/frontend/src/components/launches/launches.component.tsx b/apps/frontend/src/components/launches/launches.component.tsx
index bb8d9ce6d..51554190b 100644
--- a/apps/frontend/src/components/launches/launches.component.tsx
+++ b/apps/frontend/src/components/launches/launches.component.tsx
@@ -30,6 +30,8 @@ import { useIntegrationList } from '@gitroom/frontend/components/launches/helper
import useCookie from 'react-use-cookie';
import { Onboarding } from '@gitroom/frontend/components/onboarding/onboarding';
import { useModals } from '@gitroom/frontend/components/layout/new-modal';
+import { Input } from '@gitroom/react/form/input';
+import { Button } from '@gitroom/react/form/button';
export const SVGLine = () => {
return (
@@ -111,6 +113,70 @@ export const OpenClose: FC<{
</svg>
);
};
+const EditGroupNameModal: FC<{
+ name: string;
+ id: string;
+ close: () => void;
+ resolve: (value: string) => void;
+}> = (props) => {
+ const t = useT();
+ const { close, name, id, resolve } = props;
+ const fetch = useFetch();
+ const toaster = useToaster();
+ const [groupName, setGroupName] = useState<string>(name);
+ const save = useCallback(async () => {
+ const response = await fetch(`/integrations/customers/${id}`, {
+ method: 'PUT',
+ body: JSON.stringify({ name: groupName }),
+ });
+ if (!response.ok) {
+ const { message } = await response.json().catch(() => ({} as any));
+ toaster.show(
+ (Array.isArray(message) ? message[0] : message) ||
+ t('could_not_save_group', 'Could not save the group.'),
+ 'warning'
+ );
+ return;
+ }
+ resolve(groupName);
+ close();
+ }, [groupName, id]);
+ return (
+ <div>
+ <Input
+ name="name"
+ disableForm={true}
+ label={t('group_name', 'Name')}
+ value={groupName}
+ onChange={(e) => setGroupName(e.target.value)}
+ />
+ <Button onClick={save} className="mt-[16px]">
+ {t('save', 'Save')}
+ </Button>
+ </div>
+ );
+};
+
+const EditPencil = () => {
+ return (
+ <svg
+ xmlns="http://www.w3.org/2000/svg"
+ width="14"
+ height="14"
+ viewBox="0 0 24 24"
+ fill="none"
+ >
+ <path
+ d="M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z"
+ stroke="currentColor"
+ strokeWidth="2"
+ strokeLinecap="round"
+ strokeLinejoin="round"
+ />
+ </svg>
+ );
+};
+
export const MenuGroupComponent: FC<
MenuComponentInterface & {
changeItemGroup: (id: string, group: string) => void;
@@ -137,9 +203,36 @@ export const MenuGroupComponent: FC<
changeItemGroup,
collapsed,
} = props;
+ const t = useT();
+ const modals = useModals();
+ const toaster = useToaster();
const [isOpen, setIsOpen] = useState(
!!+(localStorage.getItem(group.name + '_isOpen') || '1')
);
+ const editGroupName = useCallback(
+ async (e: any) => {
+ e.stopPropagation();
+ const val: string | undefined = await new Promise((resolve) => {
+ modals.openModal({
+ title: t('edit_group_name', 'Edit group name'),
+ children: (close) => (
+ <EditGroupNameModal
+ name={group.name}
+ id={group.id}
+ close={close}
+ resolve={resolve}
+ />
+ ),
+ });
+ });
+ if (!val) {
+ return;
+ }
+ await mutate();
+ toaster.show(t('group_updated', 'Group Updated'), 'success');
+ },
+ [group.name, group.id, mutate, modals, t]
+ );
const changeOpenClose = useCallback(
(e: any) => {
setIsOpen(!isOpen);
@@ -177,7 +270,7 @@ export const MenuGroupComponent: FC<
)}
{!!group.name && (
<div
- className="flex items-center gap-[5px] cursor-pointer"
+ className="flex items-center gap-[5px] cursor-pointer group"
onClick={changeOpenClose}
>
<div>
@@ -194,6 +287,14 @@ export const MenuGroupComponent: FC<
>
{group.name}
</div>
+ {!collapsed && (
+ <div
+ className="hidden group-hover:block hover:opacity-70"
+ onClick={editGroupName}
+ >
+ <EditPencil />
+ </div>
+ )}
</div>
)}
<div
diff --git a/i18n.lock b/i18n.lock
index cfab72761..d72791c37 100644
--- a/i18n.lock
+++ b/i18n.lock
@@ -646,6 +646,10 @@ checksums:
channel_id_copied: 58bf6a74adf570a5daf233ce496149de
settings_updated: 260e10a61200b581616d766f3af5ae52
customer_updated: ab17bcd115b14b72bb2e89f2b48883a4
+ edit_group_name: 64654e2647a83d0c51e357c9ba30a962
+ group_name: 9368b5a047572b6051f334af5aa76819
+ group_updated: db3365d95da2a925566eb65a1a416883
+ could_not_save_group: 31c544cf61f16ce4f6930268a26e7192
custom_url: f1e4e1c6a386d212abe94b937cf5e812
picture: 14818ef364a0ecc8b738bdb23c46b3c3
upgrade_required: 460dbea5061a1aba2080ffdecdf9544c
diff --git a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts
index 37274a6f3..0a9f2b1fc 100644
--- a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.repository.ts
@@ -539,6 +539,28 @@ export class IntegrationRepository {
});
}
+ getCustomerByName(orgId: string, name: string) {
+ return this._customers.model.customer.findFirst({
+ where: {
+ orgId,
+ name,
+ deletedAt: null,
+ },
+ });
+ }
+
+ updateCustomerName(orgId: string, id: string, name: string) {
+ return this._customers.model.customer.update({
+ where: {
+ id,
+ orgId,
+ },
+ data: {
+ name,
+ },
+ });
+ }
+
customers(orgId: string) {
return this._customers.model.customer.findMany({
where: {
diff --git a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.service.ts b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.service.ts
index 6a226355b..b10d8831e 100644
--- a/libraries/nestjs-libraries/src/database/prisma/integrations/integration.service.ts
+++ b/libraries/nestjs-libraries/src/database/prisma/integrations/integration.service.ts
@@ -525,6 +525,20 @@ export class IntegrationService {
return this._integrationRepository.customers(orgId);
}
+ async updateCustomerName(orgId: string, id: string, name: string) {
+ const exists = await this._integrationRepository.getCustomerByName(
+ orgId,
+ name
+ );
+ if (exists && exists.id !== id) {
+ throw new HttpException(
+ 'A group with this name already exists',
+ HttpStatus.BAD_REQUEST
+ );
+ }
+ return this._integrationRepository.updateCustomerName(orgId, id, name);
+ }
+
getPlugsByIntegrationId(org: string, integrationId: string) {
return this._integrationRepository.getPlugsByIntegrationId(
org,
diff --git a/libraries/nestjs-libraries/src/dtos/integrations/customer.name.dto.ts b/libraries/nestjs-libraries/src/dtos/integrations/customer.name.dto.ts
new file mode 100644
index 000000000..036f4127c
--- /dev/null
+++ b/libraries/nestjs-libraries/src/dtos/integrations/customer.name.dto.ts
@@ -0,0 +1,7 @@
+import { IsString, MinLength } from 'class-validator';
+
+export class CustomerNameDto {
+ @IsString()
+ @MinLength(1)
+ name: string;
+}
diff --git a/libraries/react-shared-libraries/src/translation/locales/ar/translation.json b/libraries/react-shared-libraries/src/translation/locales/ar/translation.json
index 0170e62db..7935a7f33 100644
--- a/libraries/react-shared-libraries/src/translation/locales/ar/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/ar/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "تم نسخ معرف القناة إلى الحافظة",
"settings_updated": "تم تحديث الإعدادات",
"customer_updated": "تم تحديث العميل",
+ "edit_group_name": "تعديل اسم المجموعة",
+ "group_name": "الاسم",
+ "group_updated": "تم تحديث المجموعة",
+ "could_not_save_group": "تعذّر حفظ المجموعة.",
"custom_url": "رابط مخصص",
"picture": "صورة",
"upgrade_required": "تحتاج إلى الترقية لاستخدام هذه الميزة",
diff --git a/libraries/react-shared-libraries/src/translation/locales/bn/translation.json b/libraries/react-shared-libraries/src/translation/locales/bn/translation.json
index 61e3aeece..d028c353d 100644
--- a/libraries/react-shared-libraries/src/translation/locales/bn/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/bn/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "চ্যানেল আইডি ক্লিপবোর্ডে কপি হয়েছে",
"settings_updated": "সেটিংস আপডেট হয়েছে",
"customer_updated": "গ্রাহক আপডেট হয়েছে",
+ "edit_group_name": "গ্রুপের নাম সম্পাদনা করুন",
+ "group_name": "নাম",
+ "group_updated": "গ্রুপ আপডেট হয়েছে",
+ "could_not_save_group": "গ্রুপ সংরক্ষণ করা যায়নি।",
"custom_url": "কাস্টম URL",
"picture": "ছবি",
"upgrade_required": "এই ফিচারটি ব্যবহার করতে আপনাকে আপগ্রেড করতে হবে",
diff --git a/libraries/react-shared-libraries/src/translation/locales/de/translation.json b/libraries/react-shared-libraries/src/translation/locales/de/translation.json
index 5e0e9912c..9166878e5 100644
--- a/libraries/react-shared-libraries/src/translation/locales/de/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/de/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "Kanal-ID in die Zwischenablage kopiert",
"settings_updated": "Einstellungen aktualisiert",
"customer_updated": "Kunde aktualisiert",
+ "edit_group_name": "Gruppennamen bearbeiten",
+ "group_name": "Name",
+ "group_updated": "Gruppe aktualisiert",
+ "could_not_save_group": "Die Gruppe konnte nicht gespeichert werden.",
"custom_url": "Benutzerdefinierte URL",
"picture": "Bild",
"upgrade_required": "Sie müssen ein Upgrade durchführen, um diese Funktion zu nutzen",
diff --git a/libraries/react-shared-libraries/src/translation/locales/en/translation.json b/libraries/react-shared-libraries/src/translation/locales/en/translation.json
index e5b8f2b20..b7729393f 100644
--- a/libraries/react-shared-libraries/src/translation/locales/en/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/en/translation.json
@@ -644,6 +644,10 @@
"channel_id_copied": "Channel ID copied to clipboard",
"settings_updated": "Settings Updated",
"customer_updated": "Customer Updated",
+ "edit_group_name": "Edit group name",
+ "group_name": "Name",
+ "group_updated": "Group Updated",
+ "could_not_save_group": "Could not save the group.",
"custom_url": "Custom URL",
"picture": "Picture",
"upgrade_required": "You need to upgrade to use this feature",
diff --git a/libraries/react-shared-libraries/src/translation/locales/es/translation.json b/libraries/react-shared-libraries/src/translation/locales/es/translation.json
index 445cda7df..c5d398bf8 100644
--- a/libraries/react-shared-libraries/src/translation/locales/es/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/es/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "ID del canal copiado al portapapeles",
"settings_updated": "Configuración actualizada",
"customer_updated": "Cliente actualizado",
+ "edit_group_name": "Editar nombre del grupo",
+ "group_name": "Nombre",
+ "group_updated": "Grupo actualizado",
+ "could_not_save_group": "No se pudo guardar el grupo.",
"custom_url": "URL personalizada",
"picture": "Imagen",
"upgrade_required": "Necesitas actualizar para usar esta función",
diff --git a/libraries/react-shared-libraries/src/translation/locales/fr/translation.json b/libraries/react-shared-libraries/src/translation/locales/fr/translation.json
index 9283eb92a..94de4a792 100644
--- a/libraries/react-shared-libraries/src/translation/locales/fr/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/fr/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "ID du canal copié dans le presse-papiers",
"settings_updated": "Paramètres mis à jour",
"customer_updated": "Client mis à jour",
+ "edit_group_name": "Modifier le nom du groupe",
+ "group_name": "Nom",
+ "group_updated": "Groupe mis à jour",
+ "could_not_save_group": "Impossible d'enregistrer le groupe.",
"custom_url": "URL personnalisée",
"picture": "Image",
"upgrade_required": "Vous devez mettre à niveau pour utiliser cette fonctionnalité",
diff --git a/libraries/react-shared-libraries/src/translation/locales/he/translation.json b/libraries/react-shared-libraries/src/translation/locales/he/translation.json
index 86fe8509b..e0556c9a4 100644
--- a/libraries/react-shared-libraries/src/translation/locales/he/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/he/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "מזהה הערוץ הועתק ללוח",
"settings_updated": "ההגדרות עודכנו",
"customer_updated": "הלקוח עודכן",
+ "edit_group_name": "ערוך שם קבוצה",
+ "group_name": "שם",
+ "group_updated": "הקבוצה עודכנה",
+ "could_not_save_group": "לא ניתן היה לשמור את הקבוצה.",
"custom_url": "כתובת URL מותאמת אישית",
"picture": "תמונה",
"upgrade_required": "עליך לשדרג כדי להשתמש בתכונה זו",
diff --git a/libraries/react-shared-libraries/src/translation/locales/it/translation.json b/libraries/react-shared-libraries/src/translation/locales/it/translation.json
index 0fc15d80e..92f5e5bfe 100644
--- a/libraries/react-shared-libraries/src/translation/locales/it/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/it/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "ID canale copiato negli appunti",
"settings_updated": "Impostazioni aggiornate",
"customer_updated": "Cliente aggiornato",
+ "edit_group_name": "Modifica nome del gruppo",
+ "group_name": "Nome",
+ "group_updated": "Gruppo aggiornato",
+ "could_not_save_group": "Impossibile salvare il gruppo.",
"custom_url": "URL personalizzato",
"picture": "Immagine",
"upgrade_required": "Devi eseguire l'upgrade per utilizzare questa funzione",
diff --git a/libraries/react-shared-libraries/src/translation/locales/ja/translation.json b/libraries/react-shared-libraries/src/translation/locales/ja/translation.json
index 638a6eaba..7883d3c1d 100644
--- a/libraries/react-shared-libraries/src/translation/locales/ja/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/ja/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "チャンネルIDがクリップボードにコピーされました",
"settings_updated": "設定が更新されました",
"customer_updated": "顧客情報が更新されました",
+ "edit_group_name": "グループ名を編集",
+ "group_name": "名前",
+ "group_updated": "グループが更新されました",
+ "could_not_save_group": "グループを保存できませんでした。",
"custom_url": "カスタムURL",
"picture": "画像",
"upgrade_required": "この機能を利用するにはアップグレードが必要です",
diff --git a/libraries/react-shared-libraries/src/translation/locales/ko/translation.json b/libraries/react-shared-libraries/src/translation/locales/ko/translation.json
index b110b712e..266fa2c3f 100644
--- a/libraries/react-shared-libraries/src/translation/locales/ko/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/ko/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "채널 ID가 클립보드에 복사되었습니다",
"settings_updated": "설정이 업데이트되었습니다",
"customer_updated": "고객 정보가 업데이트되었습니다",
+ "edit_group_name": "그룹 이름 수정",
+ "group_name": "이름",
+ "group_updated": "그룹이 업데이트되었습니다",
+ "could_not_save_group": "그룹을 저장할 수 없습니다.",
"custom_url": "맞춤 URL",
"picture": "사진",
"upgrade_required": "이 기능을 사용하려면 업그레이드가 필요합니다",
diff --git a/libraries/react-shared-libraries/src/translation/locales/pt/translation.json b/libraries/react-shared-libraries/src/translation/locales/pt/translation.json
index 9d30b7e99..336ae9ecf 100644
--- a/libraries/react-shared-libraries/src/translation/locales/pt/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/pt/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "ID do canal copiado para a área de transferência",
"settings_updated": "Configurações Atualizadas",
"customer_updated": "Cliente Atualizado",
+ "edit_group_name": "Editar nome do grupo",
+ "group_name": "Nome",
+ "group_updated": "Grupo atualizado",
+ "could_not_save_group": "Não foi possível salvar o grupo.",
"custom_url": "URL personalizada",
"picture": "Imagem",
"upgrade_required": "Você precisa fazer upgrade para usar este recurso",
diff --git a/libraries/react-shared-libraries/src/translation/locales/ru/translation.json b/libraries/react-shared-libraries/src/translation/locales/ru/translation.json
index 12a934972..412110759 100644
--- a/libraries/react-shared-libraries/src/translation/locales/ru/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/ru/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "ID канала скопирован в буфер обмена",
"settings_updated": "Настройки обновлены",
"customer_updated": "Клиент обновлён",
+ "edit_group_name": "Редактировать имя группы",
+ "group_name": "Имя",
+ "group_updated": "Группа обновлена",
+ "could_not_save_group": "Не удалось сохранить группу.",
"custom_url": "Пользовательский URL",
"picture": "Изображение",
"upgrade_required": "Вам необходимо обновить тариф для использования этой функции",
diff --git a/libraries/react-shared-libraries/src/translation/locales/tr/translation.json b/libraries/react-shared-libraries/src/translation/locales/tr/translation.json
index f70384f39..6dc594ae5 100644
--- a/libraries/react-shared-libraries/src/translation/locales/tr/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/tr/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "Kanal kimliği panoya kopyalandı",
"settings_updated": "Ayarlar Güncellendi",
"customer_updated": "Müşteri Güncellendi",
+ "edit_group_name": "Grup adını düzenle",
+ "group_name": "Ad",
+ "group_updated": "Grup güncellendi",
+ "could_not_save_group": "Grup kaydedilemedi.",
"custom_url": "Özel URL",
"picture": "Resim",
"upgrade_required": "Bu özelliği kullanmak için yükseltme yapmanız gerekiyor",
diff --git a/libraries/react-shared-libraries/src/translation/locales/vi/translation.json b/libraries/react-shared-libraries/src/translation/locales/vi/translation.json
index b091ae649..b9eb25bbc 100644
--- a/libraries/react-shared-libraries/src/translation/locales/vi/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/vi/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "Đã sao chép ID kênh vào bộ nhớ tạm",
"settings_updated": "Đã cập nhật cài đặt",
"customer_updated": "Đã cập nhật khách hàng",
+ "edit_group_name": "Chỉnh sửa tên nhóm",
+ "group_name": "Tên",
+ "group_updated": "Nhóm đã được cập nhật",
+ "could_not_save_group": "Không thể lưu nhóm.",
"custom_url": "URL tùy chỉnh",
"picture": "Hình ảnh",
"upgrade_required": "Bạn cần nâng cấp để sử dụng tính năng này",
diff --git a/libraries/react-shared-libraries/src/translation/locales/zh/translation.json b/libraries/react-shared-libraries/src/translation/locales/zh/translation.json
index bbba1bd3d..449a805b5 100644
--- a/libraries/react-shared-libraries/src/translation/locales/zh/translation.json
+++ b/libraries/react-shared-libraries/src/translation/locales/zh/translation.json
@@ -642,6 +642,10 @@
"channel_id_copied": "频道 ID 已复制到剪贴板",
"settings_updated": "设置已更新",
"customer_updated": "客户已更新",
+ "edit_group_name": "编辑群组名称",
+ "group_name": "名称",
+ "group_updated": "群组已更新",
+ "could_not_save_group": "无法保存群组。",
"custom_url": "自定义 URL",
"picture": "图片",
"upgrade_required": "您需要升级才能使用此功能",