Skip to content

Commit 653ed06

Browse files
authored
Final merge edits from Docketeer 7.0 team. (#115)
Removed legacy files that reappeared due to merge conflicts.
2 parents 0ec9595 + 8de92b6 commit 653ed06

File tree

4 files changed

+7
-97
lines changed

4 files changed

+7
-97
lines changed

Diff for: src/components/App.js

-33
This file was deleted.

Diff for: src/components/display/ProcessLogsTable.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ import { CSVLink } from 'react-csv';
1616
* a Router link.
1717
*/
1818

19-
const ProcessLogsTable = (props) => {
19+
const ProcessLogsTable = () => {
20+
21+
const dispatch = useDispatch();
22+
const getContainerLogsDispatcher = (data) =>
23+
dispatch(actions.getContainerLogs(data));
2024

2125
// grab clicked container
2226
const urlString = window.location.href;
@@ -131,7 +135,7 @@ const ProcessLogsTable = (props) => {
131135
return (
132136
<div className='renderContainers'>
133137

134-
<div className='settings-container'>
138+
<div className="settings-container">
135139
<form>
136140
<h1 style={{margin: 10}}>Container Process Logs</h1>
137141

@@ -188,14 +192,9 @@ const ProcessLogsTable = (props) => {
188192
}}
189193
/>
190194
</div>
191-
192-
193195
</div>
194-
195-
196196
</div>
197-
198197
);
199198
};
200199

201-
export default ProcessLogsTable;
200+
export default ProcessLogsTable;

Diff for: src/components/helper/loginHelper.js

-42
This file was deleted.

Diff for: src/components/helper/psqlQuery.js

-14
This file was deleted.

0 commit comments

Comments
 (0)