这是indexloc提供的服务，不要输入任何密码
Skip to content

misc console actions fixes #4059

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 19, 2020
Merged

misc console actions fixes #4059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b05b81
misc console actions fixes
Mar 8, 2020
033279c
Merge branch 'master' into actions-codegen-console-warnings-fixes
rikinsk Mar 19, 2020
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: 0 additions & 3 deletions console/src/components/Common/AceEditor/BaseEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ const Editor = ({ mode, ...props }) => {
tabSize={2}
setOptions={{
showLineNumbers: true,
enableBasicAutocompletion: true,
enableSnippets: true,
behavioursEnabled: true,
}}
{...props}
/>
Expand Down
5 changes: 4 additions & 1 deletion console/src/components/Common/Headers/Headers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ const Headers = ({ headers, setHeaders }) => {
};

return (
<div className={`${styles.display_flex} ${styles.add_mar_bottom_mid}`}>
<div
className={`${styles.display_flex} ${styles.add_mar_bottom_mid}`}
key={i}
>
{getHeaderNameInput()}
{getHeaderValueInput()}
{getRemoveButton()}
Expand Down
6 changes: 3 additions & 3 deletions console/src/components/Services/Actions/Codegen/CodeTabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ const CodeTabs = ({
);
}

const files = codegenFiles.map(({ name, content }) => {
const files = codegenFiles.map(({ name, content }, i) => {
const getFileTab = (component, filename) => {
return (
<Tab eventKey={filename} title={filename}>
<Tab eventKey={filename} title={filename} key={i}>
{component}
</Tab>
);
Expand All @@ -73,7 +73,7 @@ const CodeTabs = ({
}
});

return <Tabs id="uncontrolled-tab-example">{files} </Tabs>;
return <Tabs id="codegen-files-tabs">{files} </Tabs>;
};

export default CodeTabs;
1 change: 0 additions & 1 deletion console/src/components/Services/Actions/Codegen/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export const getAllCodegenFrameworks = () => {
};

export const getCodegenFunc = framework => {
process.hrtime = () => null;
return fetch(getCodegenFilePath(framework))
.then(r => r.text())
.then(rawJsString => {
Expand Down
1 change: 1 addition & 0 deletions console/src/components/Services/Actions/Common/components/HeaderConfEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const HandlerEditor = ({
<input
type="checkbox"
checked={forwardClientHeaders}
readOnly
className={`${styles.add_mar_right_small}`}
/>
Forward client headers to webhook
Expand Down
2 changes: 2 additions & 0 deletions console/src/components/Services/Actions/Common/components/KindEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const HandlerEditor = ({ value, onChange, className }) => {
<input
type="radio"
checked={value === 'synchronous'}
readOnly
className={styles.add_mar_right_small}
/>
Synchronous
Expand All @@ -45,6 +46,7 @@ const HandlerEditor = ({ value, onChange, className }) => {
>
<input
type="radio"
readOnly
checked={value === 'asynchronous'}
className={styles.add_mar_right_small}
/>
Expand Down
1 change: 1 addition & 0 deletions console/webpack/dev.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ module.exports = {
// set global consts
new webpack.DefinePlugin({
CONSOLE_ASSET_VERSION: Date.now().toString(),
'process.hrtime': () => null,
}),
webpackIsomorphicToolsPlugin.development(),
new ForkTsCheckerWebpackPlugin({
Expand Down
1 change: 1 addition & 0 deletions console/webpack/prod.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ module.exports = {
NODE_ENV: JSON.stringify('production'),
},
CONSOLE_ASSET_VERSION: Date.now().toString(),
'process.hrtime': () => null,
}),
new ForkTsCheckerWebpackPlugin({
compilerOptions: {
Expand Down