Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #2025

Merged
merged 28 commits into from
Dec 27, 2023
Merged

Release #2025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
eb7e393
fix: API Call
badalkhatri0924 Dec 26, 2023
020bf71
fix: Translation Issue
badalkhatri0924 Dec 26, 2023
0c71d78
update:addlink to team name on landing page
maceteligolden Dec 26, 2023
81010c9
update:kanban breadcrumb links
maceteligolden Dec 26, 2023
756a754
update:add locale to kanban
maceteligolden Dec 26, 2023
cc20060
update:get curernt locale
maceteligolden Dec 26, 2023
5d6e937
fix: Build Issue
badalkhatri0924 Dec 27, 2023
517ae3f
fix: Member Page
badalkhatri0924 Dec 27, 2023
aa5eab6
fix: Font not loading
badalkhatri0924 Dec 27, 2023
99e7840
fix: Sidebar links
badalkhatri0924 Dec 27, 2023
434cdb4
Merge pull request #2022 from ever-co/fix/api-call
evereq Dec 27, 2023
b640cfd
Merge pull request #2023 from ever-co/update/breadcrumb_links
evereq Dec 27, 2023
e3e602b
fix:resolve scroll issues
maceteligolden Dec 27, 2023
c1e94e9
Merge pull request #2024 from ever-co/fix/teamcombobox-scroller
evereq Dec 27, 2023
bc83ac1
feat: make card draggable
Cedric921 Dec 21, 2023
65ee78e
feat: make cards draggable
Cedric921 Dec 21, 2023
5648e95
feat: add request to edit employee index
Cedric921 Dec 23, 2023
62c3d9b
feat: add request to edit employee index on API
Cedric921 Dec 23, 2023
0b68f95
feat: add hook to edit team member index in array
Cedric921 Dec 24, 2023
b5c2480
rafact: change index property in api call methods
Cedric921 Dec 24, 2023
b170ab8
feat: send index of team member to API
Cedric921 Dec 26, 2023
9508df3
fix: unused var
Cedric921 Dec 26, 2023
76b9b96
fix: api to update order of organization team member
Cedric921 Dec 27, 2023
1482950
fix: add ordered to cspell
Cedric921 Dec 27, 2023
3a82ae0
feat: make order by drag and drop for managers only
Cedric921 Dec 27, 2023
ea7c6b1
Update team-members-card-view.tsx
evereq Dec 27, 2023
8151a3d
Update [id].ts
evereq Dec 27, 2023
305b2c3
Merge pull request #2015 from ever-co/feat/cardOrder
evereq Dec 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,8 @@
"plasmohq",
"Proguard",
"horcrux",
"dimesions"
"dimesions",
"Ordereds"
],
"useGitignore": true,
"ignorePaths": [
Expand Down
167 changes: 82 additions & 85 deletions apps/mobile/app/services/client/requests/organization-team.ts
Original file line number Diff line number Diff line change
@@ -1,42 +1,39 @@
/* eslint-disable camelcase */
import moment from "moment"
import { PaginationResponse } from "../../interfaces/IDataResponse"
import moment from 'moment';
import { PaginationResponse } from '../../interfaces/IDataResponse';
import {
IOrganizationTeam,
IOrganizationTeamCreate,
IOrganizationTeamList,
IOrganizationTeamUpdate,
IOrganizationTeamWithMStatus,
} from "../../interfaces/IOrganizationTeam"
import { serverFetch } from "../fetch"
IOrganizationTeamWithMStatus
} from '../../interfaces/IOrganizationTeam';
import { serverFetch } from '../fetch';

export function createOrganizationTeamRequest(
datas: IOrganizationTeamCreate,
bearer_token: string,
) {
export function createOrganizationTeamRequest(datas: IOrganizationTeamCreate, bearer_token: string) {
return serverFetch<IOrganizationTeam>({
path: "/organization-team",
method: "POST",
path: '/organization-team',
method: 'POST',
body: datas,
bearer_token,
})
bearer_token
});
}

export function updateOrganizationTeamRequest({
id,
datas,
bearer_token,
bearer_token
}: {
datas: IOrganizationTeamList | IOrganizationTeamCreate
id: string
bearer_token: string
datas: IOrganizationTeamList | IOrganizationTeamCreate;
id: string;
bearer_token: string;
}) {
return serverFetch<IOrganizationTeamList>({
path: `/organization-team/${id}`,
method: "PUT",
method: 'PUT',
body: datas,
bearer_token,
})
bearer_token
});
}

export function getOrganizationTeamRequest(
Expand All @@ -45,131 +42,131 @@ export function getOrganizationTeamRequest(
tenantId,
teamId,
relations = [
"members",
"members.role",
"members.employee",
"members.employee.user",
"createdBy",
"createdBy.employee",
"projects",
],
'members',
'members.role',
'members.employee',
'members.employee.user',
'createdBy',
'createdBy.employee',
'projects'
]
}: TeamRequestParams & { teamId: string },
bearer_token: string,
bearer_token: string
) {
const params = {
organizationId,
tenantId,
// source: "BROWSER",
withLaskWorkedTask: "true",
startDate: moment().startOf("day").toISOString(),
endDate: moment().endOf("day").toISOString(),
includeOrganizationTeamId: "false",
} as { [x: string]: string }
withLaskWorkedTask: 'true',
startDate: moment().startOf('day').toISOString(),
endDate: moment().endOf('day').toISOString(),
includeOrganizationTeamId: 'false'
} as { [x: string]: string };

relations.forEach((rl, i) => {
params[`relations[${i}]`] = rl
})
params[`relations[${i}]`] = rl;
});

const queries = new URLSearchParams(params || {})
const queries = new URLSearchParams(params || {});
return serverFetch<IOrganizationTeamWithMStatus>({
path: `/organization-team/${teamId}?${queries.toString()}`,
method: "GET",
method: 'GET',
bearer_token,
tenantId,
})
tenantId
});
}

type TeamRequestParams = {
organizationId: string
tenantId: string
relations?: string[]
}
organizationId: string;
tenantId: string;
relations?: string[];
};

export function getAllOrganizationTeamRequest(
{
organizationId,
tenantId,
relations = [
"members",
"members.role",
"members.employee",
"members.employee.user",
"createdBy",
"createdBy.employee",
],
'members',
'members.role',
'members.employee',
'members.employee.user',
'createdBy',
'createdBy.employee'
]
}: TeamRequestParams,
bearer_token: string,
bearer_token: string
) {
const params = {
"where[organizationId]": organizationId,
"where[tenantId]": tenantId,
source: "BROWSER",
withLaskWorkedTask: "true",
} as { [x: string]: string }
'where[organizationId]': organizationId,
'where[tenantId]': tenantId,
source: 'BROWSER',
withLaskWorkedTask: 'true'
} as { [x: string]: string };

relations.forEach((rl, i) => {
params[`relations[${i}]`] = rl
})
params[`relations[${i}]`] = rl;
});

const query = new URLSearchParams(params)
const query = new URLSearchParams(params);

return serverFetch<PaginationResponse<IOrganizationTeamList>>({
path: `/organization-team?${query.toString()}`,
method: "GET",
method: 'GET',
bearer_token,
tenantId,
})
tenantId
});
}

export function removeEmployeeOrganizationTeamRequest({
employeeId,
bearer_token,
tenantId,
tenantId
}: {
employeeId: string
bearer_token: string
tenantId: string
employeeId: string;
bearer_token: string;
tenantId: string;
}) {
return serverFetch<boolean>({
path: `/organization-team-employee/${employeeId}`,
method: "DELETE",
method: 'DELETE',
bearer_token,
tenantId,
})
tenantId
});
}

export function removeUserFromAllTeam({
userId,
bearer_token,
tenantId,
tenantId
}: {
userId: string
bearer_token: string
tenantId: string
userId: string;
bearer_token: string;
tenantId: string;
}) {
return serverFetch({
path: `/organization-team/teams/${userId}`,
method: "DELETE",
method: 'DELETE',
bearer_token,
tenantId,
})
tenantId
});
}

export function deleteOrganizationTeamRequest({
id,
bearer_token,
tenantId,
organizationId,
organizationId
}: {
id: string
bearer_token: string
tenantId: string
organizationId: string
id: string;
bearer_token: string;
tenantId: string;
organizationId: string;
}) {
return serverFetch<IOrganizationTeamUpdate>({
path: `/organization-team/${id}?organizationId=${organizationId}`,
method: "DELETE",
method: 'DELETE',
bearer_token,
tenantId,
})
tenantId
});
}
6 changes: 5 additions & 1 deletion apps/web/app/[locale]/kanban/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,19 @@ import { MainLayout } from 'lib/layout';
import Image from 'next/image';
import { useState } from 'react';
import { useTranslations } from 'next-intl';
import { useParams } from 'next/navigation';

const Kanban = () => {
const { data } = useKanban();
const { activeTeam } = useOrganizationTeams();
const t = useTranslations();
const params = useParams<{locale: string}>();

const currentLocale = params ? params.locale : null;

const [activeTab, setActiveTab] = useState(KanbanTabs.TODAY);

const breadcrumbPath = [{title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/'}, activeTeam?.name || '', 'Kanban Board'];
const breadcrumbPath = [{title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/'}, {title: activeTeam?.name || '', href:'/'}, {title:'Kanban Board', href: `/${currentLocale}/kanban`}];

const imageRadius = 20;
const numberOfImagesDisplayed = 4;
Expand Down
5 changes: 1 addition & 4 deletions apps/web/app/[locale]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
'use client';

import clsx from 'clsx';
import { Inter } from 'next/font/google';
import { notFound } from 'next/navigation';
import { ReactNode } from 'react';
import { NextIntlClientProvider } from 'next-intl';
Expand All @@ -14,8 +13,6 @@ import '../../styles/globals.css';

const locales = ['en', 'de', 'ar', 'bg', 'zh', 'nl', 'de', 'he', 'it', 'pl', 'pt', 'ru', 'es', 'fr'];

const inter = Inter({ subsets: ['latin'] });

type Props = {
children: ReactNode;
params: { locale: string };
Expand Down Expand Up @@ -59,7 +56,7 @@ export default function LocaleLayout({ children, params: { locale } }: Props) {
)}
</head> */}
<NextIntlClientProvider locale={locale} messages={messages} timeZone="Asia/Kolkata">
<body className={clsx(inter.className, 'flex h-full flex-col')}>
<body className={clsx('flex h-full flex-col')}>
<RecoilRoot>
<AppState />
{children}
Expand Down
3 changes: 2 additions & 1 deletion apps/web/app/[locale]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ type MyAppProps = {

function MainPage({ pageProps }: AppProps<MyAppProps>) {
const t = useTranslations();

const { isTeamMember, isTrackingEnabled, activeTeam } = useOrganizationTeams();

const breadcrumb = [{title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/'}, activeTeam?.name || ''];
const breadcrumb = [{title: JSON.parse(t('pages.home.BREADCRUMB')), href: '/'}, { title: activeTeam?.name || '', href:'/'}];
const [view, setView] = useState<IssuesView>(IssuesView.CARDS);
const { online } = useNetworkState();

Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/[locale]/team/[teamId]/[profileLink]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const Team = () => {

const loadData = useCallback(() => {
if (params?.teamId && params?.profileLink) {
loadPublicTeamData(params?.profileLink as string, params?.teamId as string).then((res) => {
loadPublicTeamData(params?.profileLink as string, params?.teamId as string).then((res: any) => {
if (res?.data?.data?.status === 404) {
notFound();
}
Expand Down
Loading
Loading