Skip to content

Commit

Permalink
[Purify] remove upsells and branding from pre-fork (#391)
Browse files Browse the repository at this point in the history
Left-over upsells and branding that were missed in previous
updates since they are not easy to catch.

Issues:
#359
#388
#384

Signed-off-by: Kawika Avilla <[email protected]>
  • Loading branch information
kavilla committed Jun 3, 2021
1 parent 3fcc697 commit 743d923
Show file tree
Hide file tree
Showing 14 changed files with 52 additions and 403 deletions.
2 changes: 1 addition & 1 deletion src/core/server/rendering/views/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export const Styles: FunctionComponent<Props> = ({ darkMode }) => {
text-align: center;
line-height: 1;
text-align: center;
font-faimily: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial !important;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial !important;
letter-spacing: -.005em;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ export function QueryLanguageSwitcher(props: Props) {
<FormattedMessage
id="data.query.queryBar.syntaxOptionsDescription"
defaultMessage="The {docsLink} (DQL) offers a simplified query
syntax and support for scripted fields. DQL also provides autocomplete if you have
a Basic license or above. If you turn off DQL, OpenSearch Dashboards uses Lucene."
syntax and support for scripted fields. If you turn off DQL,
OpenSearch Dashboards uses Lucene."
values={{
docsLink: (
<EuiLink href={kueryQuerySyntaxDocs} target="_blank">
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ export const getSavedObjects = (): SavedObject[] => [
}),
hits: 0,
description: i18n.translate('home.sampleData.logsSpec.webTrafficDescription', {
defaultMessage: "Analyze mock web traffic log data for Elastic's website",
defaultMessage: "Analyze mock web traffic log data for OpenSearch's website",
}),
panelsJSON:
'[{"embeddableConfig":{"vis":{"colors":{"Avg. Bytes":"#6ED0E0","Unique Visitors":"#0A437C"},"legendOpen":false}},"gridData":{"x":27,"y":11,"w":21,"h":13,"i":"2"},"panelIndex":"2","version":"7.0.0-alpha1","panelRefName":"panel_0"},{"gridData":{"x":0,"y":49,"w":24,"h":18,"i":"4"},"panelIndex":"4","version":"7.0.0-alpha1","panelRefName":"panel_1"},{"embeddableConfig":{"vis":{"defaultColors":{"0 - 22":"rgb(247,251,255)","22 - 44":"rgb(208,225,242)","44 - 66":"rgb(148,196,223)","66 - 88":"rgb(74,152,201)","88 - 110":"rgb(23,100,171)"},"legendOpen":false}},"gridData":{"x":0,"y":36,"w":24,"h":13,"i":"7"},"panelIndex":"7","version":"6.3.0","panelRefName":"panel_2"},{"embeddableConfig":{"mapCenter":[36.8092847020594,-96.94335937500001],"vis":{"params":{"sort":{"columnIndex":null,"direction":null}}}},"gridData":{"x":27,"y":24,"w":21,"h":12,"i":"9"},"panelIndex":"9","version":"6.3.0","panelRefName":"panel_3"},{"embeddableConfig":{"vis":{"colors":{"0 - 500":"#BF1B00","1000 - 1500":"#7EB26D","500 - 1000":"#F2C96D"},"defaultColors":{"0 - 500":"rgb(165,0,38)","1000 - 1500":"rgb(0,104,55)","500 - 1000":"rgb(255,255,190)"},"legendOpen":false}},"gridData":{"x":10,"y":0,"w":9,"h":11,"i":"11"},"panelIndex":"11","title":"","version":"6.3.0","panelRefName":"panel_4"},{"gridData":{"x":0,"y":24,"w":27,"h":12,"i":"13"},"panelIndex":"13","version":"6.3.0","panelRefName":"panel_5"},{"gridData":{"x":24,"y":36,"w":24,"h":31,"i":"14"},"panelIndex":"14","version":"6.3.0","panelRefName":"panel_6"},{"gridData":{"x":0,"y":11,"w":27,"h":13,"i":"15"},"panelIndex":"15","version":"6.3.0","panelRefName":"panel_7"},{"gridData":{"x":19,"y":0,"w":15,"h":11,"i":"16"},"panelIndex":"16","title":"","version":"6.3.0","panelRefName":"panel_8"},{"embeddableConfig":{"vis":{"legendOpen":false}},"gridData":{"x":34,"y":0,"w":14,"h":11,"i":"17"},"panelIndex":"17","version":"6.3.0","panelRefName":"panel_9"},{"embeddableConfig":{},"gridData":{"x":0,"y":0,"w":10,"h":11,"i":"18"},"panelIndex":"18","title":"","version":"7.0.0-alpha1","panelRefName":"panel_10"}]',
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 @@ -68,42 +68,47 @@ export const EmptyState = ({
canSave: boolean;
}) => {
const mlCard = (
<EuiFlexItem>
<EuiCard
onClick={() => navigateToApp('ml', { path: '#/filedatavisualizer' })}
className="inpEmptyState__card"
betaBadgeLabel={
getMlCardState() === MlCardState.ENABLED
? undefined
: i18n.translate(
'indexPatternManagement.createIndexPattern.emptyState.basicLicenseLabel',
{
defaultMessage: 'Basic',
}
)
}
betaBadgeTooltipContent={i18n.translate(
'indexPatternManagement.createIndexPattern.emptyState.basicLicenseDescription',
{
defaultMessage: 'This feature requires a Basic license.',
}
)}
isDisabled={getMlCardState() === MlCardState.DISABLED}
icon={<EuiIcon size="xl" type="document" color="subdued" />}
title={
<FormattedMessage
id="indexPatternManagement.createIndexPattern.emptyState.uploadCardTitle"
defaultMessage="Upload a file"
/>
}
description={
<FormattedMessage
id="indexPatternManagement.createIndexPattern.emptyState.uploadCardDescription"
defaultMessage="Import a CSV, NDJSON, or log file."
/>
}
/>
</EuiFlexItem>
<></>
// TODO: [RENAMEME] if have a replacement for this view we can re-enable this without
// upsell. Users can should be able to do everything within the application this card does
// but without the ML file visualizer.
// https://github.com/opensearch-project/OpenSearch-Dashboards/issues/384
// <EuiFlexItem>
// <EuiCard
// onClick={() => navigateToApp('ml', { path: '#/filedatavisualizer' })}
// className="inpEmptyState__card"
// betaBadgeLabel={
// getMlCardState() === MlCardState.ENABLED
// ? undefined
// : i18n.translate(
// 'indexPatternManagement.createIndexPattern.emptyState.basicLicenseLabel',
// {
// defaultMessage: 'Basic',
// }
// )
// }
// betaBadgeTooltipContent={i18n.translate(
// 'indexPatternManagement.createIndexPattern.emptyState.basicLicenseDescription',
// {
// defaultMessage: 'This feature requires a Basic license.',
// }
// )}
// isDisabled={getMlCardState() === MlCardState.DISABLED}
// icon={<EuiIcon size="xl" type="document" color="subdued" />}
// title={
// <FormattedMessage
// id="indexPatternManagement.createIndexPattern.emptyState.uploadCardTitle"
// defaultMessage="Upload a file"
// />
// }
// description={
// <FormattedMessage
// id="indexPatternManagement.createIndexPattern.emptyState.uploadCardDescription"
// defaultMessage="Import a CSV, NDJSON, or log file."
// />
// }
// />
// </EuiFlexItem>
);

const createAnyway = (
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion src/plugins/maps_legacy/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ export * from './common/types';
export { ORIGIN } from './common/constants/origin';

export { WmsOptions } from './components/wms_options';
export { LegacyMapDeprecationMessage } from './components/legacy_map_deprecation_message';

export { lazyLoadMapsLegacyModules } from './lazy_load_bundle';

Expand Down
33 changes: 6 additions & 27 deletions src/plugins/maps_legacy/public/map/map_messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ export const createRegionBlockedWarning = (function () {
body={
<Fragment>
<p>
You can configure OpenSearch Dash to use a different map server for coordinate maps
by modifying the default WMS properties.
You can configure OpenSearch Dashboards to use a different map server for coordinate
maps by modifying the default WMS properties.
</p>
</Fragment>
}
Expand Down Expand Up @@ -110,39 +110,18 @@ export const createZoomWarningMsg = (function () {
<FormattedMessage
id="maps_legacy.opensearchDashboardsMap.zoomWarning"
defaultMessage="You've reached the maximum number of zoom
levels. To zoom all the way in, upgrade to the
{defaultDistribution} of OpenSearch and OpenSearch Dashboards. You'll get
access to additional zoom levels for free through the {ems}.
Or, you can configure your own map server. Please go to
{ wms } or { configSettings} for more information."
// TODO: [RENAMEME] Need valid URLs
levels. To zoom all the way in, you can configure your own map server.
Please go to { wms } for more information."
// TODO: [RENAMEME] Need prod urls.
values={{
defaultDistribution: (
<a target="_blank" href="https://www.opensearch.org/downloads/kibana">
{`default distribution `}
</a>
),
ems: (
<a target="_blank" href="https://www.opensearch.org/elastic-maps-service">
{`OpenSearch Maps Service`}
</a>
),
wms: (
<a
target="_blank"
href="https://www.opensearch.org/guide/en/kibana/current/tilemap.html"
href="https://docs-beta.opensearch.org/docs/opensearch-dashboards/maptiles"
>
{`Custom WMS Configuration`}
</a>
),
configSettings: (
<a
target="_blank"
href="https://www.opensearch.org/guide/en/kibana/current/settings.html"
>
{`Custom TMS Using Config Settings`}
</a>
),
}}
/>
</p>
Expand Down
Loading

0 comments on commit 743d923

Please sign in to comment.