Skip to content

Commit

Permalink
Merge pull request #363 from depromeet/bugfix/330/fixedLayoutBug
Browse files Browse the repository at this point in the history
스페이스 상세 화면에서 액션 아이템을 생성할 때, 미완료된 스페이스가 노출되는 현상 수정
  • Loading branch information
klmhyeonwoo authored Sep 10, 2024
2 parents e065f70 + 905d554 commit 968e44e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 11 deletions.
2 changes: 1 addition & 1 deletion apps/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@layer/mobile",
"main": "expo-router/entry",
"types": "./bridge/native.ts",
"version": "1.0.3",
"version": "1.0.2",
"scripts": {
"start": "expo start",
"reset-project": "node ./scripts/reset-project.js",
Expand Down
2 changes: 1 addition & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@layer/web",
"private": true,
"version": "1.0.3",
"version": "1.0.2",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
17 changes: 11 additions & 6 deletions apps/web/src/component/space/view/ActionItemListView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { Button, ButtonProvider } from "@/component/common/button";
import { Icon } from "@/component/common/Icon";
import { TextArea } from "@/component/common/input";
import { SelectBox } from "@/component/common/SelectBox";
import { SelectBoxType } from "@/component/common/SelectBox/SelectBox.tsx";
import { Spacing } from "@/component/common/Spacing";
import { Typography } from "@/component/common/typography";
import { useCreateActionItem } from "@/hooks/api/actionItem/useCreateActionItem";
Expand All @@ -32,11 +33,15 @@ type ActionItemProps = {
};

export function ActionItemListView({ isPossibleMake, teamActionList, spaceId, leaderId, restrospectArr = [] }: ActionItemListViewProps) {
const retrospectInfo = restrospectArr.map((item) => ({
retrospectId: item.retrospectId,
retrospectTitle: item.title,
status: item.retrospectStatus,
}));
const isCompleteRetrospect = restrospectArr.reduce((acc: SelectBoxType["data"], cur) => {
if (cur.retrospectStatus === "DONE")
acc.push({
retrospectId: cur.retrospectId,
retrospectTitle: cur.title,
status: cur.retrospectStatus,
});
return acc;
}, []);

const navigate = useNavigate();
const queryClient = useQueryClient();
Expand Down Expand Up @@ -180,7 +185,7 @@ export function ActionItemListView({ isPossibleMake, teamActionList, spaceId, le
position: relative;
`}
>
<SelectBox data={retrospectInfo} onClick={() => {}} value={retrospect} updateRetroSpectData={updateRetroSpectData} />
<SelectBox data={isCompleteRetrospect} onClick={() => {}} value={retrospect} updateRetroSpectData={updateRetroSpectData} />

<Spacing size={1.5} />
<TextArea value={actionItemValue} onChange={handleInputChange} placeholder={"실행목표를 입력해주세요"} height="14.3rem" />
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
"packages/*",
"apps/*"
],
"version": "1.0.2-SNAPSHOT"
"version": "1.0.2"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "layer",
"version": "1.0.3",
"version": "1.0.2",
"private": true,
"scripts": {
"web": "pnpm -F @layer/web",
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@layer/shared",
"version": "1.0.3",
"version": "1.0.2",
"description": "",
"main": "index.ts",
"types": "./index.ts",
Expand Down

0 comments on commit 968e44e

Please sign in to comment.