From eee8f9a459b6ebaed5001c2e2a7b3302579e2c1c Mon Sep 17 00:00:00 2001 From: umsangdon Date: Sun, 4 Oct 2026 17:21:17 +0900 Subject: [PATCH] =?UTF-8?q?feat(M02):=20=EA=B0=80=EC=A0=B8=EC=98=AC=20?= =?UTF-8?q?=EA=B3=B3=20=ED=83=AD=20readableSources=20=C2=B7=20=ED=9A=8C?= =?UTF-8?q?=EC=82=AC=20=EB=A7=A1=EC=9D=8C=20manages=20=E2=80=94=20?= =?UTF-8?q?=EB=B3=B5=EC=82=AC=20=EC=83=9D=EC=84=B1=20=C2=B7=20=EB=B3=B5?= =?UTF-8?q?=EC=82=AC=ED=95=B4=20=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0=20?= =?UTF-8?q?=ED=83=AD=20=EB=AA=A9=EB=A1=9D(39-6=20E5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_013rJwJMVL4EE31y77TB11AP --- .../M02_MasterTemplete_Layer.ts | 72 +++++++++++++++++++ resources/tester/test_m02_layer_screen.py | 49 +++++++++++++ ui_template/ui_template_locale_m2.ts | 2 + 3 files changed, 123 insertions(+) diff --git a/M02_MasterTemplete/M02_MasterTemplete_Layer.ts b/M02_MasterTemplete/M02_MasterTemplete_Layer.ts index 742f8f20a..3b94c655c 100644 --- a/M02_MasterTemplete/M02_MasterTemplete_Layer.ts +++ b/M02_MasterTemplete/M02_MasterTemplete_Layer.ts @@ -93,6 +93,78 @@ export function accessFor( return { canWrite: layer === "personal" || companyAdmin, needCompany: false }; } +/** 회사 C 를 맡음 — 시스템 관리자 · 또는 C 의 회사 관리자(서버 `M02_Layer_Access.manages` 짝 · 39-6) */ +export function manages(company: string | null, user: SessionUser | null): boolean { + if (!company || !user) return false; + if (user.role === "SYSTEM_ADMIN") return true; + const companyAdmin = user.role === "ADMIN" || !!user.is_master; + return companyAdmin && company === ownOwner("company", user); +} + +/** 가져올 곳 탭 하나 — `people` = 다른 사람(주인은 부르는 쪽이 `fetchOwners` 로 고름) */ +export interface Source { + id: "master" | "company" | "personal" | "people" | "practice"; + layer: ManageLayer; + /** 층 주인 — 자기 층 · 마스터 · 실무문서 · 다른 사람 = null */ + owner: string | null; + label: string; +} + +/** 복사 생성 · 복사해 가져오기의 탭(39-6 · 답 2) — 읽을 수 있는 곳 + 기본 탭. + * 기본 = 시스템 관리자 마스터 · 그 밖 내 개인(회사 없으면 마스터) · `practice` = 일위대가 고를 때만 */ +export function readableSources( + user: SessionUser | null, + company: string | null, + opt: { practice?: boolean } = {}, +): { tabs: Source[]; first: Source["id"] } { + const isSystem = user?.role === "SYSTEM_ADMIN"; + const own = ownOwner("personal", user); + const tabs: Source[] = [ + { id: "master", layer: "system", owner: null, label: L("M02_PickerSystem") }, + ...(company + ? [ + { + id: "company" as const, + layer: "company" as const, + owner: company === ownOwner("company", user) ? null : company, + label: L("M02_PickerCompany"), + }, + ] + : []), + ...(own + ? [ + { + id: "personal" as const, + layer: "personal" as const, + owner: null, + label: L("M02_PickerPersonal"), + }, + ] + : []), + ...(manages(company, user) + ? [ + { + id: "people" as const, + layer: "personal" as const, + owner: null, + label: L("M02_SourcePeople"), + }, + ] + : []), + ...(opt.practice && isSystem + ? [ + { + id: "practice" as const, + layer: "system" as const, + owner: null, + label: L("M02_SourcePractice"), + }, + ] + : []), + ]; + return { tabs, first: isSystem || !own ? "master" : "personal" }; +} + /** 회사 없음 — 개인 · 회사 층은 회사 폴더 아래라 회사부터 */ export function buildNeedCompany(): HTMLElement { const go = createButton({ label: L("M02_NeedCompanyGo"), variant: "filled" }); diff --git a/resources/tester/test_m02_layer_screen.py b/resources/tester/test_m02_layer_screen.py index c7bb3f17f..f731a5644 100644 --- a/resources/tester/test_m02_layer_screen.py +++ b/resources/tester/test_m02_layer_screen.py @@ -87,6 +87,55 @@ def test_주소_인자를_라우트에서_뗌(): assert 'open: "구조물조합", root: "personal"' in picker and "layer=personal" not in picker +@pytest.mark.skipif(shutil.which("node") is None, reason="node 가 없음") +def test_가져올_곳_탭(): + """39-6 · 답 2 — 탭 = 마스터 · 볼 회사 · 내 개인 · 다른 사람(맡은 회사) · 실무문서(시스템 관리자 · + 일위대가) · 기본 = 시스템 관리자 마스터 · 그 밖 내 개인(회사 없으면 마스터).""" + text = _text(LAYER) + parts = [ + re.search(r"^export const ownOwner[\s\S]*?;\n", text, re.M), + re.search(r"^export function manages[\s\S]*?^}", text, re.M), + re.search(r"^export interface Source[\s\S]*?^}", text, re.M), + re.search(r"^export function readableSources[\s\S]*?^}", text, re.M), + ] + assert all(parts), "ownOwner · manages · Source · readableSources 를 못 찾음" + script = ( + 'type ManageLayer = "system" | "company" | "personal";\n' + "interface SessionUser { id: string; role?: string; company_id?: number | null;" + " is_master?: boolean }\n" + "const L = (key: string): string => key;\n" + + "\n".join(p.group(0).replace("export ", "") for p in parts if p) + + "\nconst cases = JSON.parse(process.argv[1]);" + + "\nconsole.log(JSON.stringify(cases.map(([u, c, practice]) => {" + + "\n const got = readableSources(u, c, { practice });" + + "\n return [got.first, got.tabs.map((t) => t.id + (t.owner ? ':' + t.owner : ''))];" + + "\n})));" + ) + sys1 = {"id": "1", "role": "SYSTEM_ADMIN", "company_id": 1} + admin = {"id": "5", "role": "ADMIN", "company_id": 3} + master = {"id": "6", "role": "USER", "company_id": 3, "is_master": True} + user = {"id": "7", "role": "USER", "company_id": 3} + orphan = {"id": "8", "role": "USER", "company_id": None} + cases = [ + [sys1, "3", True], [sys1, "1", False], [admin, "3", True], [master, "3", False], + [user, "3", True], [orphan, None, False], + ] # fmt: skip + result = subprocess.run( + ["node", "--experimental-strip-types", "--no-warnings", + "--input-type=module-typescript", "-e", script, json.dumps(cases)], + capture_output=True, text=True, encoding="utf-8", timeout=60, + ) # fmt: skip + assert result.returncode == 0, result.stderr + assert json.loads(result.stdout) == [ + ["master", ["master", "company:3", "personal", "people", "practice"]], # 고객 회사 봄 + ["master", ["master", "company", "personal", "people"]], # 자기 회사 · 일위대가 아님 + ["personal", ["master", "company", "personal", "people"]], # 회사 관리자 · 실무문서 없음 + ["personal", ["master", "company", "personal", "people"]], # is_master = 회사 관리자 + ["personal", ["master", "company", "personal"]], # 일반 = 다른 사람 없음 + ["master", ["master"]], # 회사 없음 + ] # fmt: skip + + @pytest.mark.skipif(shutil.which("node") is None, reason="node 가 없음") def test_볼_회사는_시스템_관리자만_고름(): """29-2 — 시스템 관리자 = 해시 company · sessionStorage aislo.adminCompany · 자기 회사 차례 · diff --git a/ui_template/ui_template_locale_m2.ts b/ui_template/ui_template_locale_m2.ts index eff4717b9..1f89b5c20 100644 --- a/ui_template/ui_template_locale_m2.ts +++ b/ui_template/ui_template_locale_m2.ts @@ -103,6 +103,8 @@ export const ui_locales_m2 = { M02_RootShared: ["회사 공용", "Company shared"], M02_RootReadOnly: ["읽기", "read-only"], M02_RootNone: ["볼 수 있는 층이 없음", "Nothing to show"], + M02_SourcePeople: ["다른 사람", "Others"], + M02_SourcePractice: ["실무문서", "Practice documents"], M02_TreeSearch: [ "찾기 — 이름 · 키 · 폴더 · 단위 (낱말 여럿 = 모두 담은 것)", "Find — name, key, folder, unit (all words)",