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.

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

feat(ui): add option to add picture link for groups #9882

Merged
merged 16 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.datahub.authorization.DisjunctivePrivilegeGroup;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.linkedin.common.url.Url;
import com.linkedin.common.urn.Urn;
import com.linkedin.common.urn.UrnUtils;
import com.linkedin.data.template.RecordTemplate;
Expand Down Expand Up @@ -232,6 +233,9 @@ private RecordTemplate mapCorpGroupEditableInfo(
if (input.getEmail() != null) {
result.setEmail(input.getEmail());
}
if (input.getPictureLink() != null) {
result.setPictureLink(new Url(input.getPictureLink()));
}
return result;
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package com.linkedin.datahub.graphql.types.corpgroup.mappers;

import com.linkedin.common.url.Url;
import com.linkedin.data.template.GetMode;
import com.linkedin.data.template.RecordTemplate;
import com.linkedin.datahub.graphql.generated.CorpGroupEditableProperties;
import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
import java.util.Objects;
import javax.annotation.Nonnull;

/**
Expand All @@ -29,6 +32,9 @@ public CorpGroupEditableProperties apply(
result.setDescription(corpGroupEditableInfo.getDescription(GetMode.DEFAULT));
result.setSlack(corpGroupEditableInfo.getSlack(GetMode.DEFAULT));
result.setEmail(corpGroupEditableInfo.getEmail(GetMode.DEFAULT));
result.setPictureLink((Objects.requireNonNull(
corpGroupEditableInfo.getPictureLink(GetMode.DEFAULT))).toString());

return result;
}
}
10 changes: 10 additions & 0 deletions datahub-graphql-core/src/main/resources/entity.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -4070,6 +4070,11 @@ type CorpGroupEditableProperties {
Email address for the group
"""
email: String

"""
A URL which points to a picture which user wants to set as a profile photo
"""
pictureLink: String
}

"""
Expand All @@ -4090,6 +4095,11 @@ input CorpGroupUpdateInput {
Email address for the group
"""
email: String

"""
A URL which points to a picture which user wants to set as a profile photo
"""
pictureLink: String
}

"""
Expand Down
1 change: 1 addition & 0 deletions datahub-web-react/src/graphql/group.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ query getGroup($urn: String!, $membersCount: Int!) {
description
slack
email
pictureLink
}
properties {
displayName
Expand Down
63 changes: 31 additions & 32 deletions smoke-test/tests/cypress/cypress/e2e/settings/managing_groups.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,38 +64,37 @@ describe("create and manage group", () => {
});

it("update group info", () => {
var expected_name = Cypress.env('ADMIN_USERNAME');
cy.loginWithCredentials();
cy.visit("/settings/identities/groups");
cy.clickOptionWithText(group_name);
cy.contains(group_name).find('[aria-label="Edit"]').click();
cy.focused().clear().type(`Test group EDITED ${test_id}{enter}`);
cy.waitTextVisible("Name Updated");
cy.contains(`Test group EDITED ${test_id}`).should("be.visible");
cy.get('[data-testid="edit-icon"]').click();
cy.waitTextVisible("Edit Description");
cy.get("#description").should("be.visible").type(" EDITED");
cy.get("#updateGroupButton").click();
cy.waitTextVisible("Changes saved.");
cy.contains("Test group description EDITED").should("be.visible");
cy.clickOptionWithText("Add Owners");
cy.contains("Search for users or groups...").click({ force: true });
cy.focused().type(expected_name);
cy.get(".ant-select-item-option").contains(expected_name, { matchCase: false }).click();
cy.focused().blur();
cy.contains(expected_name, { matchCase: false }).should("have.length", 1);
cy.get('[role="dialog"] button').contains("Done").click();
cy.waitTextVisible("Owners Added");
cy.contains(expected_name, { matchCase: false }).should("be.visible");
cy.clickOptionWithText("Edit Group");
cy.waitTextVisible("Edit Profile");
cy.get("#email").type(`${test_id}@testemail.com`);
cy.get("#slack").type(`#${test_id}`);
cy.clickOptionWithText("Save Changes");
cy.waitTextVisible("Changes saved.");
cy.waitTextVisible(`${test_id}@testemail.com`);
cy.waitTextVisible(`#${test_id}`);
});
cy.loginWithCredentials();
cy.visit("/settings/identities/groups");
cy.clickOptionWithText(group_name);
cy.contains(group_name).find('[aria-label="Edit"]').click();
cy.focused().clear().type(`Test group EDITED ${test_id}{enter}`);
cy.waitTextVisible("Name Updated");
cy.contains(`Test group EDITED ${test_id}`).should("be.visible");
cy.get('[data-testid="edit-icon"]').click();
cy.waitTextVisible("Edit Description");
cy.get("#description").should("be.visible").type(" EDITED");
cy.get("#updateGroupButton").click();
cy.waitTextVisible("Changes saved.");
cy.contains("Test group description EDITED").should("be.visible");
cy.clickOptionWithText("Add Owners");
cy.get('[id="owner"]').click({ force: true });
cy.focused().type(username);
cy.get(".ant-select-item-option").contains(username, { matchCase: false }).click();
cy.focused().blur();
cy.contains(username, { matchCase: false }).should("have.length", 1);
cy.get('[role="dialog"] button').contains("Done").click();
cy.waitTextVisible("Owners Added");
cy.contains(username, { matchCase: false }).should("be.visible");
cy.clickOptionWithText("Edit Group");
cy.waitTextVisible("Edit Profile");
cy.get("#email").type(`${test_id}@testemail.com`);
cy.get("#slack").type(`#${test_id}`);
cy.clickOptionWithText("Save Changes");
cy.waitTextVisible("Changes saved.");
cy.waitTextVisible(`${test_id}@testemail.com`);
cy.waitTextVisible(`#${test_id}`);
});
anshbansal marked this conversation as resolved.
Show resolved Hide resolved

it("test user verify group participation", () => {
cy.loginWithCredentials();
Expand Down
4 changes: 2 additions & 2 deletions smoke-test/tests/cypress/cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ Cypress.Commands.add("loginWithCredentials", (username, password) => {
cy.get('input[data-testid=username]').type(username);
cy.get('input[data-testid=password]').type(password);
} else {
cy.get('input[data-testid=username]').type(Cypress.env('ADMIN_USERNAME'));
cy.get('input[data-testid=password]').type(Cypress.env('ADMIN_PASSWORD'));
cy.get('input[data-testid=username]').type('datahub');
cy.get('input[data-testid=password]').type('datahub');
anshbansal marked this conversation as resolved.
Show resolved Hide resolved
}
cy.contains('Sign In').click();
cy.contains('Welcome back');
Expand Down
Loading
Loading