Skip to content

Commit

Permalink
[1.x][Build] build:types and uiFramework run successfully
Browse files Browse the repository at this point in the history
Allowing for the following builds to complete successfully:
* `yarn build:types`
* `yarn uiFramework:build`
* `yarn uiFramework:start`

Not positive about the expected results when running uiFramework:start
but it seems to be on par with the legacy 7.10.2 version.

Issue resolved:
opensearch-project#680

Backport PR:
opensearch-project#734

Signed-off-by: Kawika Avilla <[email protected]>
  • Loading branch information
kavilla committed Aug 31, 2021
1 parent 32e06f2 commit 40e2953
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@
font-size: 14px;
}

.guideNav__elasticLogo {
// TODO: [RENAMEME] replacement background-image might be needed
.guideNav__opensearchLogo {
position: absolute;
background-image: url("images/elastic-logo.svg");
background-image: url("images/react-logo.svg");
width: 106px;
height: 36px;
background-repeat: no-repeat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ export class GuideNav extends Component {
</Link>
<a
href="http://opensearch.org"
className="guideNav__elasticLogo"
aria-label="Go to the Elastic website"
className="guideNav__opensearchLogo"
aria-label="Go to the OpenSearch website"
/>

{this.renderPagination()}
Expand Down
14 changes: 13 additions & 1 deletion packages/osd-ui-framework/doc_site/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,19 @@ module.exports = {
},
{
test: /\.scss$/,
loaders: ['style-loader', 'css-loader', 'postcss-loader', 'sass-loader'],
loaders: [
'style-loader',
'css-loader',
{
loader: 'postcss-loader',
options: {
config: {
path: require.resolve('@osd/optimizer/postcss.config.js'),
},
},
},
'sass-loader',
],
exclude: /node_modules/,
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export class FieldFormatsRegistry {

return new ConcreteFieldFormat(params, this.getConfig);
},
(formatId: FieldFormatId, params: Record<string, any>) =>
(formatId: FieldFormatId, params: Record<string, any> = {}) =>
JSON.stringify({
formatId,
...params,
Expand Down Expand Up @@ -222,7 +222,7 @@ export class FieldFormatsRegistry {
*/
getDefaultInstanceCacheResolver(
fieldType: OSD_FIELD_TYPES,
esTypes: OPENSEARCH_FIELD_TYPES[]
esTypes?: OPENSEARCH_FIELD_TYPES[]
): string {
// @ts-ignore
return Array.isArray(esTypes) && esTypes.indexOf(fieldType) === -1
Expand Down

0 comments on commit 40e2953

Please sign in to comment.