@nu-art/conflict-resolution-frontend 0.401.9 → 0.500.6

package/_ats/ATS_ConflictResolution/ATS_ConflictResolution.d.ts

@@ -1,7 +1,9 @@
 import './ATS_ConflictResolution.scss';
-import { AppToolsScreen, ComponentSync, ModuleFE_BaseApi } from '@nu-art/thunderstorm-frontend/index';
+import { ComponentSync } from '@nu-art/thunder-widgets';
+import { AppToolsScreen } from '@nu-art/thunder-ui-modules';
+import type { ModuleFE_BaseApi } from '@nu-art/db-api-frontend';
 type State = {
-    upgradableModules: ModuleFE_BaseApi<any, any>[];
+    upgradableModules: ModuleFE_BaseApi<any>[];
     selectedModule?: ModuleFE_BaseApi<any>;
     itemId?: string;
 };

package/_ats/ATS_ConflictResolution/ATS_ConflictResolution.js

@@ -1,8 +1,14 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { filterDuplicates, Minute, RuntimeModules, sortArray } from '@nu-art/ts-common';
+/*
+ * @nu-art/conflict-resolution-frontend - Conflict resolution ATS screen component
+ * Copyright (C) 2026 Adam van der Kruk aka TacB0sS
+ * Licensed under the Apache License, Version 2.0
+ */
+import { filterDuplicates, RuntimeModules, sortArray } from '@nu-art/ts-common';
 import './ATS_ConflictResolution.scss';
-import { ATS_Backend, Button, ComponentSync, LL_V_L, SimpleListAdapter, TS_DropDown, TS_Input, TS_PropRenderer } from '@nu-art/thunderstorm-frontend/index';
-import { ModuleFE_CollectionActions } from '@nu-art/thunderstorm-frontend/modules/ModuleFE_CollectionActions';
+import { Button, ComponentSync, LL_V_L, SimpleListAdapter, TS_DropDown, TS_Input, TS_PropRenderer } from '@nu-art/thunder-widgets';
+import { ATS_Backend } from '@nu-art/thunder-ui-modules';
+import { ModuleFE_CollectionActions } from '@nu-art/db-api-frontend';
 import { ModuleFE_ConflictResolution } from '../../_modules/ModuleFE_ConflictResolution.js';
 export class ATS_ConflictResolution extends ComponentSync {
     static screen = {
@@ -18,17 +24,17 @@ export class ATS_ConflictResolution extends ComponentSync {
         return state;
     }
     getAdapter = () => {
-        return SimpleListAdapter(this.state.upgradableModules, module => _jsx(_Fragment, { children: module.item.dbDef.dbKey }));
+        return SimpleListAdapter(this.state.upgradableModules, module => _jsx(_Fragment, { children: module.item.config.dbKey }));
     };
     checkUsage = async () => {
         const itemId = this.state.itemId;
-        const dbKey = this.state.selectedModule?.dbDef.dbKey;
+        const dbKey = this.state.selectedModule?.config.dbKey;
         if (!itemId || !dbKey)
             return;
         const response = await ModuleFE_CollectionActions.check.usage({
-            dbKey: dbKey,
+            dbKey,
             itemIds: [itemId]
-        }).setTimeout(2 * Minute).executeSync();
+        });
         if (response.dependencies)
             ModuleFE_ConflictResolution.showDependencies(response.dependencies);
     };

package/_ats/index.d.ts

@@ -1,2 +1,2 @@
-import { AppToolsScreen } from '@nu-art/thunderstorm-frontend/index';
+import { AppToolsScreen } from '@nu-art/thunder-ui-modules';
 export declare const ATSGroup_ConflictResolution: AppToolsScreen[];

package/_ats/index.js

@@ -1,3 +1,8 @@
+/*
+ * @nu-art/conflict-resolution-frontend - Conflict resolution ATS group
+ * Copyright (C) 2026 Adam van der Kruk aka TacB0sS
+ * Licensed under the Apache License, Version 2.0
+ */
 import { ATS_ConflictResolution } from './ATS_ConflictResolution/ATS_ConflictResolution.js';
 export const ATSGroup_ConflictResolution = [
     ATS_ConflictResolution.screen,

package/_dispatchers/show-conflict-resolution.d.ts

@@ -1,5 +1,5 @@
-import { DBEntityDependencies } from '@nu-art/thunderstorm-shared';
-import { ThunderDispatcher } from '@nu-art/thunderstorm-frontend/index';
+import type { DBEntityDependencies } from '@nu-art/conflict-resolution-shared';
+import { ThunderDispatcher } from '@nu-art/thunder-core';
 export interface OnShowConflictResolution {
     __onShowConflictResolution: (dependencies?: DBEntityDependencies) => void;
 }

package/_dispatchers/show-conflict-resolution.js

@@ -1,2 +1,7 @@
-import { ThunderDispatcher } from '@nu-art/thunderstorm-frontend/index';
+/*
+ * @nu-art/conflict-resolution-frontend - Dispatcher for showing conflict resolution UI
+ * Copyright (C) 2026 Adam van der Kruk aka TacB0sS
+ * Licensed under the Apache License, Version 2.0
+ */
+import { ThunderDispatcher } from '@nu-art/thunder-core';
 export const dispatch_ShowConflictResolution = new ThunderDispatcher('__onShowConflictResolution');

package/_modules/ModuleFE_ConflictResolution.d.ts

@@ -1,4 +1,4 @@
-import { DBEntityDependencies } from '@nu-art/thunderstorm-shared';
+import { DBEntityDependencies } from '@nu-art/conflict-resolution-shared';
 import { Module, TypedMap } from '@nu-art/ts-common';
 import { ConflictResolutionItem } from '@nu-art/conflict-resolution-shared';
 declare class ModuleFE_ConflictResolution_Class extends Module {

package/_modules/ModuleFE_ConflictResolution.js

@@ -1,14 +1,19 @@
-import { DBEntityDependencyErrorType } from '@nu-art/thunderstorm-shared';
-import { ModuleFE_XHR } from '@nu-art/thunderstorm-frontend/index';
+/*
+ * @nu-art/conflict-resolution-frontend - Conflict resolution frontend module
+ * Copyright (C) 2026 Adam van der Kruk aka TacB0sS
+ * Licensed under the Apache License, Version 2.0
+ */
+import { DBEntityDependencyErrorType } from '@nu-art/conflict-resolution-shared';
+import { HttpClient } from '@nu-art/http-client';
 import { BadImplementationException, Module, asArray } from '@nu-art/ts-common';
-import { dispatch_ShowConflictResolution } from '../_dispatchers/index.js';
+import { dispatch_ShowConflictResolution } from '../_dispatchers/show-conflict-resolution.js';
 class ModuleFE_ConflictResolution_Class extends Module {
     conflictResolutionItems = [];
     initDefaultHasDependencyResponse = () => {
-        ModuleFE_XHR.setDefaultOnError(async (errorResponse, input, request) => {
-            if (errorResponse.errorResponse?.error?.type === DBEntityDependencyErrorType) {
-                dispatch_ShowConflictResolution.dispatchUI(errorResponse.errorResponse.error.data);
-            }
+        HttpClient.default?.setDefaultOnError(async (errorResponse) => {
+            const err = errorResponse.errorResponse?.error;
+            if (err?.type === DBEntityDependencyErrorType && err.data)
+                dispatch_ShowConflictResolution.dispatchUI(err.data);
         });
     };
     showDependencies = (dependencies) => {

package/_ui/ConflictResolutionTree/ConflictResolutionTree.d.ts

@@ -1,5 +1,5 @@
-import { DBEntityDependencies } from '@nu-art/thunderstorm-shared';
-import { Adapter, ComponentSync } from '@nu-art/thunderstorm-frontend/index';
+import type { DBEntityDependencies } from '@nu-art/conflict-resolution-shared';
+import { Adapter, ComponentSync } from '@nu-art/thunder-widgets';
 import './ConflictResolutionTree.scss';
 type Props = {
     dependencies: DBEntityDependencies;

package/_ui/ConflictResolutionTree/ConflictResolutionTree.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { AdapterBuilder, ComponentSync, TS_Tree } from '@nu-art/thunderstorm-frontend/index';
+import { AdapterBuilder, ComponentSync, TS_Tree } from '@nu-art/thunder-widgets';
 import { calculateConflictResolutionTree } from './tree-calculation.js';
 import { ConflictResolutionTreeRenderers } from './tree-rendering.js';
 import { ModuleFE_ConflictResolution } from '../../_modules/ModuleFE_ConflictResolution.js';

package/_ui/ConflictResolutionTree/tree-calculation.d.ts

@@ -1,3 +1,3 @@
-import { DBEntityDependencies } from '@nu-art/thunderstorm-shared';
+import type { DBEntityDependencies } from '@nu-art/conflict-resolution-shared';
 import { ConflictResolutionTree } from './types.js';
 export declare const calculateConflictResolutionTree: (dependencies: DBEntityDependencies) => ConflictResolutionTree["nodeType"];

package/_ui/ConflictResolutionTree/tree-calculation.js

@@ -1,6 +1,11 @@
+/*
+ * @nu-art/conflict-resolution-frontend - Conflict resolution tree calculation
+ * Copyright (C) 2026 Adam van der Kruk aka TacB0sS
+ * Licensed under the Apache License, Version 2.0
+ */
 import { RuntimeModules, StaticLogger, _keys } from '@nu-art/ts-common';
 const getItem = (dbKey, itemId) => {
-    const module = RuntimeModules().filter(module => module.dbDef?.dbKey === dbKey)[0];
+    const module = RuntimeModules().filter(m => m.config?.dbKey === dbKey)[0];
     if (!module) {
         StaticLogger.logWarning(`Could not get module for dbKey ${dbKey}`);
         return;

package/_ui/ConflictResolutionTree/tree-rendering.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { Label, ModuleFE_Thunderstorm } from '@nu-art/thunderstorm-frontend/index';
+import { Label } from '@nu-art/thunder-widgets';
 const renderTreeNode_CheckedItem = (props, map) => {
     const crItem = map[props.item.dbKey];
     let content;
@@ -22,7 +22,9 @@ const renderTreeNode_ConflictingItem = (props, map) => {
         content = props.item.itemId;
     else
         content = crItem.renderer(props.item.item) ?? props.item.itemId;
-    return _jsx(Label, { className: 'conflict-resolution-tree__conflicting-item', tooltip: content, onClick: () => ModuleFE_Thunderstorm.copyToClipboard(props.item.itemId), children: content });
+    return _jsx(Label, { className: 'conflict-resolution-tree__conflicting-item', tooltip: content, onClick: () => {
+            void navigator.clipboard.writeText(String(props.item.itemId));
+        }, children: content });
 };
 export const ConflictResolutionTreeRenderers = (map) => ({
     root: () => _jsx(_Fragment, {}),

package/_ui/ConflictResolutionTree/types.d.ts

@@ -1,10 +1,11 @@
 import * as React from 'react';
-import { TreeNode, TreeType } from '@nu-art/thunderstorm-frontend/index';
-import { DBProto, UniqueId } from '@nu-art/ts-common';
+import { TreeNode, TreeType } from '@nu-art/thunder-widgets';
+import { DB_Prototype } from '@nu-art/db-api-shared';
+import { UniqueId } from '@nu-art/ts-common';
 type Props_CheckedItem = {
     itemId: UniqueId;
     dbKey: string;
-    item?: DBProto<any>['dbType'];
+    item?: DB_Prototype['dbType'];
 };
 type Props_ConflictingCollection = {
     dbKey: string;
@@ -12,7 +13,7 @@ type Props_ConflictingCollection = {
 type Props_ConflictingItem = {
     itemId: UniqueId;
     dbKey: string;
-    item?: DBProto<any>['dbType'];
+    item?: DB_Prototype['dbType'];
 };
 type ConflictResolutionTree_Map = {
     root: {};

package/_ui/ConflictResolutionTree/types.js

@@ -1 +1,6 @@
+/*
+ * @nu-art/conflict-resolution-frontend - Conflict resolution tree types
+ * Copyright (C) 2026 Adam van der Kruk aka TacB0sS
+ * Licensed under the Apache License, Version 2.0
+ */
 export {};

package/_ui/Overlay_ConflictResolution/Overlay_ConflictResolution.d.ts

@@ -1,7 +1,7 @@
-import { DBEntityDependencies } from '@nu-art/thunderstorm-shared';
-import { ComponentSync } from '@nu-art/thunderstorm-frontend/index';
+import type { DBEntityDependencies } from '@nu-art/conflict-resolution-shared';
+import { ComponentSync } from '@nu-art/thunder-widgets';
 import './Overlay_ConflictResolution.scss';
-import { OnShowConflictResolution } from '../../_dispatchers/index.js';
+import { OnShowConflictResolution } from '../../_dispatchers/show-conflict-resolution.js';
 type State = {
     dependencies?: DBEntityDependencies;
 };

package/_ui/Overlay_ConflictResolution/Overlay_ConflictResolution.js

@@ -1,5 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-import { ComponentSync } from '@nu-art/thunderstorm-frontend/index';
+import { ComponentSync } from '@nu-art/thunder-widgets';
 import './Overlay_ConflictResolution.scss';
 import { Panel_ConflictResolution } from '../Panel_ConflictResolution/Panel_ConflictResolution.js';
 export class Overlay_ConflictResolution extends ComponentSync {

package/_ui/Panel_ConflictResolution/Panel_ConflictResolution.d.ts

@@ -1,5 +1,5 @@
-import { DBEntityDependencies } from '@nu-art/thunderstorm-shared';
-import { ComponentSync } from '@nu-art/thunderstorm-frontend/index';
+import type { DBEntityDependencies } from '@nu-art/conflict-resolution-shared';
+import { ComponentSync } from '@nu-art/thunder-widgets';
 import './Panel_ConflictResolution.scss';
 type Props = {
     dependencies: DBEntityDependencies;

package/_ui/Panel_ConflictResolution/Panel_ConflictResolution.js

@@ -1,8 +1,8 @@
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { Button, ComponentSync, LL_H_C, LL_V_L } from '@nu-art/thunderstorm-frontend/index';
+import { Button, ComponentSync, LL_H_C, LL_V_L } from '@nu-art/thunder-widgets';
 import { _keys, _values, filterDuplicates, flatArray, RuntimeModules } from '@nu-art/ts-common';
-import { dispatch_ShowConflictResolution } from '../../_dispatchers/index.js';
-import { TS_Icons } from '@nu-art/ts-styles/icons/index';
+import { dispatch_ShowConflictResolution } from '../../_dispatchers/show-conflict-resolution.js';
+import { TS_Icons } from '@nu-art/ts-styles/icons/icons';
 import './Panel_ConflictResolution.scss';
 import { ConflictResolutionTree } from '../ConflictResolutionTree/ConflictResolutionTree.js';
 export class Panel_ConflictResolution extends ComponentSync {
@@ -11,10 +11,9 @@ export class Panel_ConflictResolution extends ComponentSync {
         state.dependencies = nextProps.dependencies;
         return state;
     }
-    // ##################### Logic #####################
     resolveEntityLabel = () => {
-        const module = RuntimeModules().filter(module => module.dbDef?.dbKey === this.props.dependencies.dbKey)[0];
-        return module?.dbDef.entityName ?? 'Entity';
+        const module = RuntimeModules().filter(m => m.config?.dbKey === this.props.dependencies.dbKey)[0];
+        return module?.config.dbConfig.name ?? 'Entity';
     };
     closePanel = () => {
         dispatch_ShowConflictResolution.dispatchUI();
@@ -32,7 +31,6 @@ export class Panel_ConflictResolution extends ComponentSync {
     expand = () => {
         this.setState({ expanded: true });
     };
-    // ##################### Render #####################
     render() {
         return _jsxs(LL_V_L, { id: 'panel__conflict-resolution', className: this.state.expanded ? 'expanded' : undefined, children: [this.render_Header(), this.render_Body()] });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/conflict-resolution-frontend",
-  "version": "0.401.9",
+  "version": "0.500.6",
   "description": "Conflict Resolution Frontend",
   "keywords": [
     "TacB0sS",
@@ -16,13 +16,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com:nu-art-js/thunderstorm.git"
+    "url": "git+ssh://git@github.com:nu-art-js/thunderstorm.git",
+    "directory": "_thunderstorm/to-review/conflict-resolution/frontend"
   },
   "license": "Apache-2.0",
   "author": "TacB0sS",
-  "scripts": {
-    "build": "tsc"
-  },
+  "scripts": {},
   "contributors": [
     {
       "name": "TacB0sS"
@@ -37,12 +36,18 @@
     "linkDirectory": true
   },
   "dependencies": {
-    "@nu-art/conflict-resolution-shared": "0.401.9",
-    "@nu-art/thunderstorm-frontend": "0.401.9",
-    "@nu-art/thunderstorm-shared": "0.401.9",
-    "@nu-art/ts-common": "0.401.9",
-    "@nu-art/ts-styles": "0.401.9",
-    "react": "^18.0.0"
+    "@nu-art/conflict-resolution-shared": "0.500.6",
+    "@nu-art/ts-common": "0.500.6",
+    "@nu-art/ts-styles": "0.500.6",
+    "react": "^18.0.0",
+    "@nu-art/db-api-frontend": "0.500.6",
+    "@nu-art/db-api-shared": "0.500.6",
+    "@nu-art/editable-item": "0.500.6",
+    "@nu-art/http-client": "0.500.6",
+    "@nu-art/thunder-core": "0.500.6",
+    "@nu-art/thunder-routing": "0.500.6",
+    "@nu-art/thunder-ui-modules": "0.500.6",
+    "@nu-art/thunder-widgets": "0.500.6"
   },
   "devDependencies": {
     "@types/react": "^18.0.0"

package/_dispatchers/index.d.ts

@@ -1 +0,0 @@
-export * from './show-conflict-resolution.js';

package/_dispatchers/index.js

@@ -1 +0,0 @@
-export * from './show-conflict-resolution.js';

package/_ui/index.d.ts

@@ -1 +0,0 @@
-export * from './Overlay_ConflictResolution/Overlay_ConflictResolution.js';

package/_ui/index.js

@@ -1 +0,0 @@
-export * from './Overlay_ConflictResolution/Overlay_ConflictResolution.js';