Skip to content
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.

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

Cancel Import File Error Message #52

Closed
wants to merge 129 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
b1b4a66
Merge pull request #47 from open-source-labs/staging
serenackuo Sep 23, 2020
2b4b95a
Merge pull request #49 from open-source-labs/staging
muhammadtrad Sep 24, 2020
804efa4
prepping for first upstream merge
Sep 28, 2020
668f2c0
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR into ma…
Sep 28, 2020
23e5279
merging w upstream rd 2
Sep 28, 2020
13d006f
merged w upstream
Sep 28, 2020
654762d
installed dependencies
cwalker3011 Sep 28, 2020
3b8c961
sass compiling package.json
cwalker3011 Sep 28, 2020
36be520
set up testing configuration
cwalker3011 Sep 28, 2020
a8919f5
set up jest and babel to run tests, created a setup file for the enzy…
cwalker3011 Sep 29, 2020
7821614
Merge pull request #1 from cwalker3011/workingbranch
cwalker3011 Sep 29, 2020
b6f6124
Merge pull request #2 from oslabs-beta/staging
frakes413 Sep 29, 2020
1916bed
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR
cwalker3011 Sep 29, 2020
317c242
merge from upstream after testing initialized
Sep 29, 2020
3004a55
Left panel testing started
caseyescovedo Sep 30, 2020
ef7dee8
Merge pull request #3 from caseyescovedo/leftPanelTesting
caseyescovedo Sep 30, 2020
7abb751
Merge pull request #4 from oslabs-beta/staging
frakes413 Sep 30, 2020
a1f482b
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR into ma…
Sep 30, 2020
1641213
changed compare test file name to match convention; completed basic t…
Sep 30, 2020
bf63e48
accidental arbitrary re-save
Sep 30, 2020
33e319c
merging with left-panel testing
JustinD-A Sep 30, 2020
4feec3d
(testing) front end testing suite
JustinD-A Oct 1, 2020
2893853
frontend testing suite and live sass compiling bug-fix
JustinD-A Oct 1, 2020
6a362a8
Merge pull request #5 from JustinD-A/testing
JustinD-A Oct 1, 2020
d9abe67
Merge pull request #6 from oslabs-beta/staging
caseyescovedo Oct 1, 2020
367194b
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR
cwalker3011 Oct 1, 2020
a5792a3
added + styled checkbox to track (non-functional)
cwalker3011 Oct 1, 2020
4cbe094
checkbox changes new property in state
cwalker3011 Oct 1, 2020
5c55fa1
checkbox works, WIP func for non-tracked queries
cwalker3011 Oct 1, 2020
23e156d
everything working with tracked/untracked queries
cwalker3011 Oct 1, 2020
2cc5df8
codemirror fix
cwalker3011 Oct 1, 2020
c3932c6
removed test code
cwalker3011 Oct 1, 2020
835cb21
Merge pull request #8 from cwalker3011/querypanel
cwalker3011 Oct 2, 2020
94007f5
schema modal overhaul begun
Oct 2, 2020
703e249
Merge pull request #9 from oslabs-beta/staging
caseyescovedo Oct 2, 2020
4802d6a
working on comparison table
JustinD-A Oct 2, 2020
6d712ea
Merge branch 'master' into modalUpdates
Oct 2, 2020
0eec407
Merge branch 'master' into graph
JustinD-A Oct 2, 2020
59da9e8
boilerplate for dummy data modal
cwalker3011 Oct 2, 2020
a142496
slightly more than boilerplate
cwalker3011 Oct 2, 2020
a7d0db8
feature update: updated bar chart to group data by schema and removed…
JustinD-A Oct 2, 2020
a96898c
Merge pull request #10 from JustinD-A/graph
JustinD-A Oct 2, 2020
9f58701
schema modal dropdown almost there
Oct 2, 2020
4c931f9
Merge pull request #11 from oslabs-beta/staging
frakes413 Oct 3, 2020
ef5cf25
working on dropdown menu
cwalker3011 Oct 3, 2020
57a13d8
Merge branch 'master' into modalUpdates
Oct 3, 2020
1c350ef
Merge branch 'master' into dummymodal
cwalker3011 Oct 3, 2020
6ef8a18
schema modal display functioning properly
Oct 3, 2020
422b2ac
Merge pull request #12 from frakes413/modalUpdates
frakes413 Oct 3, 2020
b0feab7
Merge pull request #13 from oslabs-beta/staging
cwalker3011 Oct 3, 2020
70cd5ac
dropdown working
cwalker3011 Oct 3, 2020
81b1dda
Merge branch 'master' into dummymodal
cwalker3011 Oct 3, 2020
f50b80f
non functional table rendering to page
cwalker3011 Oct 3, 2020
ad50a79
dummy data modal functional
cwalker3011 Oct 3, 2020
2f39aff
schema modal copy functionality connected to back-end; new channel ad…
Oct 3, 2020
56a75f6
dummy data modal front end complete
cwalker3011 Oct 3, 2020
537ee5e
Merge pull request #15 from cwalker3011/dummymodal
cwalker3011 Oct 3, 2020
5f278c3
copy DB functionality almost complete
Oct 3, 2020
8c78894
Merge pull request #16 from oslabs-beta/staging
caseyescovedo Oct 3, 2020
1bcf83e
Merge branch 'master' into schemaModalLogic
Oct 3, 2020
f5fc1f2
merging with master
JustinD-A Oct 3, 2020
756df60
Merge branch 'master' into pg_dump_schema
JustinD-A Oct 3, 2020
fa65463
copy DB pieces successfully linked; still working on formatting the p…
Oct 4, 2020
0db33f8
proof of concept for DB copying functionality; file-path still needs …
Oct 4, 2020
582a667
copy db functionality working properly now; filepath is specified cor…
Oct 5, 2020
75ef988
copy-db channel actually deleted now; some pseudocode added
Oct 5, 2020
3d73d99
Merge pull request #17 from frakes413/schemaModalLogic
frakes413 Oct 5, 2020
74015e4
Merge pull request #18 from oslabs-beta/staging
JustinD-A Oct 5, 2020
fa9c4f0
Pseudocode for dummyData generator, connected getSchemaLayout from fr…
JustinD-A Oct 5, 2020
0e3d224
Merge pull request #19 from JustinD-A/dummy_data
JustinD-A Oct 5, 2020
03d4d64
Merge pull request #20 from oslabs-beta/staging
frakes413 Oct 5, 2020
dfbf449
prop drilled currentSchema and tableList into dummy data modal
cwalker3011 Oct 5, 2020
fb9734e
Schema Modal UI updated
caseyescovedo Oct 5, 2020
2f8841f
Schema Modal resetting to default upon closing event.
caseyescovedo Oct 5, 2020
361b238
error between models.ts and channels.ts
cwalker3011 Oct 6, 2020
5feb99f
Deleted SchemaInput file.
caseyescovedo Oct 6, 2020
ebe664a
Merge pull request #21 from caseyescovedo/schemaModalUI
caseyescovedo Oct 6, 2020
6dc2f51
Merge pull request #22 from oslabs-beta/staging
frakes413 Oct 6, 2020
eda4145
commit for posterity
cwalker3011 Oct 6, 2020
1c25508
merging with master
JustinD-A Oct 6, 2020
d2736b3
Merge branch 'master' into dummy_data
JustinD-A Oct 6, 2020
dd18109
Merge branch 'master' into dummydatawork
cwalker3011 Oct 6, 2020
dae5152
test data generation is working Co-authored-by: Justin Dury-Agri just…
cwalker3011 Oct 6, 2020
6bd922d
Merge pull request #23 from cwalker3011/dummydatawork
cwalker3011 Oct 6, 2020
9f5d39e
Merge pull request #24 from oslabs-beta/staging
frakes413 Oct 6, 2020
195af15
basic faker func Co-authored-by: Sam Frakes samuelafrakes@gmail.com
cwalker3011 Oct 6, 2020
d53ed19
about to mess with some async Co-authored-by: Sam Frakes samuelafrake…
cwalker3011 Oct 6, 2020
971a86e
fixed schemaLayout generation and have dummy data generation functional
cwalker3011 Oct 6, 2020
504a037
Merge pull request #25 from cwalker3011/fakerfunction
cwalker3011 Oct 6, 2020
26bde9e
Merge pull request #26 from oslabs-beta/staging
JustinD-A Oct 6, 2020
a122be4
merging with master
JustinD-A Oct 6, 2020
fac8979
merging with master
JustinD-A Oct 6, 2020
e1a9134
merging with upstream
caseyescovedo Oct 6, 2020
f0605c9
Pulling new upstream
caseyescovedo Oct 6, 2020
4baf60f
Front-end tableList state now properly updating upon import/copying o…
Oct 7, 2020
a6cb3cf
state update fixed in input-schema channel; bug fix for front-end tab…
Oct 8, 2020
9f27520
Bug fix -> DDModal dropdown now updating properly when tab is changed
Oct 8, 2020
b7d160e
scroll bar added to DDModal dropdown; UI of scrollbar needs some touc…
Oct 8, 2020
018de9f
Merge pull request #27 from frakes413/DDModalStateBugfix
cwalker3011 Oct 8, 2020
4417bca
New feature: generates .csv files of dummy data.
caseyescovedo Oct 8, 2020
1d34200
Merge pull request #28 from oslabs-beta/staging
frakes413 Oct 8, 2020
90aa9cb
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR into ma…
caseyescovedo Oct 8, 2020
3353a9e
Merge branch 'csv' into csvCopy
caseyescovedo Oct 8, 2020
8017b55
Merge pull request #29 from caseyescovedo/csvCopy
caseyescovedo Oct 8, 2020
e73d2ae
Merge pull request #30 from oslabs-beta/staging
JustinD-A Oct 8, 2020
4d31aad
merging with upstream
JustinD-A Oct 8, 2020
eb19a79
removed unused components from app, fixed small UI bugs
cwalker3011 Oct 8, 2020
2d2f046
testing PostgreSQL copy from command on mac
JustinD-A Oct 8, 2020
6e74093
Merge branch 'dummy_data' of https://github.com/JustinD-A/SeeQR into …
cwalker3011 Oct 8, 2020
37dad8e
dummy data generation functional for DBs w/o FK constraints AND singl…
Oct 8, 2020
a0b6220
Merge pull request #31 from frakes413/csvFileCopy
frakes413 Oct 8, 2020
2426ed6
Merge pull request #32 from oslabs-beta/staging
JustinD-A Oct 8, 2020
7ceaafe
Merge branch 'master' into componentsUI
cwalker3011 Oct 8, 2020
9515580
Merge pull request #33 from cwalker3011/componentsUI
cwalker3011 Oct 8, 2020
e758126
Merge pull request #34 from oslabs-beta/staging
frakes413 Oct 8, 2020
9776ebc
DDModal table clears upon submitting request
cwalker3011 Oct 10, 2020
f9eb4a7
front-end mesages for errors in execute function
cwalker3011 Oct 10, 2020
3dcb71d
Merge pull request #35 from cwalker3011/ddFrontendFix
cwalker3011 Oct 10, 2020
9512b21
Merge pull request #36 from oslabs-beta/staging
JustinD-A Oct 10, 2020
1f20576
all dummy data types that currently have corresponding switch cases n…
Oct 10, 2020
940e952
Merge pull request #37 from frakes413/DD_DataTypes
frakes413 Oct 10, 2020
3363227
(UI improvement) stable coloring for compare graph
JustinD-A Oct 10, 2020
2000ec0
Merge pull request #38 from oslabs-beta/staging
JustinD-A Oct 10, 2020
7862519
Merge branch 'master' of https://github.com/oslabs-beta/SeeQR into gr…
JustinD-A Oct 10, 2020
372d91c
Merge pull request #39 from JustinD-A/graph_color
JustinD-A Oct 10, 2020
954f131
Merge pull request #40 from oslabs-beta/staging
frakes413 Oct 10, 2020
a7201ad
removed unnecessary imports from SchemaModal.tsx
Oct 10, 2020
30472a0
bugfix - error pop-up no longer appearing when user chooses 'cancel' …
Oct 10, 2020
6b6aacd
Merge pull request #41 from frakes413/CancelImportBugfix
frakes413 Oct 10, 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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/node_modules
/.vscode
/dist
/tsCompiled
*/.DS_Store
Expand Down
10 changes: 10 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"liveSassCompile.settings.formats": [
{
"format": "expanded",
"savePath": "/frontend/assets/stylesheets/css",
"extensionName": ".css"
}
],
"liveSassCompile.settings.generateMap": false
}
32 changes: 32 additions & 0 deletions __tests__/leftPanelTests/compareTest.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import * as React from "react";
import { Compare } from "../../frontend/components/leftPanel/Compare";
import { shallow } from "enzyme";

describe ("Comparison feature tests", () => {
// wrapper will be assigned the evaluation of the shallow render
let wrapper;

const props = {
queries: [],
currentSchema: '',
}
// shallow render the component before running tests
beforeAll(() => {
wrapper = shallow(<Compare {...props}/>)
})

it('Should render a div', () => {
expect(wrapper.type()).toEqual('div');
})

it('Should render correct h3 element', () => {
expect(wrapper.containsMatchingElement(
<h3>Comparisons</h3>)).toBeTruthy();
})

it('Should render query label', () => {
expect(wrapper.containsMatchingElement(
<td>{'Query Label'}</td>)).toBeTruthy();
})

})
33 changes: 33 additions & 0 deletions __tests__/leftPanelTests/historyTest.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import * as React from "react";
import { History } from "../../frontend/components/leftPanel/History";
import { shallow } from "enzyme";

describe ("History feature tests", () => {
// wrapper will be assigned the evaluation of the shallow render
let wrapper;

const props = {
queries: [],
currentSchema: '',

}
// shallow render the component before running tests
beforeAll(() => {
wrapper = shallow(<History {...props}/>)
})

it('Should render a div', () => {
expect(wrapper.type()).toEqual('div');
})

it('Should render correct h3 element', () => {
expect(wrapper.containsMatchingElement(
<h3>History</h3>)).toBeTruthy();
})

it('Should render query label', () => {
expect(wrapper.containsMatchingElement(
<td>{'Query Label'}</td>)).toBeTruthy();
})

})
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import * as React from 'react';
import { mount, shallow } from 'enzyme';
import { Table } from '../../../../frontend/components/rightPanel/schemaChildren/dataChildren/DataTable';

const dummyRowData = [{"header0":"input0", "header1":1}]

const dummyTableProps = {
queries: [{
queryString: "string",
queryData: dummyRowData,
queryStatistics: 7,
querySchema: "string",
queryLabel: "string"
}]
};

describe('Testing the data table', () => {
let wrapper;
beforeAll(() => {
wrapper = mount(<Table { ...dummyTableProps }/>);
})

it('should render Table headers', () => {
expect(wrapper.find('#dataTableHead').type()).toBe('thead');
expect(wrapper.find('#dataTableHead').childAt(0).childAt(0).text()).toBe('HEADER0');
expect(wrapper.find('#dataTableHead').childAt(0).childAt(1).text()).toBe('HEADER1');
})

it('should render data Table body element', () => {
expect(wrapper.find('#dataTableBody').type()).toBe('tbody');
})
})

37 changes: 37 additions & 0 deletions __tests__/rightPanelTests/schemaChildrenTests/dataTest.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import * as React from 'react';
import { shallow } from 'enzyme';
import { Data } from '../../../frontend/components/rightPanel/schemaChildren/Data';


const dummyTableProps = {
queries: [{
queryString: "string",
queryData: [{}],
queryStatistics: 7,
querySchema: "string",
queryLabel: "string"
}]
};

describe ("Data tests", () => {
const { queries } = dummyTableProps;

// shallow render the component before running tests
let wrapper;
beforeAll(() => {
wrapper = shallow(<Data { ...dummyTableProps } />)
})

it('Should render a div', () => {
expect(wrapper.type()).toEqual('div');
})

it('Should render h3 tag', () => {
expect(wrapper.containsMatchingElement(
<h3 id="results-title">Data Table</h3>)).toBeTruthy();
})

it('Should render div to contain the data table', () => {
expect(wrapper.find('#data-table').type()).toBe('div');
})
})
21 changes: 21 additions & 0 deletions __tests__/rightPanelTests/tabsChildrenTests/tabTest.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import * as React from 'react';
import { shallow } from 'enzyme';
import { Tab } from '../../../frontend/components/rightPanel/tabsChildren/Tab';

const dummyTabProps = {
onClickTabItem: 'string',
currentSchema: "string",
label: "string",
};

describe ("Tab tests", () => {
// shallow render the component before running tests
let wrapper;
beforeAll(() => {
wrapper = shallow(<Tab { ...dummyTabProps } />)
})

it('Should render a list item', () => {
expect(wrapper.type()).toEqual('li');
})
})
10 changes: 10 additions & 0 deletions __tests__/setupTests.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { configure } from "enzyme";
import React16Adapter from "enzyme-adapter-react-16";

configure({ adapter: new React16Adapter() });

describe('Setup', () => {
it('should run before all tests', () => {
expect(true).toBe(true);
})
})
35 changes: 35 additions & 0 deletions __tests__/splashTest.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import * as React from "react";
import { Splash } from "../frontend/components/Splash";
import { shallow } from "enzyme";

describe ("Splash page tests", () => {
// mock functions to pass to handlers
const mockFileClick = jest.fn(() => console.log("click"));
const mockSkipClick = jest.fn(() => console.log("skipClick"));
// props to be passed to the shallow render of the component
const props = {
openSplash: true,
handleSkipClick: mockSkipClick,
handleFileClick: mockFileClick
};

let wrapper;
// shallow render the component before running tests
beforeAll(() => {
wrapper = shallow(<Splash {...props}/>)
});

it('should find the correct elements by id', () => {
expect(wrapper.find('#skip_button').type()).toBe('button');
expect(wrapper.find('#yes_button').type()).toBe('button');
});

it('The functions passed down should be invoked on click', () => {
// testing the skip button
wrapper.find('#skip_button').simulate('click');
expect(mockSkipClick).toHaveBeenCalled();
// testing the import button
wrapper.find('#yes_button').simulate('click');
expect(mockFileClick).toHaveBeenCalled();
});
});
12 changes: 12 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
targets: {
node: 'current',
},
},
],
],
};
Loading