Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Add message for readonly nodes. Improve foreign credentials handling #4759

Merged
merged 2 commits into from
Dec 6, 2022
Merged

feat: Add message for readonly nodes. Improve foreign credentials handling #4759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c355211
feat: Add message for readonly nodes. Improve foreign credentials han…
alexgrozav Nov 29, 2022
16d539f
Copy fix
joaoramos Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/design-system/src/components/N8nUserSelect/UserSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default mixins(Locale).extend({
},
size: {
type: String,
validator: (value: string): boolean => ['mini', 'small', 'large'].includes(value),
validator: (value: string): boolean => ['mini', 'small', 'medium', 'large'].includes(value),
},
},
data() {
Expand Down
5 changes: 3 additions & 2 deletions packages/editor-ui/src/components/NodeDetailsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,10 @@
:dragging="isDragging"
:sessionId="sessionId"
:nodeType="activeNodeType"
:isReadOnly="readOnly || hasForeignCredential"
:hasForeignCredential="hasForeignCredential"
:readOnly="readOnly"
:blockUI="blockUi && showTriggerPanel"
:executable="!readOnly || hasForeignCredential"
:executable="!readOnly"
@valueChanged="valueChanged"
@execute="onNodeExecute"
@stopExecution="onStopExecution"
Expand Down
19 changes: 17 additions & 2 deletions packages/editor-ui/src/components/NodeSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
:isReadOnly="isReadOnly"
@input="nameChanged"
></NodeTitle>
<div v-if="executable">
<div v-if="isExecutable">
<NodeExecuteButton
v-if="!blockUI"
:nodeName="node.name"
Expand Down Expand Up @@ -71,6 +71,10 @@
data-test-id="node-parameters"
v-if="node && nodeValid"
>
<n8n-notice
v-if="hasForeignCredential"
:content="$locale.baseText('nodeSettings.hasForeignCredential')"
/>
<div v-show="openPanel === 'params'">
<node-webhooks :node="node" :nodeType="nodeType" />

Expand Down Expand Up @@ -183,6 +187,12 @@ export default mixins(externalHooks, nodeHelpers).extend({
isCurlImportModalOpen(): boolean {
return this.uiStore.isModalOpen(IMPORT_CURL_MODAL_KEY);
},
isReadOnly(): boolean {
return this.readOnly || this.hasForeignCredential;
},
isExecutable(): boolean {
return this.executable || this.hasForeignCredential;
},
nodeTypeName(): string {
if (this.nodeType) {
const shortNodeType = this.$locale.shortNodeType(this.nodeType.name);
Expand Down Expand Up @@ -257,8 +267,13 @@ export default mixins(externalHooks, nodeHelpers).extend({
nodeType: {
type: Object as PropType<INodeTypeDescription>,
},
isReadOnly: {
readOnly: {
type: Boolean,
default: false,
},
hasForeignCredential: {
type: Boolean,
default: false,
},
blockUI: {
type: Boolean,
Expand Down
1 change: 1 addition & 0 deletions packages/editor-ui/src/plugins/i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,7 @@
"nodeSettings.useTheHttpRequestNode": "Use the <b>HTTP Request</b> node to make a custom API call. We'll take care of the {nodeTypeDisplayName} auth for you. <a target=\"_blank\" href=\"https://docs.n8n.io/integrations/custom-operations/\">Learn more</a>",
"nodeSettings.waitBetweenTries.description": "How long to wait between each attempt (in milliseconds)",
"nodeSettings.waitBetweenTries.displayName": "Wait Between Tries (ms)",
"nodeSettings.hasForeignCredential": "This node is working as expected, but you can't edit it since its credentials aren't shared with you. To edit this node, please ask the owner of the workflow to share the credentials with you. Alternatively, you can also duplicate this node in the workflow and add your own credentials.",
"nodeView.addNode": "Add node",
"nodeView.addATriggerNodeFirst": "Add a <a data-action='showNodeCreator'>Trigger Node</a> first",
"nodeView.addOrEnableTriggerNode": "<a data-action='showNodeCreator'>Add</a> or enable a Trigger node to execute the workflow",
Expand Down