flow-lib-creomnia 1.0.4 → 1.0.5-dev.2

package/README.md

@@ -1,12 +1,117 @@
-# Nodes flow
+# creo-flow
 
-## Components
+[![CI](https://github.com/creomnia/creo-flow/workflows/CI/badge.svg)](https://github.com/creomnia/creo-flow/actions/workflows/ci.yml)
 
-`<NodesFlow />`
+## Development Workflow
 
-Props:
+### Branch Strategy
 
-- `nodes` - `NodeType[]`
-- `menuTabs` - `MenuTabType[]`
-- `addNewNodeCallback` - `AddNewNodeCallbackType`
-- `addButtonColor`(optional) - `string`
+This repository uses a three-tier branch strategy with branch protection:
+
+```
+feature branches → dev → qa → main
+```
+
+**All protected branches (dev, qa, main) require Pull Requests.**
+
+### Step-by-Step Process
+
+#### 1. Create Feature Branch
+
+```bash
+git checkout dev
+git pull origin dev
+git checkout -b feature/your-feature-name
+```
+
+#### 2. Develop and Push
+
+```bash
+# Make your changes
+git add <files>
+git commit -m "feat: your feature description"
+git push origin feature/your-feature-name
+```
+
+#### 3. Create PR to `dev`
+
+- Open PR on GitHub: `feature/your-feature-name` → `dev`
+- Title: Use conventional commits (`feat:`, `fix:`, `chore:`, etc.)
+- Get code review and merge
+- Result: Publishes to NPM with `dev` tag
+
+#### 4. Promote to `qa`
+
+- Open PR on GitHub: `dev` → `qa`
+- Title: `chore: promote dev to qa`
+- Merge PR
+- Result: Publishes to NPM with `qa` tag
+
+#### 5. Promote to `main`
+
+- Open PR on GitHub: `qa` → `main`
+- Title: **`Release: X.Y.Z`** (e.g., "Release: 1.0.6")
+- Merge PR
+- Result: Publishes production version X.Y.Z to NPM
+
+### Important Rules
+
+❌ **NEVER** create PRs directly to `main` from feature branches
+
+❌ **NEVER** skip the `qa` branch when promoting to `main`
+
+❌ **NEVER** try to push directly to `dev`, `qa`, or `main`
+
+✅ **ALWAYS** follow the PR flow: feature → `dev` → `qa` → `main`
+
+✅ **ALWAYS** use PR title `Release: X.Y.Z` when merging to `main`
+
+### NPM Publishing
+
+| From Branch | To Branch | PR Title Format | NPM Result |
+|-------------|-----------|-----------------|------------|
+| `feature/*` | `dev` | `feat:` / `fix:` / `chore:` | Publishes with `dev` tag (e.g., `1.0.5-dev.1`) |
+| `dev` | `qa` | `chore: promote dev to qa` | Publishes with `qa` tag (e.g., `1.0.5-qa.1`) |
+| `qa` | `main` | `Release: X.Y.Z` | Publishes production version `X.Y.Z` |
+
+### Commit Message Convention
+
+Use conventional commit style:
+- `feat:` - New feature
+- `fix:` - Bug fix
+- `chore:` - Maintenance tasks
+- `docs:` - Documentation changes
+- `refactor:` - Code refactoring
+- `test:` - Adding tests
+
+### Example Workflow
+
+```bash
+# 1. Create feature branch
+git checkout dev
+git pull origin dev
+git checkout -b feature/add-new-node-type
+
+# 2. Develop
+git add src/modules/node/components/NewNode.tsx
+git commit -m "feat: add new node type component"
+git push origin feature/add-new-node-type
+
+# 3. Open PR: feature/add-new-node-type → dev
+#    Title: "feat: add new node type component"
+#    Merge after review
+
+# 4. Open PR: dev → qa
+#    Title: "chore: promote dev to qa"
+#    Merge
+
+# 5. Open PR: qa → main
+#    Title: "Release: 1.0.6"
+#    Merge
+```
+
+### What to Do If PR is Accidentally Opened to Main
+
+1. **Close the PR** (don't merge it)
+2. **Change the base branch** to `dev` on GitHub (use "Edit" button)
+3. Or create a new PR: feature branch → `dev`

package/lib/modules/common/types/index.d.ts

@@ -5,6 +5,7 @@ export type MenuItemType = {
     value: string;
     icon: JSX.Element;
     type: NodeMenuItemType;
+    disabled?: boolean;
 };
 export type MenuTabType = {
     name: string;

package/lib/modules/connection/services/connectionServices.js

@@ -30,53 +30,59 @@ class ConnectionServices {
             },
         };
     };
-    buildConnections = ({ nodeDrawers, menuTabs, addNewNodeCallback, processedNodeIds, failedNodeId }) => nodeDrawers.reduce((connectionDrawers, nodeDrawer) => {
-        const childrenIds = nodeDrawer.nodeData?.childrenIds || [];
-        const children = nodeDrawers.filter((nodeDrawer) => childrenIds?.includes(nodeDrawer.id));
-        if (!children.length)
-            return connectionDrawers;
-        const isNodeWithDoubleConnections = config_1.Config.NODES_WITH_DOUBLE_CONNECTION.includes(nodeDrawer.type);
-        if (isNodeWithDoubleConnections) {
-            const leftChild = nodeDrawers.find((node) => node.nodeData?.id === nodeDrawer.nodeData?.leftChildrenId);
-            const rightChild = nodeDrawers.find((node) => node.nodeData?.id === nodeDrawer.nodeData?.rightChildrenId);
-            const newConnectionDrawers = [
-                this.createDrawerConnection({
-                    failedNodeId,
-                    processedNodeIds,
-                    nodeDrawer,
-                    index: 1,
-                    menuTabs,
-                    child: leftChild,
-                    addNewNodeCallback,
-                    curveType: leftChild?.nodeData?.startSectionNodeId
-                        ? enums_2.ConnectionCurveEnum.LEFT
-                        : undefined,
-                }),
-                this.createDrawerConnection({
-                    failedNodeId,
-                    processedNodeIds,
-                    nodeDrawer,
-                    index: 2,
-                    menuTabs,
-                    child: rightChild,
-                    addNewNodeCallback,
-                    curveType: rightChild?.nodeData?.startSectionNodeId
-                        ? enums_2.ConnectionCurveEnum.RIGHT
-                        : undefined,
-                }),
-            ];
+    buildConnections = ({ nodeDrawers, menuTabs, addNewNodeCallback, processedNodeIds, failedNodeId }) => {
+        const drawerById = new Map(nodeDrawers.map((d) => [d.id, d]));
+        const drawerByNodeDataId = new Map(nodeDrawers.map((d) => [d.nodeData?.id, d]));
+        return nodeDrawers.reduce((connectionDrawers, nodeDrawer) => {
+            const childrenIds = nodeDrawer.nodeData?.childrenIds || [];
+            const children = childrenIds
+                .map((id) => drawerById.get(id))
+                .filter((d) => !!d);
+            if (!children.length)
+                return connectionDrawers;
+            const isNodeWithDoubleConnections = config_1.Config.NODES_WITH_DOUBLE_CONNECTION.includes(nodeDrawer.type);
+            if (isNodeWithDoubleConnections) {
+                const leftChild = drawerByNodeDataId.get(nodeDrawer.nodeData?.leftChildrenId);
+                const rightChild = drawerByNodeDataId.get(nodeDrawer.nodeData?.rightChildrenId);
+                const newConnectionDrawers = [
+                    this.createDrawerConnection({
+                        failedNodeId,
+                        processedNodeIds,
+                        nodeDrawer,
+                        index: 1,
+                        menuTabs,
+                        child: leftChild,
+                        addNewNodeCallback,
+                        curveType: leftChild?.nodeData?.startSectionNodeId
+                            ? enums_2.ConnectionCurveEnum.LEFT
+                            : undefined,
+                    }),
+                    this.createDrawerConnection({
+                        failedNodeId,
+                        processedNodeIds,
+                        nodeDrawer,
+                        index: 2,
+                        menuTabs,
+                        child: rightChild,
+                        addNewNodeCallback,
+                        curveType: rightChild?.nodeData?.startSectionNodeId
+                            ? enums_2.ConnectionCurveEnum.RIGHT
+                            : undefined,
+                    }),
+                ];
+                return [...connectionDrawers, ...newConnectionDrawers];
+            }
+            const newConnectionDrawers = children.map((child, index) => this.createDrawerConnection({
+                failedNodeId,
+                processedNodeIds,
+                nodeDrawer,
+                index: index + 1,
+                menuTabs,
+                child: child,
+                addNewNodeCallback,
+            }));
             return [...connectionDrawers, ...newConnectionDrawers];
-        }
-        const newConnectionDrawers = children.map((child, index) => this.createDrawerConnection({
-            failedNodeId,
-            processedNodeIds,
-            nodeDrawer,
-            index: index + 1,
-            menuTabs,
-            child: child,
-            addNewNodeCallback,
-        }));
-        return [...connectionDrawers, ...newConnectionDrawers];
-    }, []);
+        }, []);
+    };
 }
 exports.connectionServices = new ConnectionServices();

package/lib/modules/node/components/NodesMenu/index.js

@@ -7,6 +7,8 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const styled_1 = require("./styled");
 const Grid_1 = __importDefault(require("@mui/material/Grid"));
+const material_1 = require("@mui/material");
+const icons_material_1 = require("@mui/icons-material");
 const NodesMenu = ({ addNewNodeCallback, menuTabs, data, onCloseMenu, emptyMenuItemsComponent, searchPlaceholder, }) => {
     const [value, setValue] = (0, react_1.useState)(menuTabs?.[0].name);
     const [searchQuery, setSearchQuery] = (0, react_1.useState)("");
@@ -33,7 +35,7 @@ const NodesMenu = ({ addNewNodeCallback, menuTabs, data, onCloseMenu, emptyMenuI
         return tab[value].filter((menuItem) => menuItem.name.toLowerCase().includes(searchQuery.toLowerCase()));
     }, [searchQuery, value]);
     return ((0, jsx_runtime_1.jsxs)(styled_1.MenuContainer, { children: [(0, jsx_runtime_1.jsxs)(Grid_1.default, { direction: "column", p: "0 0 10px 0", children: [(0, jsx_runtime_1.jsxs)(Grid_1.default, { alignItems: "center", container: true, p: "8px 8px 0 0", children: [(0, jsx_runtime_1.jsx)(Grid_1.default, { flexGrow: 1, item: true, children: (0, jsx_runtime_1.jsx)(styled_1.StyledTabs, { value: value, onChange: handleChange, textColor: "primary", indicatorColor: "primary", children: menuTabs.map((tab) => ((0, jsx_runtime_1.jsx)(styled_1.StyledTab, { value: tab.name, label: tab.name }, tab.name))) }) }), (0, jsx_runtime_1.jsx)(Grid_1.default, { item: true, children: (0, jsx_runtime_1.jsx)(styled_1.Close, { onClick: onCloseMenu }) })] }), (0, jsx_runtime_1.jsx)(styled_1.StyledTextField, { fullWidth: true, variant: "outlined", size: "small", placeholder: searchPlaceholder ? searchPlaceholder : "", value: searchQuery, onChange: handleSearchChange })] }), (0, jsx_runtime_1.jsx)(styled_1.ContentContainer, { children: filteredItems?.length > 0
-                    ? filteredItems.map((menuItem) => ((0, jsx_runtime_1.jsxs)(styled_1.MenuItem, { onClick: () => onMenuItemClick(menuItem.value, menuItem.type), children: [(0, jsx_runtime_1.jsx)(styled_1.IconWrapper, { children: menuItem.icon }), menuItem.name] }, menuItem.value)))
+                    ? filteredItems.map((menuItem) => ((0, jsx_runtime_1.jsxs)(styled_1.MenuItem, { style: { opacity: menuItem?.disabled ? 0.5 : 1, cursor: menuItem?.disabled ? 'not-allowed' : 'pointer' }, onClick: () => !menuItem?.disabled && onMenuItemClick(menuItem.value, menuItem.type), children: [(0, jsx_runtime_1.jsx)(styled_1.IconWrapper, { children: menuItem?.disabled ? (0, jsx_runtime_1.jsx)(material_1.Tooltip, { title: 'Building process', children: (0, jsx_runtime_1.jsx)(icons_material_1.BuildCircle, {}) }) : menuItem.icon }), menuItem.name] }, menuItem.value)))
                     : emptyMenuItemsComponent && emptyMenuItemsComponent })] }));
 };
 exports.default = NodesMenu;

package/lib/modules/node/services/expandCoefficientServices.js

@@ -4,13 +4,16 @@ exports.expandCoefficientServices = void 0;
 const config_1 = require("../../../config");
 class ExpandCoefficientServices {
     calculateNodeExpandCoefficient = (nodes) => {
+        const nodeMap = new Map(nodes.map((node) => [node.id, node]));
         const calculateNodeExpandCoefficientRecursion = ({ startNode, expandCoefficient, indexOfEncapsulation, }) => {
             if (!startNode.childrenIds?.length ||
                 (startNode.startSectionNodeId && indexOfEncapsulation <= 0)) {
                 return expandCoefficient;
             }
             if (startNode.startSectionNodeId && indexOfEncapsulation > 0) {
-                const childrenNodes = nodes.filter((node) => startNode.childrenIds?.includes(node.id));
+                const childrenNodes = (startNode.childrenIds || [])
+                    .map((id) => nodeMap.get(id))
+                    .filter((node) => !!node);
                 const nextExpandCoefficient = calculateNodeExpandCoefficientRecursion({
                     startNode: childrenNodes[0],
                     expandCoefficient: 0,
@@ -18,7 +21,9 @@ class ExpandCoefficientServices {
                 });
                 return Math.max(expandCoefficient, nextExpandCoefficient);
             }
-            const childrenNodes = nodes.filter((node) => startNode.childrenIds?.includes(node.id));
+            const childrenNodes = (startNode.childrenIds || [])
+                .map((id) => nodeMap.get(id))
+                .filter((node) => !!node);
             const childrenNodesExpandCoefficient = childrenNodes.map((node) => {
                 const isExpandable = config_1.Config.NODES_WITH_DOUBLE_CONNECTION.includes(startNode.type);
                 const calculatedExpandCoefficient = isExpandable

package/lib/modules/node/services/nodeServices.js

@@ -5,6 +5,7 @@ const enums_1 = require("../enums");
 const pointCalculationServices_1 = require("./pointCalculationServices");
 class NodeServices extends pointCalculationServices_1.NodeCalculationServices {
     combineNodes = (currentNodes, nodes) => {
+        const nodeMap = new Map(nodes.map((node) => [node.id, node]));
         const hubNodes = nodes.reduce((hubNodes, node) => {
             if (node.startSectionNodeId) {
                 return {
@@ -25,7 +26,7 @@ class NodeServices extends pointCalculationServices_1.NodeCalculationServices {
                 const childrenIds = currentNode.childrenIds || [];
                 const childNodes = childrenIds
                     .map((childId) => {
-                    return nodes.find((node) => node.id === childId) || [];
+                    return nodeMap.get(childId) || [];
                 })
                     .flat();
                 const blockedChildrenIds = currentNode.blockedChildrenIds || [];
@@ -79,10 +80,11 @@ class NodeServices extends pointCalculationServices_1.NodeCalculationServices {
                 childrenNodes: [],
                 updatedHubNodes: hubNodes,
             });
+            const combinedNodesMap = new Map(combinedNodes.map((n) => [n.id, n]));
             const drawableNodes = currentNodes.map((node) => {
                 const startSectionNodeId = node.startSectionNodeId;
                 const parent = startSectionNodeId
-                    ? combinedNodes.find((node) => node.id === startSectionNodeId)
+                    ? combinedNodesMap.get(startSectionNodeId)
                     : combinedNodes.find((parentNode) => parentNode.nodeData?.childrenIds?.includes(node.id));
                 // TODO it works when node has 2 children but should be refactored
                 const isSecondBranch = parent?.nodeData?.rightChildrenId === node.id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-lib-creomnia",
-  "version": "1.0.4",
+  "version": "1.0.5-dev.2",
   "description": "",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -10,7 +10,10 @@
     "clean": "rm -rf ./lib",
     "copy-files": "cp -R src/assets lib/assets",
     "build": "npm run clean && tsc && npm run copy-files",
-    "publish-package": "npm run build && npm publish"
+    "publish-package": "npm run build && npm publish",
+    "publishPackage": "npm run build && npm publish",
+    "publishPackageDev": "npm run build && npm publish --tag dev",
+    "publishPackageQa": "npm run build && npm publish --tag qa"
   },
   "keywords": [],
   "author": "",