Revert "feat: パッケージ関連に相互依存タブを分離して追加する"

This reverts commit adc26cc.

Author: irof

jig-core/src/main/resources/templates/assets/package.js

@@ -28,7 +28,7 @@ const PackageApp = (() => {
 
     const HIERARCHY_DIAGRAM_CLICK_HANDLER_NAME = 'filterPackageDiagram';
     const EXPLORE_DIAGRAM_CLICK_HANDLER_NAME = 'explorePackageDiagram';
-    const TAB = {HIERARCHY: 'hierarchy', MUTUAL: 'mutual', EXPLORE: 'explore'};
+    const TAB = {HIERARCHY: 'hierarchy', EXPLORE: 'explore'};
 
     const dom = {
         getClearPackageFilterButton: () => document.getElementById('clear-package-filter'),
@@ -697,7 +697,7 @@ const PackageApp = (() => {
         if (!diagram) return;
 
         const renderPlan = buildHierarchyDiagramRenderPlan(context);
-        context.diagramNodeIdToFqn = renderPlan.nodeIdToFqn;
+        applyHierarchyDiagramRenderPlan(context, renderPlan);
         setDiagramSource(diagram, renderPlan.source);
 
         const generator = (dir, opts) => buildHierarchyDiagramRenderPlan(context, dir, opts?.showPhysicalName).source;
@@ -733,9 +733,8 @@ const PackageApp = (() => {
         };
     }
 
-    // 相互依存タブの描画。階層探索と同じ集約・フィルタ条件（hierarchyState）に基づき相互依存を一覧化する。
-    function renderMutualDependencyTab(context) {
-        const renderPlan = buildHierarchyDiagramRenderPlan(context);
+    function applyHierarchyDiagramRenderPlan(context, renderPlan) {
+        context.diagramNodeIdToFqn = renderPlan.nodeIdToFqn;
         renderMutualDependencyList(renderPlan.mutualPairs, renderPlan.filteredCauseRelationEvidence, context.aggregationDepth, context, renderPlan.uniqueRelations, renderPlan.packageFqns);
     }
 
@@ -1291,8 +1290,6 @@ const PackageApp = (() => {
             renderExplorePackageList(exploreState);
         } else if (tabName === TAB.HIERARCHY) {
             renderHierarchyDiagramAndTable(hierarchyState);
-        } else if (tabName === TAB.MUTUAL) {
-            renderMutualDependencyTab(hierarchyState);
         }
     }
 
@@ -1326,7 +1323,6 @@ const PackageApp = (() => {
             if (exploreState.exploreCalleeMode !== '1') params.set('callee', exploreState.exploreCalleeMode);
             if (exploreState.excludeDeprecatedOnly) params.set('excludeDeprecated', 'true');
         } else {
-            if (activeTab === TAB.MUTUAL) params.set('tab', TAB.MUTUAL);
             if (hierarchyState.aggregationDepth !== 0) params.set('depth', hierarchyState.aggregationDepth);
             hierarchyState.packageFilterFqn.forEach(f => params.append('filter', f));
             hierarchyState.hierarchyCollapsedPackages.forEach(p => params.append('hcollapsed', p));
@@ -1425,8 +1421,7 @@ const PackageApp = (() => {
         Jig.dom.setupSortableTables();
         const renderedTabs = new Set();
         setupTabControl(tabName => {
-            // 相互依存タブは階層探索の状態に追従するため、表示のたびに再描画する
-            if (tabName === TAB.MUTUAL || !renderedTabs.has(tabName)) {
+            if (!renderedTabs.has(tabName)) {
                 renderedTabs.add(tabName);
                 renderTab(tabName);
             }
@@ -1491,7 +1486,6 @@ const PackageApp = (() => {
         applyDefaultPackageFilterIfPresent,
         buildMutualDependencyItems,
         renderMutualDependencyList,
-        renderMutualDependencyTab,
         buildMutualDependencyDiagramSource,
         renderHierarchyDiagram,
         renderHierarchyDiagramAndTable,

jig-core/src/main/resources/templates/package.html

@@ -22,8 +22,6 @@
             <li>パッケージフィルタ: 対象のパッケージ配下だけを表示します。</li>
             <li>依存関係の簡略表示: 直接の依存関係を優先して表示し、冗長な経路を省略します（循環参照は省略しません）。</li>
         </ul>
-        <p><b>相互依存</b>: パッケージ間の相互依存（循環）を抽出し、解消に向けて分析するための専用ビューです。階層探索と同じ集約・フィルタ条件に基づきます。
-        </p>
         <p><b>関連探索</b>: 特定のパッケージを起点として、その依存元・依存先ネットワークを探索します。依存元は青、依存先はオレンジ色で表示されます。
         </p>
         <ul>
@@ -35,12 +33,12 @@
 
     <nav class="package-mode-tabs">
         <button class="tab-button is-active" data-tab="hierarchy" data-i18n>階層探索</button>
-        <button class="tab-button" data-tab="mutual" data-i18n>相互依存</button>
         <button class="tab-button" data-tab="explore" data-i18n>関連探索</button>
     </nav>
 
     <div id="panel-hierarchy" class="package-tab-panel is-active">
         <pre id="package-relation-diagram" class="mermaid"></pre>
+        <section id="mutual-dependency-list" class="mutual-dependencies"></section>
 
         <div class="controls">
             <div class="control-row">
@@ -69,10 +67,6 @@
         </section>
     </div>
 
-    <div id="panel-mutual" class="package-tab-panel">
-        <section id="mutual-dependency-list" class="mutual-dependencies"></section>
-    </div>
-
     <div id="panel-explore" class="package-tab-panel">
         <pre id="package-explore-diagram" class="mermaid"></pre>
 

jig-core/src/test/js/package.test.js

@@ -755,7 +755,7 @@ test.describe('package.js', () => {
                 assert.equal(textPanel.children[0].className, 'causes');
             });
 
-            test('renderHierarchyDiagram: 相互依存を双方向矢印で描画する', () => {
+            test('renderHierarchyDiagram: 相互依存を含めて描画する', () => {
                 const doc = setupDocument();
                 setupDiagramEnvironment(doc, testContext);
                 setPackageData({
@@ -774,24 +774,6 @@ test.describe('package.js', () => {
                 const diagram = doc.getElementById('package-relation-diagram');
                 assert.equal(diagram._textContent.includes('graph'), true);
                 assert.equal(diagram._textContent.includes('<-->'), true);
-            });
-
-            test('renderMutualDependencyTab: 相互依存を一覧化する', () => {
-                const doc = setupDocument();
-                setupDiagramEnvironment(doc, testContext);
-                setPackageData({
-                    packages: [
-                        {fqn: 'app.a', classCount: 1},
-                        {fqn: 'app.b', classCount: 1},
-                    ],
-                    relations: [
-                        {from: 'app.a', to: 'app.b'},
-                        {from: 'app.b', to: 'app.a'},
-                    ],
-                }, testContext);
-
-                PackageApp.renderMutualDependencyTab(testContext);
-
                 const mutual = doc.getElementById('mutual-dependency-list');
                 assert.equal(mutual.children.length > 0, true);
             });