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

Custom space avatar images #45148

Merged
merged 20 commits into from
Sep 18, 2019
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
3 changes: 2 additions & 1 deletion docs/api/spaces-management/get.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ The API returns the following:
"description" : "This is the Marketing Space",
"color": "#aabbcc",
"initials": "MK",
"disabledFeatures": []
"disabledFeatures": [],
"imageUrl": ""
}
--------------------------------------------------
5 changes: 4 additions & 1 deletion docs/api/spaces-management/get_all.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ The API returns the following:
"name": "Default",
"description" : "This is the Default Space",
"disabledFeatures": [],
"imageUrl": "",
"_reserved": true
},
{
Expand All @@ -40,13 +41,15 @@ The API returns the following:
"description" : "This is the Marketing Space",
"color": "#aabbcc",
"disabledFeatures": ["apm"],
"initials": "MK"
"initials": "MK",
"imageUrl": "data:image/png;base64,iVBORw0KGgoAAAANSU",
},
{
"id": "sales",
"name": "Sales",
"initials": "MK",
"disabledFeatures": ["discover", "timelion"],
"imageUrl": ""
},
]
--------------------------------------------------
7 changes: 6 additions & 1 deletion docs/api/spaces-management/post.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ experimental[This functionality is *experimental* and may be changed or removed

`color`::
(Optional, string) Specifies the hexadecimal color code used in the space avatar. By default, the color is automatically generated from the space name.

`imageUrl`::
(Optional, string) Specifies the data-url encoded image to display in the space avatar. If specified, `initials` will not be displayed, and the `color` will be visible as the background color for transparent images.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

url should be URL

I've been changing every If specified to When specified, but totally up to you if it makes sense to change here.

To make the second sentence active, I would change it to "...initials are not displayed, and the color is visible as the background color for transparent images."

For best results, your image should be 64x64. Images will not be optimized by this API call, so care should be taken when using custom images.

[[spaces-api-post-response-codes]]
==== Response codes
Expand All @@ -52,7 +56,8 @@ POST /api/spaces/space
"description" : "This is the Marketing Space",
"color": "#aabbcc",
"initials": "MK",
"disabledFeatures": ["timelion"]
"disabledFeatures": ["timelion"],
"imageUrl": "data:image/png;base64,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"
}
--------------------------------------------------
// KIBANA
7 changes: 6 additions & 1 deletion docs/api/spaces-management/put.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ experimental[This functionality is *experimental* and may be changed or removed
`color`::
(Optional, string) Specifies the hexadecimal color code used in the space avatar. By default, the color is automatically generated from the space name.

`imageUrl`::
(Optional, string) Specifies the data-url encoded image to display in the space avatar. If specified, `initials` will not be displayed, and the `color` will be visible as the background color for transparent images.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

url should be URL

I've been changing every If specified to When specified, but totally up to you if it makes sense to change here.

To make the second sentence active, I would change it to "...initials are not displayed, and the color is visible as the background color for transparent images."

For best results, your image should be 64x64. Images will not be optimized by this API call, so care should be taken when using custom images.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make the second sentence active, I would change it to "Images are not optimized by this API call."

Could we specify what "so care should be taken when using custom images" means? Or maybe change it to "Images are not optimized by this API call. Use custom images sparingly."

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we specify what "so care should be taken when using custom images" means? Or maybe change it to "Images are not optimized by this API call. Use custom images sparingly."

How about something like this?
"Images are not optimized by this API call. Consider using the Spaces Management UI to have your images properly resized for efficient storage and display."


[[spaces-api-put-response-codes]]
==== Response codes

Expand All @@ -52,7 +56,8 @@ PUT /api/spaces/space/marketing
"description" : "This is the Marketing Space",
"color": "#aabbcc",
"initials": "MK",
"disabledFeatures": []
"disabledFeatures": [],
"imageUrl": ""
}
--------------------------------------------------
// KIBANA
25 changes: 25 additions & 0 deletions x-pack/legacy/plugins/spaces/common/lib/dataurl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

import { fromByteArray } from 'base64-js';

export const imageTypes = ['image/svg+xml', 'image/jpeg', 'image/png', 'image/gif'];

export function encode(data: any | null, type = 'text/plain') {
// use FileReader if it's available, like in the browser
if (FileReader) {
return new Promise<string>((resolve, reject) => {
const reader = new FileReader();
reader.onloadend = () => resolve(reader.result as string);
reader.onerror = err => reject(err);
reader.readAsDataURL(data);
});
}

// otherwise fall back to fromByteArray
// note: Buffer doesn't seem to correctly base64 encode binary data
return Promise.resolve(`data:${type};base64,${fromByteArray(data)}`);
friol marked this conversation as resolved.
Show resolved Hide resolved
}
1 change: 1 addition & 0 deletions x-pack/legacy/plugins/spaces/common/model/space.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ export interface Space {
initials?: string;
disabledFeatures: string[];
_reserved?: boolean;
imageUrl?: string;
}
15 changes: 15 additions & 0 deletions x-pack/legacy/plugins/spaces/common/space_attributes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,18 @@ export function getSpaceInitials(space: Partial<Space> = {}) {

return words.map(word => word.substring(0, 1)).join('');
}

/**
* Determines the avatar image for the provided space.
*
* @param {Space} space
*/
export function getSpaceImageUrl(space: Partial<Space> = {}) {
const { imageUrl } = space;

if (imageUrl) {
return imageUrl;
}

return '';
}
4 changes: 4 additions & 0 deletions x-pack/legacy/plugins/spaces/mappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
"disabledFeatures": {
"type": "keyword"
},
"imageUrl": {
"type": "text",
"index": false
},
"_reserved": {
"type": "boolean"
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { EuiAvatar, isValidHex } from '@elastic/eui';
import React, { SFC } from 'react';
import { getSpaceColor, getSpaceInitials, MAX_SPACE_INITIALS } from '../../common';
import { Space } from '../../common/model/space';
import { getSpaceImageUrl } from '../../common/space_attributes';

interface Props {
space: Partial<Space>;
Expand Down Expand Up @@ -37,6 +38,7 @@ export const SpaceAvatar: SFC<Props> = (props: Props) => {
initialsLength={MAX_SPACE_INITIALS}
initials={getSpaceInitials(space)}
color={isValidHex(spaceColor) ? spaceColor : ''}
imageUrl={getSpaceImageUrl(space)}
{...rest}
/>
);
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,22 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { EuiColorPicker, EuiFieldText, EuiSpacer, EuiFormRow, isValidHex } from '@elastic/eui';
import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
import React, { ChangeEvent, Component } from 'react';
import {
EuiColorPicker,
EuiFieldText,
EuiFlexItem,
EuiFormRow,
// @ts-ignore (elastic/eui#1262) EuiFilePicker is not exported yet
friol marked this conversation as resolved.
Show resolved Hide resolved
EuiFilePicker,
EuiButton,
EuiSpacer,
isValidHex,
} from '@elastic/eui';
import { InjectedIntl, injectI18n } from '@kbn/i18n/react';

import { encode, imageTypes } from '../../../../../common/lib/dataurl';

import { MAX_SPACE_INITIALS } from '../../../../../common/constants';
import { Space } from '../../../../../common/model/space';
import { getSpaceColor, getSpaceInitials } from '../../../../../common/space_attributes';
Expand All @@ -32,6 +45,63 @@ class CustomizeSpaceAvatarUI extends Component<Props, State> {
};
}

private storeImageChanges(imageUrl: string) {
this.props.onChange({
...this.props.space,
imageUrl,
});
}

//
// images below 64x64 pixels are left untouched
// images above that threshold are resized
//

private handleImageUpload = (imgUrl: string) => {
const thisInstance = this;
const image = new Image();
image.addEventListener(
'load',
function() {
const MAX_IMAGE_SIZE = 64;
const imgDimx = image.width;
const imgDimy = image.height;
if (imgDimx <= MAX_IMAGE_SIZE && imgDimy <= MAX_IMAGE_SIZE) {
thisInstance.storeImageChanges(imgUrl);
} else {
const imageCanvas = document.createElement('canvas');
const canvasContext = imageCanvas.getContext('2d');
if (imgDimx >= imgDimy) {
imageCanvas.width = MAX_IMAGE_SIZE;
imageCanvas.height = Math.floor((imgDimy * MAX_IMAGE_SIZE) / imgDimx);
if (canvasContext) {
canvasContext.drawImage(image, 0, 0, imageCanvas.width, imageCanvas.height);
const resizedImageUrl = imageCanvas.toDataURL();
thisInstance.storeImageChanges(resizedImageUrl);
}
} else {
imageCanvas.height = MAX_IMAGE_SIZE;
imageCanvas.width = Math.floor((imgDimx * MAX_IMAGE_SIZE) / imgDimy);
if (canvasContext) {
canvasContext.drawImage(image, 0, 0, imageCanvas.width, imageCanvas.height);
const resizedImageUrl = imageCanvas.toDataURL();
thisInstance.storeImageChanges(resizedImageUrl);
}
}
}
},
false
);
image.src = imgUrl;
};

private onFileUpload = (files: File[]) => {
const [file] = files;
if (imageTypes.indexOf(file.type) > -1) {
encode(file).then((dataurl: string) => this.handleImageUpload(dataurl));
}
};

public render() {
const { space, intl } = this.props;

Expand All @@ -55,6 +125,7 @@ class CustomizeSpaceAvatarUI extends Component<Props, State> {
// without defaulting to the derived initials provided by `getSpaceInitials`
value={initialsHasFocus ? pendingInitials || '' : getSpaceInitials(space)}
onChange={this.onInitialsChange}
disabled={this.props.space.imageUrl && this.props.space.imageUrl !== '' ? true : false}
/>
</EuiFormRow>
<EuiSpacer size="m" />
friol marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -71,10 +142,55 @@ class CustomizeSpaceAvatarUI extends Component<Props, State> {
isInvalid={isInvalidSpaceColor}
/>
</EuiFormRow>
<EuiSpacer size="m" />
{this.filePickerOrImage()}
</form>
);
}

private removeImageUrl() {
this.props.onChange({
...this.props.space,
imageUrl: '',
});
}

public filePickerOrImage() {
const { intl } = this.props;

if (!this.props.space.imageUrl) {
return (
<EuiFormRow
label={intl.formatMessage({
id: 'xpack.spaces.management.customizeSpaceAvatar.imageUrl',
defaultMessage: 'Custom image',
})}
>
<EuiFilePicker
display="default"
initialPromptText={intl.formatMessage({
id: 'xpack.spaces.management.customizeSpaceAvatar.selectImageUrl',
defaultMessage: 'Select image file',
})}
onChange={this.onFileUpload}
accept={imageTypes}
/>
</EuiFormRow>
);
} else {
return (
<EuiFlexItem grow={true}>
<EuiButton onClick={() => this.removeImageUrl()} color="danger" iconType="trash">
{intl.formatMessage({
id: 'xpack.spaces.management.customizeSpaceAvatar.removeImage',
defaultMessage: 'Remove custom image',
})}
</EuiButton>
</EuiFlexItem>
);
}
}

public initialsInputRef = (ref: HTMLInputElement) => {
if (ref) {
this.initialsRef = ref;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@ class ManageSpacePageUI extends Component<Props, State> {
initials,
color,
disabledFeatures = [],
imageUrl,
} = this.state.space;

const params = {
Expand All @@ -343,6 +344,7 @@ class ManageSpacePageUI extends Component<Props, State> {
initials,
color,
disabledFeatures,
imageUrl,
};

let action;
Expand Down
Loading