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(core): Show domain in account preferences #11737

Merged
merged 4 commits into from
Aug 23, 2021
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions src/i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -1044,6 +1044,7 @@
"userProfileButtonConnect": "Connect",
"userProfileButtonIgnore": "Ignore",
"userProfileButtonUnblock": "Unblock",
"userProfileDomain": "Domain",
"userProfileEmail": "Email",
"userRemainingTimeHours": "{{time}}h left",
"userRemainingTimeMinutes": "Less than {{time}}m left",
Expand Down
44 changes: 44 additions & 0 deletions src/script/components/panel/EnrichedFields.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,17 @@ import {RichProfileRepository} from 'src/script/user/RichProfileRepository';
import TestPage from 'Util/test/TestPage';
import {createRandomUuid} from 'Util/util';
import EnrichedFields, {EnrichedFieldsProps} from './EnrichedFields';
import {Config, Configuration} from '../../Config';
import type {TypeUtil} from '@wireapp/commons';

class EnrichedFieldsPage extends TestPage<EnrichedFieldsProps> {
constructor(props?: EnrichedFieldsProps) {
super(EnrichedFields, props);
}

getEntries = () => this.get('[data-uie-name="item-enriched-key"]');
findByValue = (expectedValue: string) =>
this.get(`[data-uie-name="item-enriched-value"][data-uie-value="${expectedValue}"]`);
}

const richInfo: Partial<RichInfo> = {
Expand Down Expand Up @@ -79,6 +83,46 @@ describe('EnrichedFields', () => {
expect(enrichedFields.getEntries().length).toEqual(3);
});

it('displays the domain of a user when the federation feature flag is turned on', async () => {
spyOn<{getConfig: () => TypeUtil.RecursivePartial<Configuration>}>(Config, 'getConfig').and.returnValue({
FEATURE: {
ENABLE_FEDERATION: true,
},
});

const richProfileRepository = createRichProfileRepository();
const domain = 'wire.com';
const user = new User(createRandomUuid(), domain);
const enrichedFields = new EnrichedFieldsPage({richProfileRepository, user});
await act(() =>
waitFor(() => {
expect(richProfileRepository.getUserRichProfile).toHaveBeenCalled();
}),
);
enrichedFields.update();
expect(enrichedFields.findByValue(domain).length).toBe(1);
});

it('does NOT display the domain of a user when the federation feature flag is turned off', async () => {
spyOn<{getConfig: () => TypeUtil.RecursivePartial<Configuration>}>(Config, 'getConfig').and.returnValue({
FEATURE: {
ENABLE_FEDERATION: false,
},
});

const richProfileRepository = createRichProfileRepository();
const domain = 'wire.com';
const user = new User(createRandomUuid(), domain);
const enrichedFields = new EnrichedFieldsPage({richProfileRepository, user});
await act(() =>
waitFor(() => {
expect(richProfileRepository.getUserRichProfile).toHaveBeenCalled();
}),
);
enrichedFields.update();
expect(enrichedFields.findByValue(domain).length).toBe(0);
});

it('calls the `onFieldsLoaded` function when fields are loaded', async () => {
const richProfileRepository = createRichProfileRepository();
const user = new User(createRandomUuid(), null);
Expand Down
12 changes: 11 additions & 1 deletion src/script/components/panel/EnrichedFields.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {noop} from 'Util/util';

import type {User} from '../../entity/User';
import {RichProfileRepository} from '../../user/RichProfileRepository';
import {Config} from '../../Config';

export interface EnrichedFieldsProps {
onFieldsLoaded?: (richFields: RichInfoField[]) => void;
Expand All @@ -47,6 +48,15 @@ const EnrichedFields: React.FC<EnrichedFieldsProps> = ({
let cancel = false;
const returnFields: RichInfoField[] = email ? [{type: t('userProfileEmail'), value: email}] : [];

if (Config.getConfig().FEATURE.ENABLE_FEDERATION) {
if (user.domain) {
returnFields.push({
type: t('userProfileDomain'),
value: user.domain,
});
}
}

const loadRichFields = async () => {
try {
const richProfile = await richProfileRepository.getUserRichProfile(user.id);
Expand Down Expand Up @@ -74,7 +84,7 @@ const EnrichedFields: React.FC<EnrichedFieldsProps> = ({
<div className="enriched-fields__entry__key" data-uie-name="item-enriched-key">
{type}
</div>
<div className="enriched-fields__entry__value" data-uie-name="item-enriched-value">
<div className="enriched-fields__entry__value" data-uie-name="item-enriched-value" data-uie-value={value}>
{value}
</div>
</div>
Expand Down