Skip to content

Commit

Permalink
Merge branch 'main' into alexey-log-label-filters
Browse files Browse the repository at this point in the history
  • Loading branch information
lmangani authored Mar 1, 2022
2 parents 6071816 + 133bda2 commit 155fb81
Show file tree
Hide file tree
Showing 22 changed files with 291 additions and 103 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"url": "git+ssh://[email protected]/metrico/cloki-view.git"
},
"author": "[email protected]",
"version": "0.4.4",
"version": "0.5.1",
"private": false,
"dependencies": {
"@emotion/react": "^11.7.1",
Expand Down
1 change: 0 additions & 1 deletion src/actions/LoadLabels.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export default function loadLabels(apiUrl) {
}

}


}).catch(error => {
console.log(error)
Expand Down
2 changes: 1 addition & 1 deletion src/actions/loadLabelValues.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ export default function loadLabelValues(label, labelList, apiUrl) {
}


}
}
3 changes: 2 additions & 1 deletion src/actions/loadLogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ export default function loadLogs() {
}

if (type === "matrix") {
dispatch(setMatrixData(result || []));
const idResult = result.map( m => ({...m,id:nanoid()}))
dispatch(setMatrixData(idResult || []));
dispatch(setLoading(false));
}
dispatch(setLoading(false));
Expand Down
2 changes: 1 addition & 1 deletion src/actions/setApiError.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setApiError = (apiErrors) => (dispatch) => {
type: 'SET_API_ERRORS',
apiErrors
})
}
}
2 changes: 1 addition & 1 deletion src/actions/setApiUrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setApiUrl = ( apiUrl ) => (dispatch) => {
type: 'SET_API_URL',
apiUrl:apiUrl.trim()
})
}
}
2 changes: 1 addition & 1 deletion src/actions/setIsSubmit.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setIsSubmit = (isSubmit) => (dispatch)=>{
type: 'SET_IS_SUBMIT',
isSubmit
})
}
}
2 changes: 1 addition & 1 deletion src/actions/setLabelsBrowserOpen.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setLabelsBrowserOpen = ( labelsBrowserOpen) => (dispatch) => {
type: 'SET_BROWSER_OPEN',
labelsBrowserOpen
})
}
}
2 changes: 1 addition & 1 deletion src/actions/setLoading.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export default (loading) => (dispatch) => {
type: 'SET_LOADING',
loading
});
}
}
2 changes: 1 addition & 1 deletion src/actions/setLogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export default (logs) => (dispatch) => {
type: 'SET_LOGS',
logs
});
}
}
2 changes: 1 addition & 1 deletion src/actions/setMatrixData.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ const setMatrixData = (matrixData) => (dispatch) => {
})
}

export default setMatrixData;
export default setMatrixData;
1 change: 0 additions & 1 deletion src/actions/setQuery.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
query
})
}

2 changes: 1 addition & 1 deletion src/actions/setQueryLimit.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setQueryLimit = (limit) => (dispatch) => {
type: 'SET_QUERY_LIMIT',
limit
});
}
}
2 changes: 1 addition & 1 deletion src/actions/setQueryStep.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setQueryStep = (step) => (dispatch)=>{
type: 'SET_QUERY_STEP',
step
})
}
}
2 changes: 1 addition & 1 deletion src/actions/setRangeOpen.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setRangeOpen = ( rangeOpen ) => (dispatch) => {
type: 'SET_RANGE_OPEN',
rangeOpen
})
}
}
2 changes: 1 addition & 1 deletion src/actions/setStartTime.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setStartTime = (start) => (dispatch) => {
type: 'SET_START_TIME',
start
});
}
}
2 changes: 1 addition & 1 deletion src/actions/setStopTime.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setStopTime = (stop) => (dispatch) => {
type: 'SET_STOP_TIME',
stop
});
}
}
2 changes: 1 addition & 1 deletion src/actions/setTimeRangeLabel.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export const setTimeRangeLabel = (label) => (dispatch) => {
type: 'SET_TIME_RANGE_LABEL',
label
});
}
}
2 changes: 1 addition & 1 deletion src/actions/setUrlQueryParams.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ export const setUrlQueryParams = (urlQueryParams) => (dispatch) => {
urlQueryParams

})
}
}
18 changes: 3 additions & 15 deletions src/plugins/charts/ChartLabelList.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,17 @@ const ChartLabel = styled("div")`
font-family: sans-serif;
display: flex;
align-items: center;
margin: 2px;
padding: 4px;
padding-right: 10px;
cursor: pointer;
opacity: ${(props) => (!props.isVisible ? "1" : ".75")};
opacity: ${(props) => (!props.isVisible ? "1" : ".5")};
border-radius: 3px;
height:20px !important;
&:hover {
background: black;
}
`;

const SearchButton = styled(FindReplaceIcon)`
color: orange;
font-size: 16px;
background: #222;
padding: 2px;
border-radius: 2px;
margin-left: 2px;
opacity: 0.5;
&:hover {
opacity: 1;
}
`;

const ColorLabel = styled("div")`
height: 4px;
Expand Down
Loading

0 comments on commit 155fb81

Please sign in to comment.