Merge pull request #1768 from ever-co/develop

RElease
ever-co · Nov 12, 2023 · 717d4a7 · 717d4a7
2 parents 64d6bad + 34be229
commit 717d4a7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/desktop.apps.yml b/.github/workflows/desktop.apps.yml
@@ -176,7 +176,7 @@ jobs:
           DESKTOP_TIMER_APP_REPO_OWNER: 'ever-co'
           DESKTOP_TIMER_APP_WELCOME_TITLE: 'Welcome to Ever Teams'
           DESKTOP_TIMER_APP_WELCOME_CONTENT: 'Ever Teams is a productivity tool that helps you to stay focused on your work and manage your team work better.'
-          I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/desktop'
+          I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/desktop/i18n'
           PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
           GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-gauzy/develop/apps/desktop-timer/src/assets/icons/icon_512x512.png'
 
@@ -254,6 +254,6 @@ jobs:
           DESKTOP_TIMER_APP_REPO_OWNER: 'ever-co'
           DESKTOP_TIMER_APP_WELCOME_TITLE: 'Welcome to Ever Teams'
           DESKTOP_TIMER_APP_WELCOME_CONTENT: 'Ever Teams is a productivity tool that helps you to stay focused on your work and manage your team work better.'
-          I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/desktop'
+          I18N_FILES_URL: 'https://raw.githubusercontent.com/ever-co/ever-teams/develop/apps/desktop/i18n'
           PLATFORM_LOGO: 'https://app.ever.team/assets/ever-teams.png'
           GAUZY_DESKTOP_LOGO_512X512: 'https://raw.githubusercontent.com/ever-co/ever-gauzy/develop/apps/desktop-timer/src/assets/icons/icon_512x512.png'
diff --git a/apps/web/app/services/server/requests/integrations/integration-tenant.ts b/apps/web/app/services/server/requests/integrations/integration-tenant.ts
@@ -25,9 +25,14 @@ export function getIntegrationTenantRequest(
 	});
 }
 
-export function deleteIntegrationTenantRequest(integrationId: string, tenantId: string, bearer_token: string) {
+export function deleteIntegrationTenantRequest(
+	integrationId: string,
+	tenantId: string,
+	organizationId: string,
+	bearer_token: string
+) {
 	return serverFetch<IIntegrationTenant>({
-		path: `/integration-tenant/${integrationId}`,
+		path: `/integration-tenant/${integrationId}?organizationId=${organizationId}&tenantId=${tenantId}`,
 		method: 'DELETE',
 		bearer_token,
 		tenantId

diff --git a/apps/web/lib/settings/left-side-setting-menu.tsx b/apps/web/lib/settings/left-side-setting-menu.tsx
@@ -5,7 +5,6 @@ import { scrollToElement } from '@app/utils';
 import { Text } from 'lib/components';
 import { SidebarAccordian } from 'lib/components/sidebar-accordian';
 import { PeopleIcon, PeopleIconFilled, UserIcon, UserIconFilled } from 'lib/components/svgs';
-import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useCallback, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -41,7 +40,6 @@ export const LeftSideSettingMenu = () => {
 
 	const onLinkClick = useCallback(
 		(e: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
-			// if(router.pathname )
 			const url = new URL(e.currentTarget.href);
 			if (url.pathname !== router.pathname) {
 				return;
@@ -94,15 +92,15 @@ export const LeftSideSettingMenu = () => {
 						<div className="flex flex-col">
 							{PersonalAccordianData.map((ad, index) => {
 								return (
-									<Link onClick={onLinkClick} href={`/settings/personal${ad.href}`} key={index}>
+									<a onClick={onLinkClick} href={`/settings/personal${ad.href}`} key={index}>
 										<Text
 											className={`text-[${ad.color}] text-lg font-normal flex items-center p-4 pr-1 pl-5`}
 											key={index}
 											style={{ color: ad.color }}
 										>
 											{ad.title}
 										</Text>
-									</Link>
+									</a>
 								);
 							})}
 						</div>
@@ -138,15 +136,15 @@ export const LeftSideSettingMenu = () => {
 							{TeamAccordianData.filter((ad) => (!isTeamManager && !ad.managerOnly) || isTeamManager).map(
 								(ad, index) => {
 									return (
-										<Link onClick={onLinkClick} href={`/settings/team${ad.href}`} key={index}>
+										<a onClick={onLinkClick} href={`/settings/team${ad.href}`} key={index}>
 											<Text
 												className={`text-[${ad.color}] text-lg font-normal flex items-center p-4 pr-1 pl-5`}
 												key={index}
 												style={{ color: ad.color }}
 											>
 												{ad.title}
 											</Text>
-										</Link>
+										</a>
 									);
 								}
 							)}

diff --git a/apps/web/pages/api/integration-tenant/[id].ts b/apps/web/pages/api/integration-tenant/[id].ts
@@ -3,7 +3,7 @@ import { deleteIntegrationTenantRequest } from '@app/services/server/requests';
 import { NextApiRequest, NextApiResponse } from 'next';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-	const { $res, user, access_token, tenantId } = await authenticatedGuard(req, res);
+	const { $res, user, access_token, tenantId, organizationId } = await authenticatedGuard(req, res);
 	if (!user) return $res();
 
 	const { id } = req.query;
@@ -13,7 +13,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 	}
 
 	if (id) {
-		const response = await deleteIntegrationTenantRequest(id as string, tenantId, access_token);
+		const response = await deleteIntegrationTenantRequest(id as string, tenantId, organizationId, access_token);
 
 		return $res.status(200).json(response);
 	}

diff --git a/apps/web/public/locales/en/common.json b/apps/web/public/locales/en/common.json
@@ -168,7 +168,7 @@
 		"KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
 
 		"GITHUB_LOADING_TEXT": "We are now installing your GitHub Integration, hold on...",
-		"GITHUB_INTEGRATION_SUBTITLE_TEXT": "Activate GitHub integration for project & repository sync",
+		"GITHUB_INTEGRATION_SUBTITLE_TEXT": "Activate GitHub Integration for project & repository sync",
 		"GITHUB_INTEGRATION_AUTO_SYNC_TASK_TEXT": "Automatically synchronize tasks in your application for seamless and efficient updates.",
 		"GITHUB_INTEGRATION_LABEL_SYNC_TASK_TEXT": "Synchronize tasks selectively by associating them with specific label.",
 		"GITHUB_AUTO_SYNC_LABEL": "Select Auto-Sync Label"