@genexus/genexus-ide-ui 1.1.11 → 1.1.13

package/dist/genexus-ide-ui/{p-67e0b419.entry.js → p-ca9978e1.entry.js}

@@ -4,7 +4,7 @@ import { L as n } from "./p-311eedf3.js";
 
 import { c as r } from "./p-13738332.js";
 
-import { g as o } from "./p-ede7bd20.js";
+import { g as o } from "./p-2987a259.js";
 
 const l = ":host{display:grid;grid-template-rows:max-content 1fr max-content;overflow:auto;block-size:100%}.section{display:contents}.header__field-group{display:grid;grid-template-columns:1fr 1fr}.tabular-grid{contain:size}.data ch-tabular-grid-cell:is(:nth-child(2),:nth-child(3),:nth-child(4)){padding-block:var(--grid-cell__padding-block);padding-inline:var(--grid-cell__padding-inline);align-items:start;justify-content:start;display:inline-block;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;min-inline-size:0}ch-tabular-grid.empty-result::part(main){overflow:hidden}ch-tabular-grid-rowset-empty{position:relative}";
 
@@ -341,4 +341,4 @@ D = new WeakMap;
 F.style = l;
 
 export { F as gx_ide_data_selector };
-//# sourceMappingURL=p-67e0b419.entry.js.map
+//# sourceMappingURL=p-ca9978e1.entry.js.map

package/dist/genexus-ide-ui/{p-7d8812b0.entry.js → p-d77582b8.entry.js}

@@ -1,6 +1,6 @@
 import { r as t, h as e, H as i, a as s } from "./p-25a9f1d7.js";
 
-import { g as a } from "./p-ede7bd20.js";
+import { g as a } from "./p-2987a259.js";
 
 import { c as n } from "./p-13738332.js";
 
@@ -338,4 +338,4 @@ M = new WeakMap;
 T.style = r;
 
 export { T as gx_ide_ww_attributes };
-//# sourceMappingURL=p-7d8812b0.entry.js.map
+//# sourceMappingURL=p-d77582b8.entry.js.map

package/dist/genexus-ide-ui/{p-aab809c4.entry.js → p-fd440291.entry.js}

@@ -2,7 +2,7 @@ import { r as t, h as e, H as s, a as i } from "./p-25a9f1d7.js";
 
 import { L as n } from "./p-311eedf3.js";
 
-import { g as a } from "./p-ede7bd20.js";
+import { g as a } from "./p-2987a259.js";
 
 const o = "property";
 
@@ -492,4 +492,4 @@ V = new WeakMap, L = new WeakMap, l = new WeakSet, S = function _GxIdeKbManagerE
 q.style = c;
 
 export { q as gx_ide_kb_manager_export };
-//# sourceMappingURL=p-aab809c4.entry.js.map
+//# sourceMappingURL=p-fd440291.entry.js.map

package/dist/types/components/team-dev/bring-changes/bring-changes.d.ts

@@ -0,0 +1,120 @@
+export declare class GxIdeTeamDevBringChanges {
+    #private;
+    el: HTMLGxIdeTeamDevBringChangesElement;
+    private tabularGridEl;
+    /**
+     * An array that holds the id's of the objects that have been merged already.
+     */
+    alreadyMergedObjectsIdsArray: string[];
+    /**
+     * It hols a boolean indicating if at least one object from the tabular-grid is checked, for merging.
+     */
+    atLeastOneObjectIsChecked: boolean;
+    /**
+     * True while commitObjects hasn't been loaded or is empty. Used to display a loader.
+     */
+    loading: boolean;
+    /**
+     * The current search filter value
+     */
+    menuContextAction: ObjectActionTaken;
+    /**
+     * It hols a boolean indicating if at least one object from the tabular-grid is checked, for merging.
+     */
+    objectsFiltered: CommitObject[];
+    /**
+     * The current search filter value
+     */
+    searchValue: string;
+    /**
+     * The current state filter value
+     */
+    stateFilterValue: ObjectStateForFilter;
+    /**
+     * A set that stores the marked state of each object cell. This is necessary because filtering the grid * causes marked cells to lose their state.
+     */
+    markedObjectsSet: Set<string>;
+    /**
+     * A map that holds the current commit objects states ("pending" | "warning" | "error" | "merged")
+     */
+    objectsStatesMap: Map<string, ObjectState>;
+    objectsStatesMapChanged(newCommitObjectsStateMap: Map<string, ObjectState>): void;
+    /**
+     * A map that holds object messages, if any, for objects that could not be merged (these objects are in a "warning" or "error" state)
+     */
+    commitObjectsMessagesMap: Map<string, string>;
+    /**
+     * Set to true when objects are being mered. This helps disabling controls until all objects are done.
+     */
+    merging: boolean;
+    /**
+     * Detail about the commit
+     */
+    readonly commitDetail: CommitDetail;
+    /**
+     * Commit information
+     */
+    readonly commitInformation: CommitInformation[];
+    /**
+     * Array of commit
+     */
+    readonly commitObjects: CommitObject[];
+    commitObjectsChanged(newCommitObjects: CommitObject[]): void;
+    /**
+     * Determines whether the row options are enabled or not.
+     */
+    readonly enableRowOptions: boolean;
+    /**
+     * Determines whether the filters are rendered or not.
+     */
+    readonly hideFilters: boolean;
+    /**
+     * The callback that is triggered when the user wants to merge more than one commit.
+     */
+    readonly mergeObjectsCallback: MergeObjectsCallback;
+    /**
+     * If true, the "Action" column will display a button instead of a pill, only when the action is
+     */
+    readonly mergePillAsButton: boolean;
+    componentWillLoad(): Promise<void>;
+    /**
+     * It allows the host updating an object state, by providing the object id.
+     * @param objectId The ID of the object to update.
+     * @param newState The new state to set on the object.
+     * @param message Optional message explaining the change.
+     *
+     * @example
+     * bringChanges.updateObjectState('obj-24', "merging", null);
+     * bringChanges.updateObjectState('obj-27', "error", "The server did not respond.");
+     */
+    updateObjectState(objectId: string, newState: ObjectState, message: string): Promise<void>;
+    render(): any;
+}
+export type CommitDetail = {
+    genexusServer: string;
+    knowledgeBase: string;
+    currentVersion: string;
+    mergeFromVersion: string;
+};
+export type CommitInformation = {
+    id: string;
+    comment: string;
+    date: Date;
+};
+export type CommitObject = {
+    id: string;
+    date: Date;
+    name: string;
+    type: ObjectType;
+    description: string;
+    actionTaken: ObjectActionTaken;
+};
+export type ObjectActionTaken = "Inserted" | "Deleted" | "Modified" | "Unchanged" | "Unknown";
+export type ObjectState = "to-merge" | "to-merge-marked" | "merging" | "pending" | "warning" | "error" | "merged";
+type ObjectStateForFilter = Extract<ObjectState, "to-merge" | "warning" | "error" | "merged"> | "all";
+export type ObjectType = {
+    name: string;
+    icon: string;
+};
+export type MergeObjectsCallback = (objectsIds: string[]) => Promise<void>;
+export {};

package/dist/types/components.d.ts

@@ -60,6 +60,7 @@ import { AuthStep, TeamData as TeamData1 } from "./components/sign-in-team/sign-
 import { MessageType as MessageType1 } from "./components/splash/splash";
 import { RecentKBData, SecondarySection } from "./components/start-page/start-page";
 import { CheckedItemsInfo as CheckedItemsInfo1 } from "./components/_helpers/list-selector/list-selector";
+import { CommitDetail, CommitInformation, CommitObject, MergeObjectsCallback, ObjectState } from "./components/team-dev/bring-changes/bring-changes";
 import { CommitCallback, CommitSelectCallback, GetRecentComment, LoadCallback as LoadCallback4, ObjectsContextMenuCallback, PendingItemsCheckedCallback } from "./components/team-dev/commit/commit";
 import { LoadCallback as LoadCallback5, LoadDetailCallback, ObjectType as ObjectType1, SelectedVersionChangeCallback } from "./components/team-dev/history/history";
 import { ItemNode as ItemNode1 } from "./components/select-kb-items/select-kb-items";
@@ -128,6 +129,7 @@ export { AuthStep, TeamData as TeamData1 } from "./components/sign-in-team/sign-
 export { MessageType as MessageType1 } from "./components/splash/splash";
 export { RecentKBData, SecondarySection } from "./components/start-page/start-page";
 export { CheckedItemsInfo as CheckedItemsInfo1 } from "./components/_helpers/list-selector/list-selector";
+export { CommitDetail, CommitInformation, CommitObject, MergeObjectsCallback, ObjectState } from "./components/team-dev/bring-changes/bring-changes";
 export { CommitCallback, CommitSelectCallback, GetRecentComment, LoadCallback as LoadCallback4, ObjectsContextMenuCallback, PendingItemsCheckedCallback } from "./components/team-dev/commit/commit";
 export { LoadCallback as LoadCallback5, LoadDetailCallback, ObjectType as ObjectType1, SelectedVersionChangeCallback } from "./components/team-dev/history/history";
 export { ItemNode as ItemNode1 } from "./components/select-kb-items/select-kb-items";
@@ -2059,6 +2061,44 @@ export namespace Components {
     }
     interface GxIdeSwitcher {
     }
+    interface GxIdeTeamDevBringChanges {
+        /**
+          * Detail about the commit
+         */
+        "commitDetail": CommitDetail;
+        /**
+          * Commit information
+         */
+        "commitInformation": CommitInformation[];
+        /**
+          * Array of commit
+         */
+        "commitObjects": CommitObject[];
+        /**
+          * Determines whether the row options are enabled or not.
+         */
+        "enableRowOptions": boolean;
+        /**
+          * Determines whether the filters are rendered or not.
+         */
+        "hideFilters": boolean;
+        /**
+          * The callback that is triggered when the user wants to merge more than one commit.
+         */
+        "mergeObjectsCallback": MergeObjectsCallback;
+        /**
+          * If true, the "Action" column will display a button instead of a pill, only when the action is
+         */
+        "mergePillAsButton": boolean;
+        /**
+          * It allows the host updating an object state, by providing the object id.
+          * @param objectId The ID of the object to update.
+          * @param newState The new state to set on the object.
+          * @param message Optional message explaining the change.
+          * @example bringChanges.updateObjectState('obj-24', "merging", null); bringChanges.updateObjectState('obj-27', "error", "The server did not respond.");
+         */
+        "updateObjectState": (objectId: string, newState: ObjectState, message: string) => Promise<void>;
+    }
     interface GxIdeTeamDevCommit {
         /**
           * Possible values for Categories filter
@@ -3337,6 +3377,12 @@ declare global {
         prototype: HTMLGxIdeSwitcherElement;
         new (): HTMLGxIdeSwitcherElement;
     };
+    interface HTMLGxIdeTeamDevBringChangesElement extends Components.GxIdeTeamDevBringChanges, HTMLStencilElement {
+    }
+    var HTMLGxIdeTeamDevBringChangesElement: {
+        prototype: HTMLGxIdeTeamDevBringChangesElement;
+        new (): HTMLGxIdeTeamDevBringChangesElement;
+    };
     interface HTMLGxIdeTeamDevCommitElementEventMap {
         "componentDidRenderFirstTime": boolean;
         "componentDidLoadEvent": boolean;
@@ -3590,6 +3636,7 @@ declare global {
         "gx-ide-status-buttons": HTMLGxIdeStatusButtonsElement;
         "gx-ide-switch-panel": HTMLGxIdeSwitchPanelElement;
         "gx-ide-switcher": HTMLGxIdeSwitcherElement;
+        "gx-ide-team-dev-bring-changes": HTMLGxIdeTeamDevBringChangesElement;
         "gx-ide-team-dev-commit": HTMLGxIdeTeamDevCommitElement;
         "gx-ide-team-dev-history": HTMLGxIdeTeamDevHistoryElement;
         "gx-ide-team-dev-select-recent-comment": HTMLGxIdeTeamDevSelectRecentCommentElement;
@@ -5569,6 +5616,36 @@ declare namespace LocalJSX {
     }
     interface GxIdeSwitcher {
     }
+    interface GxIdeTeamDevBringChanges {
+        /**
+          * Detail about the commit
+         */
+        "commitDetail"?: CommitDetail;
+        /**
+          * Commit information
+         */
+        "commitInformation"?: CommitInformation[];
+        /**
+          * Array of commit
+         */
+        "commitObjects"?: CommitObject[];
+        /**
+          * Determines whether the row options are enabled or not.
+         */
+        "enableRowOptions"?: boolean;
+        /**
+          * Determines whether the filters are rendered or not.
+         */
+        "hideFilters"?: boolean;
+        /**
+          * The callback that is triggered when the user wants to merge more than one commit.
+         */
+        "mergeObjectsCallback": MergeObjectsCallback;
+        /**
+          * If true, the "Action" column will display a button instead of a pill, only when the action is
+         */
+        "mergePillAsButton"?: boolean;
+    }
     interface GxIdeTeamDevCommit {
         /**
           * Possible values for Categories filter
@@ -6162,6 +6239,7 @@ declare namespace LocalJSX {
         "gx-ide-status-buttons": GxIdeStatusButtons;
         "gx-ide-switch-panel": GxIdeSwitchPanel;
         "gx-ide-switcher": GxIdeSwitcher;
+        "gx-ide-team-dev-bring-changes": GxIdeTeamDevBringChanges;
         "gx-ide-team-dev-commit": GxIdeTeamDevCommit;
         "gx-ide-team-dev-history": GxIdeTeamDevHistory;
         "gx-ide-team-dev-select-recent-comment": GxIdeTeamDevSelectRecentComment;
@@ -6240,6 +6318,7 @@ declare module "@stencil/core" {
             "gx-ide-status-buttons": LocalJSX.GxIdeStatusButtons & JSXBase.HTMLAttributes<HTMLGxIdeStatusButtonsElement>;
             "gx-ide-switch-panel": LocalJSX.GxIdeSwitchPanel & JSXBase.HTMLAttributes<HTMLGxIdeSwitchPanelElement>;
             "gx-ide-switcher": LocalJSX.GxIdeSwitcher & JSXBase.HTMLAttributes<HTMLGxIdeSwitcherElement>;
+            "gx-ide-team-dev-bring-changes": LocalJSX.GxIdeTeamDevBringChanges & JSXBase.HTMLAttributes<HTMLGxIdeTeamDevBringChangesElement>;
             "gx-ide-team-dev-commit": LocalJSX.GxIdeTeamDevCommit & JSXBase.HTMLAttributes<HTMLGxIdeTeamDevCommitElement>;
             "gx-ide-team-dev-history": LocalJSX.GxIdeTeamDevHistory & JSXBase.HTMLAttributes<HTMLGxIdeTeamDevHistoryElement>;
             "gx-ide-team-dev-select-recent-comment": LocalJSX.GxIdeTeamDevSelectRecentComment & JSXBase.HTMLAttributes<HTMLGxIdeTeamDevSelectRecentCommentElement>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genexus/genexus-ide-ui",
   "license": "Apache-2.0",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "GeneXus IDE UI components",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",
@@ -37,12 +37,12 @@
   "peerDependencies": {
     "@genexus/chameleon-controls-library": "~6.5.0",
     "@genexus/gemini": "*2.0.1",
-    "@genexus/mercury": "*0.25.2"
+    "@genexus/mercury": "*0.26.0"
   },
   "devDependencies": {
     "@genexus/chameleon-controls-library": "~6.5.0",
     "@genexus/gemini": "*2.0.1",
-    "@genexus/mercury": "*0.25.2",
+    "@genexus/mercury": "*0.26.0",
     "@stencil-community/eslint-plugin": "~0.7.1",
     "@stencil/core": "~4.9.0",
     "@stencil/sass": "~1.4.0",