mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-18 18:41:14 +00:00
Merge remote-tracking branch 'origin/master' into release/1.0.1
This commit is contained in:
@@ -54,7 +54,7 @@
|
||||
@run="onNodeRun"
|
||||
:key="`${nodeData.id}_node`"
|
||||
:name="nodeData.name"
|
||||
:isReadOnly="isReadOnly || readOnlyEnv"
|
||||
:isReadOnly="isReadOnlyRoute || readOnlyEnv"
|
||||
:instance="instance"
|
||||
:isActive="!!activeNode && activeNode.name === nodeData.name"
|
||||
:hideActions="pullConnActive"
|
||||
@@ -76,7 +76,7 @@
|
||||
@removeNode="(name) => removeNode(name, true)"
|
||||
:key="`${nodeData.id}_sticky`"
|
||||
:name="nodeData.name"
|
||||
:isReadOnly="isReadOnly || readOnlyEnv"
|
||||
:isReadOnly="isReadOnlyRoute || readOnlyEnv"
|
||||
:instance="instance"
|
||||
:isActive="!!activeNode && activeNode.name === nodeData.name"
|
||||
:nodeViewScale="nodeViewScale"
|
||||
@@ -87,7 +87,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<node-details-view
|
||||
:readOnly="isReadOnly || readOnlyEnv"
|
||||
:readOnly="isReadOnlyRoute || readOnlyEnv"
|
||||
:renaming="renamingActive"
|
||||
:isProductionExecutionPreview="isProductionExecutionPreview"
|
||||
@valueChanged="valueChanged"
|
||||
@@ -95,14 +95,14 @@
|
||||
@saveKeyboardShortcut="onSaveKeyboardShortcut"
|
||||
/>
|
||||
<node-creation
|
||||
v-if="!isReadOnly && !readOnlyEnv"
|
||||
v-if="!isReadOnlyRoute && !readOnlyEnv"
|
||||
:create-node-active="createNodeActive"
|
||||
:node-view-scale="nodeViewScale"
|
||||
@toggleNodeCreator="onToggleNodeCreator"
|
||||
@addNode="onAddNode"
|
||||
/>
|
||||
<canvas-controls />
|
||||
<div class="workflow-execute-wrapper" v-if="!isReadOnly">
|
||||
<div class="workflow-execute-wrapper" v-if="!isReadOnlyRoute">
|
||||
<span
|
||||
@mouseenter="showTriggerMissingToltip(true)"
|
||||
@mouseleave="showTriggerMissingToltip(false)"
|
||||
@@ -149,7 +149,7 @@
|
||||
/>
|
||||
|
||||
<n8n-icon-button
|
||||
v-if="!isReadOnly && workflowExecution && !workflowRunning && !allTriggersDisabled"
|
||||
v-if="!isReadOnlyRoute && workflowExecution && !workflowRunning && !allTriggersDisabled"
|
||||
:title="$locale.baseText('nodeView.deletesTheCurrentExecutionData')"
|
||||
icon="trash"
|
||||
size="large"
|
||||
@@ -961,7 +961,7 @@ export default defineComponent({
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
|
||||
if (this.isReadOnly) {
|
||||
if (this.isReadOnlyRoute) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1015,13 +1015,13 @@ export default defineComponent({
|
||||
} else if (e.key === 'Tab') {
|
||||
this.onToggleNodeCreator({
|
||||
source: NODE_CREATOR_OPEN_SOURCES.TAB,
|
||||
createNodeActive: !this.createNodeActive && !this.isReadOnly,
|
||||
createNodeActive: !this.createNodeActive && !this.isReadOnlyRoute,
|
||||
});
|
||||
} else if (e.key === this.controlKeyCode) {
|
||||
this.ctrlKeyPressed = true;
|
||||
} else if (e.key === ' ') {
|
||||
this.moveCanvasKeyPressed = true;
|
||||
} else if (e.key === 'F2' && !this.isReadOnly) {
|
||||
} else if (e.key === 'F2' && !this.isReadOnlyRoute) {
|
||||
const lastSelectedNode = this.lastSelectedNode;
|
||||
if (lastSelectedNode !== null && lastSelectedNode.type !== STICKY_NODE_TYPE) {
|
||||
void this.callDebounced(
|
||||
@@ -1067,7 +1067,7 @@ export default defineComponent({
|
||||
const lastSelectedNode = this.lastSelectedNode;
|
||||
|
||||
if (lastSelectedNode !== null) {
|
||||
if (lastSelectedNode.type === STICKY_NODE_TYPE && this.isReadOnly) {
|
||||
if (lastSelectedNode.type === STICKY_NODE_TYPE && this.isReadOnlyRoute) {
|
||||
return;
|
||||
}
|
||||
this.ndvStore.activeNodeName = lastSelectedNode.name;
|
||||
@@ -1307,7 +1307,7 @@ export default defineComponent({
|
||||
},
|
||||
|
||||
cutSelectedNodes() {
|
||||
const deleteCopiedNodes = !this.isReadOnly;
|
||||
const deleteCopiedNodes = !this.isReadOnlyRoute;
|
||||
this.copySelectedNodes(deleteCopiedNodes);
|
||||
if (deleteCopiedNodes) {
|
||||
this.deleteSelectedNodes();
|
||||
@@ -2162,7 +2162,7 @@ export default defineComponent({
|
||||
if (!this.suspendRecordingDetachedConnections) {
|
||||
this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData));
|
||||
}
|
||||
if (!this.isReadOnly) {
|
||||
if (!this.isReadOnlyRoute) {
|
||||
NodeViewUtils.addConnectionActionsOverlay(
|
||||
info.connection,
|
||||
() => {
|
||||
@@ -2211,7 +2211,7 @@ export default defineComponent({
|
||||
}
|
||||
|
||||
if (
|
||||
this.isReadOnly ||
|
||||
this.isReadOnlyRoute ||
|
||||
this.readOnlyEnv ||
|
||||
this.enterTimer ||
|
||||
!connection ||
|
||||
@@ -2242,7 +2242,7 @@ export default defineComponent({
|
||||
}
|
||||
|
||||
if (
|
||||
this.isReadOnly ||
|
||||
this.isReadOnlyRoute ||
|
||||
this.readOnlyEnv ||
|
||||
!connection ||
|
||||
this.activeConnection?.id !== connection.id
|
||||
@@ -2609,7 +2609,7 @@ export default defineComponent({
|
||||
// Create connections in DOM
|
||||
this.instance?.connect({
|
||||
uuids: uuid,
|
||||
detachable: !this.isReadOnly,
|
||||
detachable: !this.isReadOnlyRoute,
|
||||
});
|
||||
|
||||
setTimeout(() => {
|
||||
|
||||
Reference in New Issue
Block a user