Merge pull request stakwork#561 from stakwork/feat/feature_priority_r…

…edesign

This PR adds Roles Check To WorkspaceMission & WorkspaceFeature

cypress/e2e/17_createWorkspaceUser.cy.ts

@@ -14,7 +14,7 @@ describe('Add User to Workspace', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();

cypress/e2e/18_withdrawWorkspaceBudget.cy.ts

@@ -15,7 +15,7 @@ describe('It Withdraws from Workspace budget', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
 
     const depositAmount = 10000;
     const withdrawAmount = 2000;

cypress/e2e/19_manageUserRoles.cy.ts

@@ -14,7 +14,7 @@ describe('Alice Create an Workspace and then manage user roles', () => {
     cy.create_workspace(workSpace);
     cy.wait(1000);
 
-    cy.contains(workSpace.name).contains('Manage').click();
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();

cypress/e2e/20_deleteWorkspaceUser.cy.ts

@@ -17,7 +17,7 @@ describe('Delete User from a Workspace', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();

cypress/e2e/22_viewOrgBountiesFromWorkspace.cy.ts

@@ -40,7 +40,7 @@ describe('User creates a bounties attached to an workspace', () => {
     cy.contains(workspace.loggedInAs).click();
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('a[href*="/workspace/bounties"]').then(($link: JQuery<HTMLElement>) => {

cypress/e2e/23_editWorkspaceDetails.cy.ts

@@ -22,7 +22,7 @@ describe('Edit Workspace Details', () => {
   });
 
   it('should edit workspace details successfully', () => {
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains(/^Edit$/).click();

cypress/e2e/29_paymentHistory.cy.ts

@@ -18,7 +18,7 @@ describe('It Lists all payments in history', () => {
     cy.create_workspace(workSpace);
     cy.wait(1000);
 
-    cy.contains(workSpace.name).contains('Manage').click();
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     const depositAmount = 10000;
@@ -111,7 +111,7 @@ describe('It Lists all payments in history', () => {
     cy.contains(activeUser).click();
     cy.wait(1000);
 
-    cy.contains(workSpace.name).contains('Manage').click();
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('History').click({ force: true });

cypress/e2e/39_rolesViewHistory.cy.ts

@@ -1,7 +1,7 @@
 describe('View Transaction History', () => {
   const workSpace = {
     loggedInAs: 'alice',
-    name: 'SyedWorkspaceZ',
+    name: 'SyedWorkspace3',
     description: 'We are testing out our workspace',
     website: '',
     github: ''
@@ -14,7 +14,7 @@ describe('View Transaction History', () => {
     cy.create_workspace(workSpace);
     cy.wait(1000);
 
-    cy.contains(workSpace.name).contains('Manage').click();
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();
@@ -55,7 +55,7 @@ describe('View Transaction History', () => {
     cy.contains(workSpace.name).should('exist');
     cy.wait(1000);
 
-    cy.contains(workSpace.name).contains('Manage').click();
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('History').should('not.be.disabled');

cypress/e2e/40_rolesupdateMembers.cy.ts

@@ -16,7 +16,7 @@ describe('filter by status for workspace bounty', () => {
     cy.create_workspace(workSpace);
     cy.wait(1000);
 
-    cy.contains(workSpace.name).contains('Manage').click();
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();
@@ -56,7 +56,7 @@ describe('filter by status for workspace bounty', () => {
     cy.contains('carol').click({ force: true });
     cy.wait(1000);
 
-    cy.contains(WorkSpaceName).contains('Manage').click({ force: true });
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();

cypress/e2e/41_rolesManageWorkspace.cy.ts

@@ -1,6 +1,6 @@
 describe('matches workspace description with Carol updated description', () => {
   it('should matches workspace description with Carol updated description', () => {
-    const WorkSpaceName = 'Update Description';
+    const WorkSpaceName = 'Update Description1';
 
     const workSpace: Cypress.Workspace = {
       loggedInAs: 'alice',
@@ -18,7 +18,7 @@ describe('matches workspace description with Carol updated description', () => {
     cy.create_workspace(workSpace);
     cy.wait(1000);
 
-    cy.contains(workSpace.name).contains('Manage').click();
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();
@@ -59,7 +59,7 @@ describe('matches workspace description with Carol updated description', () => {
     cy.contains('carol').click({ force: true });
     cy.wait(1000);
 
-    cy.contains(WorkSpaceName).contains('Manage').click({ force: true });
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains(/^Edit$/).click();
@@ -91,7 +91,7 @@ describe('matches workspace description with Carol updated description', () => {
     cy.contains(workSpace.loggedInAs).click({ force: true });
     cy.wait(1000);
 
-    cy.contains(WorkSpaceName).contains('Manage').click({ force: true });
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains(/^Edit$/).click();

cypress/e2e/42_rolesWithdrawWorkspace.cy.ts

@@ -23,7 +23,7 @@ describe('Withdraw From Workspace Role Test', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();
@@ -70,7 +70,7 @@ describe('Withdraw From Workspace Role Test', () => {
     cy.contains(workspace.name).should('exist').and('be.visible');
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     //Assert that the Withdraw button is not disabled

cypress/e2e/43_rolesFundWorkspace.cy.ts

@@ -23,7 +23,7 @@ describe('Fund Workspace Role Test', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();
@@ -70,7 +70,7 @@ describe('Fund Workspace Role Test', () => {
     cy.contains(workspace.name).should('exist').and('be.visible');
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     //Assert that the Deposit button is not disabled

cypress/e2e/44_rolesManageBounties.cy.ts

@@ -30,7 +30,7 @@ describe('carol manage workspace bounties', () => {
     cy.create_workspace(workSpace);
     cy.wait(1000);
 
-    cy.contains(workSpace.name).contains('Manage').click();
+    cy.contains(workSpace.name).get(`[data-work-name="${workSpace.name}"]`).click();
     cy.wait(1000);
 
     cy.contains('Add User').click();
@@ -65,7 +65,10 @@ describe('carol manage workspace bounties', () => {
     cy.contains('carol').click({ force: true });
     cy.wait(1000);
 
-    cy.contains(WorkSpaceName).contains('Manage').should('exist');
+    cy.contains(WorkSpaceName)
+      .get(`[data-work-name="${workSpace.name}"]`)
+      .contains('Manage')
+      .should('exist');
     cy.wait(1000);
 
     cy.create_bounty(bounty);

cypress/e2e/53_workspaceMission.cy.ts

@@ -16,7 +16,7 @@ describe('Create Workspace And Update Mission', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('[data-testid="mission-link"]')

cypress/e2e/54_addFeature.cy.ts

@@ -16,7 +16,7 @@ describe('Add feature To Workspace', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('[data-testid="mission-link"]')

cypress/e2e/55_updateFeature.cy.ts

@@ -16,7 +16,7 @@ describe('Update feature To Workspace', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('[data-testid="mission-link"]')

cypress/e2e/56_briefUpdateFeature.cy.ts

@@ -16,7 +16,7 @@ describe('Update feature To Workspace', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('[data-testid="mission-link"]')

cypress/e2e/57_workspaceRequirementFeatureUpdate.cy.ts

@@ -16,7 +16,7 @@ describe('Update Requirements in Workspace Feature', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('[data-testid="mission-link"]')

cypress/e2e/58_addUserStoriesToFeature.cy.ts

@@ -16,7 +16,7 @@ describe('Add user stories to features', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('[data-testid="mission-link"]')

cypress/e2e/58_updateWorkspaceSchematic.cy.ts

@@ -16,7 +16,7 @@ describe('Updating Workspace schematic', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('[data-testid="mission-link"]')

cypress/e2e/59_updateWorkspaceFeaturePhase.cy.ts

@@ -16,7 +16,7 @@ describe('Workspace Phasing Feature Tests', () => {
     cy.create_workspace(workspace);
     cy.wait(3000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('[data-testid="mission-link"]')

cypress/e2e/60_addPeopleToWorkspaceMission.cy.ts

@@ -16,7 +16,7 @@ describe('Create Workspace And Update People On Mission', () => {
     cy.create_workspace(workspace);
     cy.wait(1000);
 
-    cy.contains(workspace.name).contains('Manage').click();
+    cy.contains(workspace.name).get(`[data-work-name="${workspace.name}"]`).click();
     cy.wait(1000);
 
     cy.get('[data-testid="mission-link"]')

src/pages/tickets/style.ts

@@ -72,6 +72,10 @@ export const DataWrap = styled.div`
   margin: 0 auto;
   align-items: left;
   justify-content: center;
+  padding-bottom: 0px;
+  background: #fff;
+  margintop: 20px;
+  border-radius: 6px;
 
   @media only screen and (max-width: 900px) {
     width: 90%;