@knime/hub-features 1.31.1 → 1.33.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @knime/hub-features
 
+## 1.33.0
+
+### Minor Changes
+
+- 49b0d7a: Add analytics event for requesting a node dialog migration
+
+## 1.32.0
+
+### Minor Changes
+
+- de41b7f: Add object uploaded from Space Explorer in cloudhome event
+- de41b7f: Add invite team member events
+
+  - Explicitly invite team member from manage team members panel
+  - Implicitly invite team member from share space popup
+
+- de41b7f: Add object uploaded from Space Explorer in editor event
+- de41b7f: Add version related events
+
+  - Creating a workflow version from workflow details page in Home
+  - Creating a component version from component details page in Home
+
 ## 1.31.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knime/hub-features",
-  "version": "1.31.1",
+  "version": "1.33.0",
   "description": "Vue components & composables for shared hub features",
   "repository": {
     "type": "git",

package/src/analytics/schema/cloudhome-event-functions.ts

@@ -15,7 +15,7 @@ export const adHocExecutionStartedDeploymentsPage = <T extends DefaultContext>(c
     event_source: "cloudhome",
     event_display_name: "Ad Hoc Execution Started",
     interaction: {
-      location: "contextual_side_panel",
+      location: "main_area",
       page: "deployments",
       trigger: "user",
       type: "click",
@@ -75,6 +75,54 @@ export const adHocExecutionStartedWorkflowPage = <T extends DefaultContext>(ctx:
   return event;
 };
 
+/**
+ * Fired when the user clicks the Create button in the version creation side panel on the component details page
+ */
+export const versionCreatedFromComponentDetails = <T extends DefaultContext>(ctx: T) => (): AnalyticsEvent => {
+  const staticData = {
+    ...toSnakeCaseDeep(ctx),
+    unique_event_id: crypto.randomUUID(),
+    timestamp: new Date().toISOString(),
+    event_name: "version_created",
+    event_source: "cloudhome",
+    event_display_name: "Version Created",
+    interaction: {
+      location: "contextual_side_panel",
+      page: "component_details",
+      trigger: "user",
+      type: "click",
+    },
+  } satisfies SchemaStaticFields & GeneratedStaticFields;
+
+  const event = { id: staticData.event_name, data: { ...staticData } };
+
+  return event;
+};
+
+/**
+ * Fired when the user clicks the Create button in the version creation side panel on the workflow details page
+ */
+export const versionCreatedFromWorkflowDetails = <T extends DefaultContext>(ctx: T) => (): AnalyticsEvent => {
+  const staticData = {
+    ...toSnakeCaseDeep(ctx),
+    unique_event_id: crypto.randomUUID(),
+    timestamp: new Date().toISOString(),
+    event_name: "version_created",
+    event_source: "cloudhome",
+    event_display_name: "Version Created",
+    interaction: {
+      location: "contextual_side_panel",
+      page: "workflow_details",
+      trigger: "user",
+      type: "click",
+    },
+  } satisfies SchemaStaticFields & GeneratedStaticFields;
+
+  const event = { id: staticData.event_name, data: { ...staticData } };
+
+  return event;
+};
+
 /**
  * Fired when the user creates a new secret by clicking Create in the side panel on the team secrets page
  */
@@ -243,3 +291,75 @@ export const deploymentSharedWorkflowSharingPopup = <T extends DefaultContext>(c
   return event;
 };
 
+/**
+ * Fired when the user uploads items via the upload button in the main area on the space page
+ */
+export const objectUploadedFromSpacePage = <T extends DefaultContext>(ctx: T) => (eventData: EventFunctionArgs<"objectUploadedFromSpacePage">): AnalyticsEvent => {
+  const staticData = {
+    ...toSnakeCaseDeep(ctx),
+    unique_event_id: crypto.randomUUID(),
+    timestamp: new Date().toISOString(),
+    event_name: "object_uploaded",
+    event_source: "cloudhome",
+    event_display_name: "Object Uploaded",
+    interaction: {
+      location: "main_area",
+      page: "space",
+      trigger: "user",
+      type: "click",
+    },
+  } satisfies SchemaStaticFields & GeneratedStaticFields;
+
+  const event = { id: staticData.event_name, data: { ...staticData, payload: { ...toSnakeCaseDeep(eventData as Record<string, any>) } } };
+
+  return event;
+};
+
+/**
+ * Fired when the user invites a team member via the manage team members popup on the spaces page
+ */
+export const teamMemberInvitedFromManageTeamMembersPanel = <T extends DefaultContext>(ctx: T) => (): AnalyticsEvent => {
+  const staticData = {
+    ...toSnakeCaseDeep(ctx),
+    unique_event_id: crypto.randomUUID(),
+    timestamp: new Date().toISOString(),
+    event_name: "team_member_invited",
+    event_source: "cloudhome",
+    event_display_name: "Team Member Invited",
+    interaction: {
+      location: "popup",
+      page: "spaces",
+      trigger: "user",
+      type: "click",
+    },
+  } satisfies SchemaStaticFields & GeneratedStaticFields;
+
+  const event = { id: staticData.event_name, data: { ...staticData } };
+
+  return event;
+};
+
+/**
+ * Fired when the user invites a team member via the share space popup on the space page
+ */
+export const teamMemberInvitedFromShareSpacePopup = <T extends DefaultContext>(ctx: T) => (): AnalyticsEvent => {
+  const staticData = {
+    ...toSnakeCaseDeep(ctx),
+    unique_event_id: crypto.randomUUID(),
+    timestamp: new Date().toISOString(),
+    event_name: "team_member_invited",
+    event_source: "cloudhome",
+    event_display_name: "Team Member Invited",
+    interaction: {
+      location: "popup",
+      page: "space",
+      trigger: "user",
+      type: "click",
+    },
+  } satisfies SchemaStaticFields & GeneratedStaticFields;
+
+  const event = { id: staticData.event_name, data: { ...staticData } };
+
+  return event;
+};
+

package/src/analytics/schema/editor-event-functions.ts

@@ -1163,6 +1163,29 @@ export const nodeConfigFeedbackSubmitted = <T extends DefaultContext>(ctx: T) =>
   return event;
 };
 
+/**
+ * Fired when the user requests the migration of a node's auto-generated dialog to a modern dialog
+ */
+export const nodeMigrationRequested = <T extends DefaultContext>(ctx: T) => (eventData: EventFunctionArgs<"nodeMigrationRequested">): AnalyticsEvent => {
+  const staticData = {
+    ...toSnakeCaseDeep(ctx),
+    unique_event_id: crypto.randomUUID(),
+    timestamp: new Date().toISOString(),
+    event_name: "node_migration_requested",
+    event_source: "editor",
+    event_display_name: "Node Migration Requested",
+    interaction: {
+      location: "node_configuration",
+      trigger: "user",
+      type: "click",
+    },
+  } satisfies SchemaStaticFields & GeneratedStaticFields;
+
+  const event = { id: staticData.event_name, data: { ...staticData, payload: { ...toSnakeCaseDeep(eventData as Record<string, any>) } } };
+
+  return event;
+};
+
 /**
  * Fired when the user executes all nodes via the context menu
  */
@@ -1891,3 +1914,26 @@ export const stepLoopExecutionCtxMenu = <T extends DefaultContext>(ctx: T) => (e
   return event;
 };
 
+/**
+ * Fired when the user uploads items via the upload button in the space explorer
+ */
+export const objectUploaded = <T extends DefaultContext>(ctx: T) => (eventData: EventFunctionArgs<"objectUploaded">): AnalyticsEvent => {
+  const staticData = {
+    ...toSnakeCaseDeep(ctx),
+    unique_event_id: crypto.randomUUID(),
+    timestamp: new Date().toISOString(),
+    event_name: "object_uploaded",
+    event_source: "editor",
+    event_display_name: "Object Uploaded",
+    interaction: {
+      location: "space_explorer",
+      trigger: "user",
+      type: "click",
+    },
+  } satisfies SchemaStaticFields & GeneratedStaticFields;
+
+  const event = { id: staticData.event_name, data: { ...staticData, payload: { ...toSnakeCaseDeep(eventData as Record<string, any>) } } };
+
+  return event;
+};
+

package/src/analytics/schema/schema.d.ts

@@ -427,7 +427,7 @@ export interface AnalyticsEventSchema {
       event_source: "cloudhome";
       event_display_name: "Ad Hoc Execution Started";
       interaction: {
-        location: "contextual_side_panel";
+        location: "main_area";
         page: "deployments";
         trigger: InteractionTrigger & "user";
         type: InteractionType & "click";
@@ -491,6 +491,30 @@ export interface AnalyticsEventSchema {
       };
       payload: EmptyPayload;
     };
+    versionCreatedFromComponentDetails: {
+      event_name: "version_created";
+      event_source: "cloudhome";
+      event_display_name: "Version Created";
+      interaction: {
+        location: "contextual_side_panel";
+        page: "component_details";
+        trigger: InteractionTrigger & "user";
+        type: InteractionType & "click";
+      };
+      payload: EmptyPayload;
+    };
+    versionCreatedFromWorkflowDetails: {
+      event_name: "version_created";
+      event_source: "cloudhome";
+      event_display_name: "Version Created";
+      interaction: {
+        location: "contextual_side_panel";
+        page: "workflow_details";
+        trigger: InteractionTrigger & "user";
+        type: InteractionType & "click";
+      };
+      payload: EmptyPayload;
+    };
     secretCreatedTeamSecrets: {
       event_name: "secret_created";
       event_source: "cloudhome";
@@ -776,6 +800,17 @@ export interface AnalyticsEventSchema {
       };
       payload: NodeConfigFeedbackPayload;
     };
+    nodeMigrationRequested: {
+      event_name: "node_migration_requested";
+      event_source: "editor";
+      event_display_name: "Node Migration Requested";
+      interaction: {
+        location: "node_configuration";
+        trigger: InteractionTrigger & "user";
+        type: InteractionType & "click";
+      };
+      payload: NodeMigrationRequestedPayload;
+    };
     executeAllNodesCtxMenu: {
       event_name: "all_nodes_executed";
       event_source: "editor";
@@ -1132,6 +1167,53 @@ export interface AnalyticsEventSchema {
       };
       payload: SingleNodeExecutionPayload;
     };
+    objectUploadedFromSpacePage: {
+      event_name: "object_uploaded";
+      event_source: "cloudhome";
+      event_display_name: "Object Uploaded";
+      interaction: {
+        location: "main_area";
+        page: "space";
+        trigger: InteractionTrigger & "user";
+        type: InteractionType & "click";
+      };
+      payload: ObjectUploadedPayload;
+    };
+    objectUploaded: {
+      event_name: "object_uploaded";
+      event_source: "editor";
+      event_display_name: "Object Uploaded";
+      interaction: {
+        location: "space_explorer";
+        trigger: InteractionTrigger & "user";
+        type: InteractionType & "click";
+      };
+      payload: ObjectUploadedPayload;
+    };
+    teamMemberInvitedFromManageTeamMembersPanel: {
+      event_name: "team_member_invited";
+      event_source: "cloudhome";
+      event_display_name: "Team Member Invited";
+      interaction: {
+        location: "popup";
+        page: "spaces";
+        trigger: InteractionTrigger & "user";
+        type: InteractionType & "click";
+      };
+      payload: EmptyPayload;
+    };
+    teamMemberInvitedFromShareSpacePopup: {
+      event_name: "team_member_invited";
+      event_source: "cloudhome";
+      event_display_name: "Team Member Invited";
+      interaction: {
+        location: "popup";
+        page: "space";
+        trigger: InteractionTrigger & "user";
+        type: InteractionType & "click";
+      };
+      payload: EmptyPayload;
+    };
   };
 }
 export interface KaiPromptedPayload {
@@ -1219,6 +1301,9 @@ export interface NodeConfigFeedbackPayload {
   rating: number;
   message?: string;
 }
+export interface NodeMigrationRequestedPayload {
+  nodeFactoryId: string;
+}
 export interface NodeExecutionPayload {
   nodes: {
     nodeType: "node" | "component" | "metanode";
@@ -1226,3 +1311,8 @@ export interface NodeExecutionPayload {
   }[];
   total: number;
 }
+export interface ObjectUploadedPayload {
+  uploadedObjects: {
+    [k: string]: number;
+  };
+}

package/src/analytics/schema/schema.json

@@ -58,6 +58,8 @@
         "actionRedoneToolbar",
         "actionRedoneKeyboard",
         "versionCreated",
+        "versionCreatedFromComponentDetails",
+        "versionCreatedFromWorkflowDetails",
         "secretCreatedPersonalSecrets",
         "secretCreatedTeamSecrets",
         "sessionEnded",
@@ -82,6 +84,7 @@
         "nodeCreatedCanvasDragDropFile",
         "nodeCreatedFloatingToolsAddByFile",
         "nodeConfigFeedbackSubmitted",
+        "nodeMigrationRequested",
         "executeAllNodesCtxMenu",
         "executeAllNodesKeyboard",
         "executeAllNodesToolbar",
@@ -112,7 +115,11 @@
         "stepLoopExecutionActionBar",
         "pauseLoopExecutionCtxMenu",
         "resumeLoopExecutionCtxMenu",
-        "stepLoopExecutionCtxMenu"
+        "stepLoopExecutionCtxMenu",
+        "objectUploadedFromSpacePage",
+        "objectUploaded",
+        "teamMemberInvitedFromManageTeamMembersPanel",
+        "teamMemberInvitedFromShareSpacePopup"
       ],
       "properties": {
         "kaiPromptedQA": {
@@ -2292,7 +2299,7 @@
               "properties": {
                 "location": {
                   "type": "string",
-                  "const": "contextual_side_panel"
+                  "const": "main_area"
                 },
                 "page": {
                   "type": "string",
@@ -2630,6 +2637,134 @@
             }
           }
         },
+        "versionCreatedFromComponentDetails": {
+          "type": "object",
+          "additionalProperties": false,
+          "$comment": "Fired when the user clicks the Create button in the version creation side panel on the component details page",
+          "required": [
+            "event_name",
+            "event_source",
+            "event_display_name",
+            "interaction",
+            "payload"
+          ],
+          "properties": {
+            "event_name": {
+              "type": "string",
+              "const": "version_created"
+            },
+            "event_source": {
+              "type": "string",
+              "const": "cloudhome"
+            },
+            "event_display_name": {
+              "type": "string",
+              "const": "Version Created"
+            },
+            "interaction": {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["location", "page", "trigger", "type"],
+              "properties": {
+                "location": {
+                  "type": "string",
+                  "const": "contextual_side_panel"
+                },
+                "page": {
+                  "type": "string",
+                  "const": "component_details"
+                },
+                "trigger": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionTrigger"
+                    },
+                    {
+                      "const": "user"
+                    }
+                  ]
+                },
+                "type": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionType"
+                    },
+                    {
+                      "const": "click"
+                    }
+                  ]
+                }
+              }
+            },
+            "payload": {
+              "$ref": "#/definitions/EmptyPayload"
+            }
+          }
+        },
+        "versionCreatedFromWorkflowDetails": {
+          "type": "object",
+          "additionalProperties": false,
+          "$comment": "Fired when the user clicks the Create button in the version creation side panel on the workflow details page",
+          "required": [
+            "event_name",
+            "event_source",
+            "event_display_name",
+            "interaction",
+            "payload"
+          ],
+          "properties": {
+            "event_name": {
+              "type": "string",
+              "const": "version_created"
+            },
+            "event_source": {
+              "type": "string",
+              "const": "cloudhome"
+            },
+            "event_display_name": {
+              "type": "string",
+              "const": "Version Created"
+            },
+            "interaction": {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["location", "page", "trigger", "type"],
+              "properties": {
+                "location": {
+                  "type": "string",
+                  "const": "contextual_side_panel"
+                },
+                "page": {
+                  "type": "string",
+                  "const": "workflow_details"
+                },
+                "trigger": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionTrigger"
+                    },
+                    {
+                      "const": "user"
+                    }
+                  ]
+                },
+                "type": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionType"
+                    },
+                    {
+                      "const": "click"
+                    }
+                  ]
+                }
+              }
+            },
+            "payload": {
+              "$ref": "#/definitions/EmptyPayload"
+            }
+          }
+        },
         "secretCreatedTeamSecrets": {
           "type": "object",
           "additionalProperties": false,
@@ -4154,6 +4289,66 @@
             }
           }
         },
+        "nodeMigrationRequested": {
+          "type": "object",
+          "additionalProperties": false,
+          "$comment": "Fired when the user requests the migration of a node's auto-generated dialog to a modern dialog",
+          "required": [
+            "event_name",
+            "event_source",
+            "event_display_name",
+            "interaction",
+            "payload"
+          ],
+          "properties": {
+            "event_name": {
+              "type": "string",
+              "const": "node_migration_requested"
+            },
+            "event_source": {
+              "type": "string",
+              "const": "editor"
+            },
+            "event_display_name": {
+              "type": "string",
+              "const": "Node Migration Requested"
+            },
+            "interaction": {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["location", "trigger", "type"],
+              "properties": {
+                "location": {
+                  "type": "string",
+                  "const": "node_configuration"
+                },
+                "trigger": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionTrigger"
+                    },
+                    {
+                      "const": "user"
+                    }
+                  ]
+                },
+                "type": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionType"
+                    },
+                    {
+                      "const": "click"
+                    }
+                  ]
+                }
+              }
+            },
+            "payload": {
+              "$ref": "#/definitions/NodeMigrationRequestedPayload"
+            }
+          }
+        },
         "executeAllNodesCtxMenu": {
           "type": "object",
           "additionalProperties": false,
@@ -6073,6 +6268,258 @@
               "$ref": "#/definitions/SingleNodeExecutionPayload"
             }
           }
+        },
+        "objectUploadedFromSpacePage": {
+          "type": "object",
+          "additionalProperties": false,
+          "$comment": "Fired when the user uploads items via the upload button in the main area on the space page",
+          "required": [
+            "event_name",
+            "event_source",
+            "event_display_name",
+            "interaction",
+            "payload"
+          ],
+          "properties": {
+            "event_name": {
+              "type": "string",
+              "const": "object_uploaded"
+            },
+            "event_source": {
+              "type": "string",
+              "const": "cloudhome"
+            },
+            "event_display_name": {
+              "type": "string",
+              "const": "Object Uploaded"
+            },
+            "interaction": {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["location", "page", "trigger", "type"],
+              "properties": {
+                "location": {
+                  "type": "string",
+                  "const": "main_area"
+                },
+                "page": {
+                  "type": "string",
+                  "const": "space"
+                },
+                "trigger": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionTrigger"
+                    },
+                    {
+                      "const": "user"
+                    }
+                  ]
+                },
+                "type": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionType"
+                    },
+                    {
+                      "const": "click"
+                    }
+                  ]
+                }
+              }
+            },
+            "payload": {
+              "$ref": "#/definitions/ObjectUploadedPayload"
+            }
+          }
+        },
+        "objectUploaded": {
+          "type": "object",
+          "additionalProperties": false,
+          "$comment": "Fired when the user uploads items via the upload button in the space explorer",
+          "required": [
+            "event_name",
+            "event_source",
+            "event_display_name",
+            "interaction",
+            "payload"
+          ],
+          "properties": {
+            "event_name": {
+              "type": "string",
+              "const": "object_uploaded"
+            },
+            "event_source": {
+              "type": "string",
+              "const": "editor"
+            },
+            "event_display_name": {
+              "type": "string",
+              "const": "Object Uploaded"
+            },
+            "interaction": {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["location", "trigger", "type"],
+              "properties": {
+                "location": {
+                  "type": "string",
+                  "const": "space_explorer"
+                },
+                "trigger": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionTrigger"
+                    },
+                    {
+                      "const": "user"
+                    }
+                  ]
+                },
+                "type": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionType"
+                    },
+                    {
+                      "const": "click"
+                    }
+                  ]
+                }
+              }
+            },
+            "payload": {
+              "$ref": "#/definitions/ObjectUploadedPayload"
+            }
+          }
+        },
+        "teamMemberInvitedFromManageTeamMembersPanel": {
+          "type": "object",
+          "additionalProperties": false,
+          "$comment": "Fired when the user invites a team member via the manage team members popup on the spaces page",
+          "required": [
+            "event_name",
+            "event_source",
+            "event_display_name",
+            "interaction",
+            "payload"
+          ],
+          "properties": {
+            "event_name": {
+              "type": "string",
+              "const": "team_member_invited"
+            },
+            "event_source": {
+              "type": "string",
+              "const": "cloudhome"
+            },
+            "event_display_name": {
+              "type": "string",
+              "const": "Team Member Invited"
+            },
+            "interaction": {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["location", "page", "trigger", "type"],
+              "properties": {
+                "location": {
+                  "type": "string",
+                  "const": "popup"
+                },
+                "page": {
+                  "type": "string",
+                  "const": "spaces"
+                },
+                "trigger": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionTrigger"
+                    },
+                    {
+                      "const": "user"
+                    }
+                  ]
+                },
+                "type": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionType"
+                    },
+                    {
+                      "const": "click"
+                    }
+                  ]
+                }
+              }
+            },
+            "payload": {
+              "$ref": "#/definitions/EmptyPayload"
+            }
+          }
+        },
+        "teamMemberInvitedFromShareSpacePopup": {
+          "type": "object",
+          "additionalProperties": false,
+          "$comment": "Fired when the user invites a team member via the share space popup on the space page",
+          "required": [
+            "event_name",
+            "event_source",
+            "event_display_name",
+            "interaction",
+            "payload"
+          ],
+          "properties": {
+            "event_name": {
+              "type": "string",
+              "const": "team_member_invited"
+            },
+            "event_source": {
+              "type": "string",
+              "const": "cloudhome"
+            },
+            "event_display_name": {
+              "type": "string",
+              "const": "Team Member Invited"
+            },
+            "interaction": {
+              "type": "object",
+              "additionalProperties": false,
+              "required": ["location", "page", "trigger", "type"],
+              "properties": {
+                "location": {
+                  "type": "string",
+                  "const": "popup"
+                },
+                "page": {
+                  "type": "string",
+                  "const": "space"
+                },
+                "trigger": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionTrigger"
+                    },
+                    {
+                      "const": "user"
+                    }
+                  ]
+                },
+                "type": {
+                  "allOf": [
+                    {
+                      "$ref": "#/definitions/InteractionType"
+                    },
+                    {
+                      "const": "click"
+                    }
+                  ]
+                }
+              }
+            },
+            "payload": {
+              "$ref": "#/definitions/EmptyPayload"
+            }
+          }
         }
       }
     }
@@ -6428,6 +6875,16 @@
         }
       }
     },
+    "NodeMigrationRequestedPayload": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["nodeFactoryId"],
+      "properties": {
+        "nodeFactoryId": {
+          "type": "string"
+        }
+      }
+    },
     "NodeExecutionPayload": {
       "type": "object",
       "additionalProperties": false,
@@ -6468,6 +6925,19 @@
           "type": "string"
         }
       }
+    },
+    "ObjectUploadedPayload": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["uploadedObjects"],
+      "properties": {
+        "uploadedObjects": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "integer"
+          }
+        }
+      }
     }
   }
 }