Merge pull request #1726 from ever-co/develop

Release
ever-co · Nov 7, 2023 · 22cdd34 · 22cdd34
2 parents 7a26cc4 + 8e51d85
commit 22cdd34
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 18 deletions.
diff --git a/.github/workflows/mobile-prod.yml b/.github/workflows/mobile-prod.yml
@@ -82,4 +82,6 @@ jobs:
         run: cd apps/mobile && eas submit --platform android --latest --non-interactive
 
       - name: Publish to App Store
-        run: EXPO_APPLE_APP_SPECIFIC_PASSWORD=${{ secrets.EXPO_APPLE_APP_SPECIFIC_PASSWORD }} eas submit --platform ios --latest --non-interactive
+        run: eas submit --platform ios --latest --non-interactive
+        env:
+          EXPO_APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.EXPO_APPLE_APP_SPECIFIC_PASSWORD }}
diff --git a/README.md b/README.md
@@ -245,7 +245,7 @@ You can also view a full list of our [contributors tracked by Github](https://gi
 [![Circle CI](https://circleci.com/gh/ever-co/ever-teams.svg?style=svg)](https://circleci.com/gh/ever-co/ever-teams)
 [![codecov](https://codecov.io/gh/ever-co/ever-teams/branch/master/graph/badge.svg)](https://codecov.io/gh/ever-co/ever-teams)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/8c46f9eb9df64aa9859dea4d572059ac)](https://www.codacy.com/gh/ever-co/ever-teams/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ever-co/ever-teams&utm_campaign=Badge_Grade)
-[![DeepScan grade](https://deepscan.io/api/teams/3293/projects/16703/branches/363423/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=3293&pid=16703&bid=363423)
+[![DeepScan grade](https://deepscan.io/api/teams/3293/projects/25855/branches/814579/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=3293&pid=25855&bid=814579)
 [![Known Vulnerabilities](https://snyk.io/test/github/ever-co/ever-teams/badge.svg)](https://snyk.io/test/github/ever-co/ever-teams)
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/ever-co/ever-teams.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ever-co/ever-teams/alerts/)
 [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/ever-co/ever-teams.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/ever-co/ever-teams/context:javascript)

diff --git a/apps/mobile/app/components/IssuesModal.tsx b/apps/mobile/app/components/IssuesModal.tsx
@@ -211,7 +211,7 @@ const styles = StyleSheet.create({
 		borderRadius: 20,
 		height: "auto",
 		padding: 22,
-		width: "40%",
+		width: 170,
 	},
 	wrapButton: {
 		alignItems: "center",

diff --git a/apps/mobile/app/components/TaskEpicPopup.tsx b/apps/mobile/app/components/TaskEpicPopup.tsx
@@ -85,7 +85,12 @@ const Item: React.FC<ItemProps> = ({ currentEpicId, epic, onTaskSelect, teamTask
 				onDismiss()
 			}}
 		>
-			<View style={{ ...styles.wrapperItem, borderColor: colors.border }}>
+			<View
+				style={{
+					...styles.wrapperItem,
+					borderColor: colors.border,
+				}}
+			>
 				<View style={{ ...styles.colorFrame, backgroundColor: "#FFFFFF" }}>
 					{epic.icon}
 					<Text>{epic.name}</Text>
@@ -159,7 +164,6 @@ const styles = StyleSheet.create({
 		flexDirection: "row",
 		gap: 5,
 		height: 44,
-		justifyContent: "center",
 		paddingLeft: 16,
 		width: 180,
 	},

diff --git a/apps/mobile/app/components/TaskLabels.tsx b/apps/mobile/app/components/TaskLabels.tsx
@@ -1,7 +1,15 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
 import React, { FC, useEffect, useRef, useState } from "react"
-import { TouchableOpacity, View, Text, StyleSheet, ViewStyle, FlatList } from "react-native"
+import {
+	TouchableOpacity,
+	View,
+	Text,
+	StyleSheet,
+	ViewStyle,
+	FlatList,
+	Dimensions,
+} from "react-native"
 import { AntDesign, Entypo } from "@expo/vector-icons"
 import { observer } from "mobx-react-lite"
 import { ITeamTask } from "../services/interfaces/ITask"
@@ -188,6 +196,33 @@ const TaskLabels: FC<TaskLabelProps> = observer(
 				  (task?.tags?.length > 0 || newTaskLabels?.length > 0) &&
 				  taskScreenButton ? (
 					<View>
+						<TouchableOpacity onPress={freshOpenModal}>
+							<View
+								style={{
+									...styles.container,
+									...containerStyle,
+									borderColor: colors.border,
+									borderWidth: 1,
+									marginTop: 0,
+									marginBottom: 15,
+								}}
+							>
+								<View style={styles.wrapStatus}>
+									<Entypo name="circle" size={12} color={colors.primary} />
+									<Text
+										style={{
+											...styles.text,
+											color: colors.primary,
+											marginLeft: 5,
+										}}
+									>
+										{translate("taskDetailsScreen.items")} ({task?.tags.length})
+									</Text>
+								</View>
+
+								<AntDesign name="down" size={14} color={colors.primary} />
+							</View>
+						</TouchableOpacity>
 						<FlatList
 							ref={flatListRef}
 							data={task?.tags || newTaskLabels}
@@ -247,6 +282,9 @@ interface ILabel {
 
 const Label: FC<ILabel> = ({ item, freshOpenModal, taskScreenButton, noBorders }) => {
 	const { colors } = useAppTheme()
+
+	const { width } = Dimensions.get("screen")
+
 	return (
 		<TouchableOpacity style={{}} onPress={freshOpenModal}>
 			<View
@@ -256,8 +294,8 @@ const Label: FC<ILabel> = ({ item, freshOpenModal, taskScreenButton, noBorders }
 					backgroundColor: item?.color,
 					marginVertical: taskScreenButton ? 3 : 20,
 					height: 32,
-					minWidth: 100,
-					maxWidth: taskScreenButton ? 140 : 120,
+					minWidth: !taskScreenButton && 100,
+					maxWidth: taskScreenButton ? "70%" : 120,
 					borderRadius: 10,
 					borderColor: colors.border,
 					borderWidth: noBorders ? 0 : 1,
@@ -273,7 +311,10 @@ const Label: FC<ILabel> = ({ item, freshOpenModal, taskScreenButton, noBorders }
 						marginLeft: 10,
 					}}
 				>
-					{limitTextCharaters({ text: item?.name, numChars: taskScreenButton ? 15 : 12 })}
+					{limitTextCharaters({
+						text: item?.name,
+						numChars: taskScreenButton && width > 420 ? 15 : 12,
+					})}
 				</Text>
 			</View>
 		</TouchableOpacity>

diff --git a/apps/mobile/app/i18n/ar.ts b/apps/mobile/app/i18n/ar.ts
@@ -118,6 +118,7 @@ const ar: Translations = {
 		manageAssignees: "إدارة المكلفين",
 		setDueDate: "تحديد تاريخ الاستحقاق",
 		setStartDate: "تحديد تاريخ البدء",
+		items: "أغراض",
 	},
 	tasksScreen: {
 		name: "مهام",

diff --git a/apps/mobile/app/i18n/bg.ts b/apps/mobile/app/i18n/bg.ts
@@ -114,6 +114,7 @@ const bg = {
 		manageAssignees: "Manage Assignees",
 		setDueDate: "Set Due Date",
 		setStartDate: "Set Start Date",
+		items: "Items",
 	},
 	tasksScreen: {
 		name: "Tasks",

diff --git a/apps/mobile/app/i18n/en.ts b/apps/mobile/app/i18n/en.ts
@@ -115,6 +115,7 @@ const en = {
 		manageAssignees: "Manage Assignees",
 		setDueDate: "Set Due Date",
 		setStartDate: "Set Start Date",
+		items: "Items",
 	},
 	tasksScreen: {
 		name: "Tasks",

diff --git a/apps/mobile/app/i18n/es.ts b/apps/mobile/app/i18n/es.ts
@@ -114,6 +114,7 @@ const es = {
 		manageAssignees: "Manage Assignees",
 		setDueDate: "Set Due Date",
 		setStartDate: "Set Start Date",
+		items: "Items",
 	},
 	tasksScreen: {
 		name: "Tasks",

diff --git a/apps/mobile/app/i18n/fr.ts b/apps/mobile/app/i18n/fr.ts
@@ -117,6 +117,7 @@ const fr = {
 		manageAssignees: "Gérer les destinataires",
 		setDueDate: "Définir la date d'échéance",
 		setStartDate: "Définir la date de début",
+		items: "Articles",
 	},
 	tasksScreen: {
 		name: "Tâches",

diff --git a/apps/mobile/app/i18n/he.ts b/apps/mobile/app/i18n/he.ts
@@ -114,6 +114,7 @@ const he = {
 		manageAssignees: "Manage Assignees",
 		setDueDate: "Set Due Date",
 		setStartDate: "Set Start Date",
+		items: "Items",
 	},
 	tasksScreen: {
 		name: "Tasks",

diff --git a/apps/mobile/app/i18n/ko.ts b/apps/mobile/app/i18n/ko.ts
@@ -117,6 +117,7 @@ const ko: Translations = {
 		manageAssignees: "담당자 관리",
 		setDueDate: "마감일 설정",
 		setStartDate: "시작일 설정",
+		items: "품목",
 	},
 	tasksScreen: {
 		name: "작업",

diff --git a/apps/mobile/app/i18n/ru.ts b/apps/mobile/app/i18n/ru.ts
@@ -114,6 +114,7 @@ const ru = {
 		manageAssignees: "Manage Assignees",
 		setDueDate: "Set Due Date",
 		setStartDate: "Set Start Date",
+		items: "Items",
 	},
 	tasksScreen: {
 		name: "Tasks",

diff --git a/apps/mobile/ios/GauzyTeams/Info.plist b/apps/mobile/ios/GauzyTeams/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/apps/web/lib/features/team-members.tsx b/apps/web/lib/features/team-members.tsx
@@ -40,14 +40,12 @@ export function TeamMembers({ publicTeam = false, kanbanView: kanbanView = Issue
 			break;
 		case kanbanView === IssuesView.CARDS:
 			teamMembersView = (
-				<>
-					<TeamMembersCardView
-						teamMembers={$members}
-						currentUser={currentUser}
-						publicTeam={publicTeam}
-						teamsFetching={$teamsFetching}
-					/>
-				</>
+				<TeamMembersCardView
+					teamMembers={$members}
+					currentUser={currentUser}
+					publicTeam={publicTeam}
+					teamsFetching={$teamsFetching}
+				/>
 			);
 			break;
 		case kanbanView === IssuesView.TABLE: