mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(editor): Only show push to git menu item to owners (#7766)

Browse source 
Removes the menu entry of "Push to Git" from the workflow menu for
non-owners, since they would not be able to push in the first place.
This commit is contained in:
Michael Auerswald 2023-11-21 15:20:15 +01:00 committed by GitHub
parent ff0b6511f7
commit 0d3d33dd1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cypress/e2e/7-workflow-actions.cy.ts
View file

@ -4,6 +4,8 @@ import {
META_KEY, META_KEY,
SCHEDULE_TRIGGER_NODE_NAME, SCHEDULE_TRIGGER_NODE_NAME,
EDIT_FIELDS_SET_NODE_NAME, EDIT_FIELDS_SET_NODE_NAME,
INSTANCE_MEMBERS,
INSTANCE_OWNER,
} from '../constants'; } from '../constants';
import { WorkflowPage as WorkflowPageClass } from '../pages/workflow'; import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows'; import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
@ -276,3 +278,19 @@ describe('Workflow Actions', () => {
WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible'); WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
}); });
}); });
describe('Menu entry Push To Git', () => {
it('should not show up in the menu for members', () => {
cy.signin(INSTANCE_MEMBERS[0]);
cy.visit(WorkflowPages.url);
WorkflowPage.actions.visit();
WorkflowPage.getters.workflowMenuItemGitPush().should('not.exist');
});
it('should show up for owners', () => {
cy.signin(INSTANCE_OWNER);
cy.visit(WorkflowPages.url);
WorkflowPage.actions.visit();
WorkflowPage.getters.workflowMenuItemGitPush().should('exist');
});
});

1
cypress/pages/workflow.ts
View file

@ -71,6 +71,7 @@ export class WorkflowPage extends BasePage {
workflowMenuItemImportFromFile: () => cy.getByTestId('workflow-menu-item-import-from-file'), workflowMenuItemImportFromFile: () => cy.getByTestId('workflow-menu-item-import-from-file'),
workflowMenuItemSettings: () => cy.getByTestId('workflow-menu-item-settings'), workflowMenuItemSettings: () => cy.getByTestId('workflow-menu-item-settings'),
workflowMenuItemDelete: () => cy.getByTestId('workflow-menu-item-delete'), workflowMenuItemDelete: () => cy.getByTestId('workflow-menu-item-delete'),
workflowMenuItemGitPush: () => cy.getByTestId('workflow-menu-item-push'),
// Workflow settings dialog elements // Workflow settings dialog elements
workflowSettingsModal: () => cy.getByTestId('workflow-settings-dialog'), workflowSettingsModal: () => cy.getByTestId('workflow-settings-dialog'),
workflowSettingsErrorWorkflowSelect: () => cy.getByTestId('workflow-settings-error-workflow'), workflowSettingsErrorWorkflowSelect: () => cy.getByTestId('workflow-settings-error-workflow'),

8
packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
View file

@ -241,6 +241,9 @@ export default defineComponent({
currentUser(): IUser | null { currentUser(): IUser | null {
return this.usersStore.currentUser; return this.usersStore.currentUser;
}, },
currentUserIsOwner(): boolean {
return this.usersStore.currentUser?.isOwner ?? false;
},
contextBasedTranslationKeys(): NestedRecord<string> { contextBasedTranslationKeys(): NestedRecord<string> {
return this.uiStore.contextBasedTranslationKeys; return this.uiStore.contextBasedTranslationKeys;
}, },
@ -321,6 +324,7 @@ export default defineComponent({
); );
} }
if (this.currentUserIsOwner) {
actions.push({ actions.push({
id: WORKFLOW_MENU_ACTIONS.PUSH, id: WORKFLOW_MENU_ACTIONS.PUSH,
label: this.$locale.baseText('menuActions.push'), label: this.$locale.baseText('menuActions.push'),
@ -328,8 +332,10 @@ export default defineComponent({
!this.sourceControlStore.isEnterpriseSourceControlEnabled || !this.sourceControlStore.isEnterpriseSourceControlEnabled ||
!this.onWorkflowPage || !this.onWorkflowPage ||
this.onExecutionsTab || this.onExecutionsTab ||
this.readOnlyEnv, this.readOnlyEnv ||
!this.currentUserIsOwner,
}); });
}
actions.push({ actions.push({
id: WORKFLOW_MENU_ACTIONS.SETTINGS, id: WORKFLOW_MENU_ACTIONS.SETTINGS,