Skip to content

Commit 103b255

Browse files
committed
IBX-9109: Enabling TypeScript (ts-loader) with Webpack Encore
1 parent 4ad571d commit 103b255

File tree

6 files changed

+48
-22
lines changed

6 files changed

+48
-22
lines changed

dependencies.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"recipesEndpoint": "https://api.github.com/repos/ibexa/recipes-dev/contents/index.json?ref=flex/pull-145",
3+
"packages": []
4+
}

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"prettier": "eslint-config-ibexa/prettier",
66
"dependencies": {},
77
"devDependencies": {
8-
"eslint-config-ibexa": "https://github.com/ibexa/eslint-config-ibexa.git#~v1.1.1"
8+
"eslint-config-ibexa": "https://github.com/ibexa/eslint-config-ibexa.git#IBX-9109-enabling-typescript"
99
},
1010
"scripts": {
1111
"test": "yarn prettier-test && yarn eslint-test",
1212
"fix": "yarn prettier-test --write && yarn eslint-test --fix",
13-
"eslint-test": "eslint \"./src/bundle/Resources/**/*.js\" \"./src/bundle/ui-dev/**/*.js\"",
14-
"prettier-test": "yarn prettier \"./src/bundle/Resources/**/*.{js,scss}\" \"./src/bundle/ui-dev/**/*.js\" --check"
13+
"eslint-test": "eslint \"./src/bundle/Resources/**/*.{js,ts}\" \"./src/bundle/ui-dev/**/*.{js,tsx}\"",
14+
"prettier-test": "yarn prettier \"./src/bundle/Resources/**/*.{js,ts,scss}\" \"./src/bundle/ui-dev/**/*.{js,tsx}\" --check"
1515
}
1616
}

src/bundle/Resources/encore/ibexa.config.setup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const path = require('path');
33
module.exports = (Encore) => {
44
Encore.addAliases({
55
'@ibexa-admin-ui': path.resolve('./vendor/ibexa/admin-ui'),
6+
'@ibexa-admin-ui-helpers': path.resolve('./vendor/ibexa/admin-ui/src/bundle/Resources/public/js/scripts/helpers'),
67
'@ibexa-admin-ui-modules': path.resolve('./vendor/ibexa/admin-ui/src/bundle/ui-dev/src/modules'),
78
});
89
};

src/bundle/Resources/encore/ibexa.js.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ module.exports = (Encore) => {
126126
path.resolve(__dirname, '../public/js/scripts/button.content.edit.js'),
127127
path.resolve(__dirname, '../public/js/scripts/admin.search.filters.js'),
128128
path.resolve(__dirname, '../public/js/scripts/admin.search.sorting.js'),
129-
path.resolve(__dirname, '../public/js/scripts/admin.search.js'),
129+
path.resolve(__dirname, '../public/ts/admin.search.ts'),
130130
path.resolve(__dirname, '../public/js/scripts/udw/select.location.js'),
131131
path.resolve(__dirname, '../public/js/scripts/button.translation.edit.js'),
132132
])
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
(function (document: Document) {
2+
const searchForm = document.querySelector<HTMLFormElement>('.ibexa-search-form');
3+
const searchInput = document.querySelector<HTMLInputElement>('.ibexa-search-form__search-input');
4+
const headerSearchInput = document.querySelector<HTMLInputElement>('.ibexa-global-search__input');
5+
const languageSelector = document.querySelector<HTMLSelectElement>('.ibexa-filters__item--language-selector .ibexa-filters__select');
6+
const headerSearchSubmitBtn = document.querySelector<HTMLButtonElement>(
7+
'.ibexa-main-header .ibexa-input-text-wrapper__action-btn--search',
8+
);
9+
10+
if (!headerSearchInput || !searchInput || !searchForm) {
11+
return;
12+
}
13+
14+
const submitForm = () => {
15+
searchInput.value = headerSearchInput.value;
16+
searchForm.submit();
17+
};
18+
const handleHeaderSearchBtnClick = (event: MouseEvent) => {
19+
event.preventDefault();
20+
21+
submitForm();
22+
};
23+
24+
headerSearchInput.value = searchInput.value;
25+
26+
headerSearchSubmitBtn?.addEventListener('click', handleHeaderSearchBtnClick, false);
27+
languageSelector?.addEventListener('change', submitForm, false);
28+
})(document);

src/bundle/ui-dev/src/modules/common/thumbnail/thumbnail.js renamed to src/bundle/ui-dev/src/modules/common/thumbnail/thumbnail.tsx

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
3-
42
import Icon from '../icon/icon';
53

6-
const Thumbnail = ({ thumbnailData, iconExtraClasses, contentTypeIconPath }) => {
7-
const renderContentTypeIcon = () => {
4+
interface ThumbnailProps {
5+
thumbnailData: {
6+
mimeType: string;
7+
resource: string;
8+
};
9+
iconExtraClasses?: string;
10+
contentTypeIconPath?: string;
11+
}
12+
13+
const Thumbnail = ({ thumbnailData, iconExtraClasses, contentTypeIconPath }: ThumbnailProps) => {
14+
const renderContentTypeIcon = (): JSX.Element | null => {
815
if (!contentTypeIconPath) {
916
return null;
1017
}
@@ -32,18 +39,4 @@ const Thumbnail = ({ thumbnailData, iconExtraClasses, contentTypeIconPath }) =>
3239
);
3340
};
3441

35-
Thumbnail.propTypes = {
36-
thumbnailData: PropTypes.shape({
37-
mimeType: PropTypes.string.isRequired,
38-
resource: PropTypes.string.isRequired,
39-
}).isRequired,
40-
iconExtraClasses: PropTypes.string,
41-
contentTypeIconPath: PropTypes.string,
42-
};
43-
44-
Thumbnail.defaultProps = {
45-
iconExtraClasses: null,
46-
contentTypeIconPath: null,
47-
};
48-
4942
export default Thumbnail;

0 commit comments

Comments
 (0)