overflow_backup_2018_0455/overflow_app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

err fix

Browse Source
This commit is contained in:
insanity 2017-07-28 18:33:43 +09:00
parent 34adb75d10
commit 7916973e39
8 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/webpack/webpack.config.dev.js
View File

@ -47,6 +47,7 @@ module.exports = WebpackMerge(configBase, {
Path.resolve(__dirname, '../../node_modules/')
]
},
{ test: /\.jpg$/, loader: 'file' },
// {
// test: /\.tsx?$/,
// loaders: [

4
package.json
View File

@ -14,7 +14,6 @@
"test": "yarn run jest",
"test:watch": "yarn run jest -- --watch",
"jest": "PWD=$(pwd) NODE_ENV=test ./node_modules/.bin/jest -w 1 --coverage",
"prebuild": "./node_modules/.bin/check-dependencies && yarn run clean",
"build": "set NODE_ENV=production && ./node_modules/.bin/webpack-dashboard -m -- ./node_modules/.bin/webpack --progress --profile --colors --config ./config/webpack/webpack.config.prod.js",
"lint": "./node_modules/.bin/tslint -c tslint.json 'src/ts/**/*.{ts,tsx}' && ./node_modules/.bin/sass-lint 'src/**/*.scss'",
"stats": "set NODE_ENV=production && webpack --progress --config ./config/webpack/webpack.config.stats.js --profile --json > ./config/webpack/stats/stats.json"
@ -87,7 +86,8 @@
"redux-saga": "^0.15.4",
"reflect-metadata": "^0.1.10",
"reselect": "^3.0.1",
"semantic-ui-react": "^0.71.1"
"semantic-ui-react": "^0.71.1",
"image-webpack-loader": "^3.3.1"
},
"jest": {
"moduleFileExtensions": [

2
src/ts/@overflow/app/views/layout/LogoBar.tsx
View File

@ -4,9 +4,11 @@ import {
Header,
Container,
Popup,
Image,
} from 'semantic-ui-react';
import { Notification } from '@overflow/commons/react/component/Notification';
export class LogoBar extends React.Component<any, any> {
constructor(props: any, context: any) {

8
src/ts/@overflow/meta/react/components/SensorItemTree.tsx
View File

@ -142,14 +142,14 @@ export class SensorItemTree extends React.Component<SensorItemTreeProps, SensorI
SensorJsonData.map((data: any, idx: number) => {
let sensorItem: MetaSensorItem = data;
if (this.itemMap.has(sensorItem.metaSensorItemType.id)) {
this.itemMap.get(sensorItem.metaSensorItemType.id).metaSensorItemList.push(sensorItem);
if (this.itemMap.has(sensorItem.itemType.id)) {
this.itemMap.get(sensorItem.itemType.id).metaSensorItemList.push(sensorItem);
} else {
let item: TreeItem = { metaSensorItemList: null, metaSensorItemType: null };
item.metaSensorItemList = [];
item.metaSensorItemList.push(sensorItem);
item.metaSensorItemType = this.GetMetaSensorItemType(sensorItem.metaSensorItemType.id);
this.itemMap.set(sensorItem.metaSensorItemType.id, item);
item.metaSensorItemType = this.GetMetaSensorItemType(sensorItem.itemType.id);
this.itemMap.set(sensorItem.itemType.id, item);
}
});
}

2
src/ts/@overflow/probe/react/components/ProbeHost.tsx
View File

@ -103,7 +103,7 @@ export class ProbeHost extends React.Component<Props, State> {
<Table.Cell collapsing>
<Header size='small'>OS vendor type</Header>
</Table.Cell>
<Table.Cell>{this.state.host.os.vendor.type.name}</Table.Cell>
<Table.Cell>{this.state.host.os.vendor.infraType.name}</Table.Cell>
</Table.Row>
</Table.Body>
</Table>

2
src/ts/@overflow/sensor/react/components/SensorDetail.tsx
View File

@ -99,7 +99,7 @@ export class SensorBasicInfo extends React.Component<SensorBasicInfoProps, Senso
<Table.Cell>
<Header size='small'>Name</Header>
</Table.Cell>
<Table.Cell>{this.state.sensor.target.infra.type.name}</Table.Cell>
<Table.Cell>{this.state.sensor.target.displayName}</Table.Cell>
</Table.Row>
<Table.Row>
<Table.Cell>

2
src/ts/@overflow/sensor/react/components/SensorDetailInfo.tsx
View File

@ -62,7 +62,7 @@ export class SensorDetailInfo extends React.Component<SensorDetailInfoProps, Sen
<Table.Cell>
<Header size='small'>Name</Header>
</Table.Cell>
<Table.Cell>{this.state.sensor.target.infra.type.name}</Table.Cell>
<Table.Cell>{this.state.sensor.target.displayName}</Table.Cell>
</Table.Row>
<Table.Row>
<Table.Cell>

2
src/ts/@overflow/sensor/react/components/SensorDetailItems.tsx
View File

@ -52,7 +52,7 @@ export class SensorDetailItems extends React.Component<Props, State> {
return (
<Table.Row key={idx}>
<Table.Cell>{idx}</Table.Cell>
<Table.Cell>{sensorItem.item.metaSensorItemType.name}</Table.Cell>
<Table.Cell>{sensorItem.item.itemType.name}</Table.Cell>
<Table.Cell>{sensorItem.item.name}</Table.Cell>
<Table.Cell>{sensorItem.item.key}</Table.Cell>
</Table.Row>