Merge pull request #1916 from ever-co/feat/team-publicity-switcher

added team publicity switcher, and changed the timer status code order

apps/mobile/app/helpers/get-timer-status.ts

@@ -7,24 +7,23 @@ type timerStatusReturnValue = 'pause' | 'running' | 'idle' | 'online' | 'suspend
 
 export const getTimerStatusValue = (
 	timerStatus: ITimerStatus | null,
-	member: OT_Member,
-
+	member: OT_Member | undefined,
 	publicTeam?: boolean
 ): timerStatusReturnValue => {
 	return !member?.employee?.isActive && !publicTeam
 		? 'suspended'
-		: member?.employee?.isOnline
-		? //  && member?.timerStatus !== 'running'
-		  'online'
+		: member?.timerStatus === 'pause'
+		? 'pause'
 		: !timerStatus?.running &&
 		  timerStatus?.lastLog &&
 		  timerStatus?.lastLog?.startedAt &&
 		  timerStatus?.lastLog?.employeeId === member?.employeeId &&
 		  moment().diff(moment(timerStatus?.lastLog?.startedAt), 'hours') < 24 &&
 		  timerStatus?.lastLog?.source !== 'MOBILE'
 		? 'pause'
-		: member?.timerStatus === 'pause'
-		? 'pause'
+		: member?.employee?.isOnline
+		? //  && member?.timerStatus !== 'running'
+		  'online'
 		: !member?.totalTodayTasks?.length
 		? 'idle'
 		: member?.timerStatus || 'idle';

apps/mobile/app/i18n/ar.ts

@@ -209,6 +209,9 @@ const ar: Translations = {
 			quitTeam: 'Quit the team',
 			quitTeamHint: 'You are about to quit the team',
 			areYouSure: 'Are you sure ?',
+			teamType: 'نوع الفريق',
+			publicTeam: 'الفريق العام',
+			privateTeam: 'الفريق الخاص',
 			changeTeamName: {
 				mainTitle: 'Change Team Name',
 				inputPlaceholder: 'Team Name'

apps/mobile/app/i18n/bg.ts

@@ -205,6 +205,9 @@ const bg = {
 			quitTeam: 'Quit the team',
 			quitTeamHint: 'You are about to quit the team',
 			areYouSure: 'Are you sure ?',
+			teamType: 'Team Type',
+			publicTeam: 'Public Team',
+			privateTeam: 'Private Team',
 			changeTeamName: {
 				mainTitle: 'Change Team Name',
 				inputPlaceholder: 'Team Name'

apps/mobile/app/i18n/en.ts

@@ -206,6 +206,9 @@ const en = {
 			quitTeam: 'Quit the team',
 			quitTeamHint: 'You are about to quit the team',
 			areYouSure: 'Are you sure ?',
+			teamType: 'Team Type',
+			publicTeam: 'Public Team',
+			privateTeam: 'Private Team',
 			changeTeamName: {
 				mainTitle: 'Change Team Name',
 				inputPlaceholder: 'Team Name'

apps/mobile/app/i18n/es.ts

@@ -205,6 +205,9 @@ const es = {
 			quitTeam: 'Quit the team',
 			quitTeamHint: 'You are about to quit the team',
 			areYouSure: 'Are you sure ?',
+			teamType: 'Team Type',
+			publicTeam: 'Public Team',
+			privateTeam: 'Private Team',
 			changeTeamName: {
 				mainTitle: 'Change Team Name',
 				inputPlaceholder: 'Team Name'

apps/mobile/app/i18n/fr.ts

@@ -204,6 +204,9 @@ const fr = {
 			quitTeam: "Quitter l'équipe",
 			quitTeamHint: "Vous êtes sur le point de quitter l'équipe",
 			areYouSure: 'Etes-vous sûr ?',
+			teamType: "Type d'équipe",
+			publicTeam: 'Équipe publique',
+			privateTeam: 'Équipe privée',
 			changeTeamName: {
 				mainTitle: 'Change Team Name',
 				inputPlaceholder: 'Team Name'

apps/mobile/app/i18n/he.ts

@@ -205,6 +205,9 @@ const he = {
 			quitTeam: 'Quit the team',
 			quitTeamHint: 'You are about to quit the team',
 			areYouSure: 'Are you sure ?',
+			teamType: 'Team Type',
+			publicTeam: 'Public Team',
+			privateTeam: 'Private Team',
 			changeTeamName: {
 				mainTitle: 'Change Team Name',
 				inputPlaceholder: 'Team Name'

apps/mobile/app/i18n/ko.ts

@@ -208,6 +208,9 @@ const ko: Translations = {
 			quitTeam: 'Quit the team',
 			quitTeamHint: 'You are about to quit the team',
 			areYouSure: 'Are you sure ?',
+			teamType: '팀 타입',
+			publicTeam: '공개 팀',
+			privateTeam: '비공개 팀',
 			changeTeamName: {
 				mainTitle: 'Change Team Name',
 				inputPlaceholder: 'Team Name'

apps/mobile/app/i18n/ru.ts

@@ -205,6 +205,9 @@ const ru = {
 			quitTeam: 'Quit the team',
 			quitTeamHint: 'You are about to quit the team',
 			areYouSure: 'Are you sure ?',
+			teamType: 'Team Type',
+			publicTeam: 'Public Team',
+			privateTeam: 'Private Team',
 			changeTeamName: {
 				mainTitle: 'Change Team Name',
 				inputPlaceholder: 'Team Name'

apps/mobile/app/screens/Authenticated/SettingScreen/Team/index.tsx

@@ -17,6 +17,7 @@ import { useTaskPriority } from '../../../../services/hooks/features/useTaskPrio
 import { useTaskSizes } from '../../../../services/hooks/features/useTaskSizes';
 import { useTaskLabels } from '../../../../services/hooks/features/useTaskLabels';
 import { useTaskVersion } from '../../../../services/hooks/features/useTaskVersion';
+import SwitchTeamPublicity from '../components/SwitchTeamPublicity';
 
 interface ITeamSettingProps {
 	props: any;
@@ -51,6 +52,7 @@ const TeamSettings: FC<ITeamSettingProps> = observer(({ props, onOpenBottomSheet
 					value={activeTeam?.name}
 					onPress={() => onOpenBottomSheet('Team Name', 4)}
 				/>
+				{isTeamManager ? <SwitchTeamPublicity /> : null}
 				{isTeamManager ? <SwithTimeTracking /> : null}
 				<SingleInfo
 					title={'Task Versions'}

apps/mobile/app/screens/Authenticated/SettingScreen/components/SwitchTeamPublicity.tsx

@@ -0,0 +1,84 @@
+/* eslint-disable react-native/no-color-literals */
+/* eslint-disable react-native/no-inline-styles */
+import React, { FC, useCallback, useEffect, useState } from 'react';
+import { View, Text, StyleSheet } from 'react-native';
+import { observer } from 'mobx-react-lite';
+import { useOrganizationTeam } from '../../../../services/hooks/useOrganization';
+import { translate } from '../../../../i18n';
+import { Toggle } from '../../../../components/Toggle';
+import { typography, useAppTheme } from '../../../../theme';
+
+interface Props {}
+const SwitchTeamPublicity: FC<Props> = observer(() => {
+	const { colors } = useAppTheme();
+	const { onUpdateOrganizationTeam, currentTeam, activeTeam } = useOrganizationTeam();
+
+	const [isTeamPublic, setIsTeamPublic] = useState<boolean>(activeTeam?.public);
+
+	const toggleSwitch = useCallback(async () => {
+		await onUpdateOrganizationTeam({
+			id: currentTeam?.id,
+			data: { ...currentTeam, public: !isTeamPublic }
+		}).then(() => setIsTeamPublic((prev) => !prev));
+	}, [isTeamPublic, currentTeam]);
+
+	useEffect(() => {
+		setIsTeamPublic(activeTeam?.public);
+	}, [currentTeam]);
+	return (
+		<View style={styles.container}>
+			<View style={styles.wrapperInfo}>
+				<Text style={[styles.infoTitle, { color: colors.primary }]}>
+					{translate('settingScreen.teamSection.teamType')}
+				</Text>
+				<Text style={[styles.infoText, { color: colors.tertiary }]}>
+					{isTeamPublic
+						? translate('settingScreen.teamSection.publicTeam')
+						: translate('settingScreen.teamSection.privateTeam')}
+				</Text>
+			</View>
+			<Toggle
+				inputInnerStyle={{ backgroundColor: '#DBD3FA' }}
+				inputDetailStyle={{ backgroundColor: '#3826A6' }}
+				onPress={() => toggleSwitch()}
+				variant="switch"
+				value={isTeamPublic}
+			/>
+		</View>
+	);
+});
+
+export default SwitchTeamPublicity;
+
+const styles = StyleSheet.create({
+	container: {
+		alignItems: 'center',
+		flexDirection: 'row',
+		justifyContent: 'space-between',
+		marginTop: 32,
+		width: '100%'
+	},
+	detectWrapper: {
+		borderRadius: 8,
+		paddingHorizontal: 13,
+		paddingVertical: 8
+	},
+	infoText: {
+		color: '#938FA4',
+		fontFamily: typography.primary.medium,
+		fontSize: 14,
+		marginTop: 10
+	},
+	infoTitle: {
+		fontFamily: typography.primary.semiBold,
+		fontSize: 16
+	},
+	toggle: {
+		height: 40,
+		right: -10,
+		top: -10
+	},
+	wrapperInfo: {
+		maxWidth: '90%'
+	}
+});

apps/mobile/app/screens/Authenticated/TeamScreen/components/ListCardItem.tsx

@@ -137,7 +137,7 @@ export const ListItemContent: React.FC<IcontentProps> = observer(({ memberInfo,
 
 const ListCardItem: React.FC<Props> = observer((props) => {
 	const { colors } = useAppTheme();
-	// // STATS
+	//  STATS
 	const memberInfo = useTeamMemberCard(props.member);
 	const taskEdition = useTMCardTaskEdit(memberInfo.memberTask);
 	const { timerStatus } = useTimer();