b5b563e9-0de8-4bc4-bd8c-aed975b4aaac

Build # b5b563e9-0de8-4bc4-bd8c-aed975b4aaac

Build Type

circle-ci

Committed by kdid

Commit Message

parent 98496f669 author Adam Arling <adam.arling@northwestern.edu> 1570116427 -0500 committer Karen Shaw Didrickson <karendid@gmail.com> 1570461808 -0500

Pull Request Pull Request #230: 290 ingest sheet refactor based on status

Run Details

45 of 146 branches covered (30.82%)

Branch coverage included in aggregate %.

28 of 64 new or added lines in 8 files covered. (43.75%)

4 existing lines in 1 file now uncovered.

538 of 817 relevant lines covered (65.85%)

6.26 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

4.55

/assets/js/components/IngestSheet/Report.jsx

import React from "react";
import PropTypes from "prop-types";
import { useQuery } from "@apollo/react-hooks";
import Error from "../UI/Error";
import Loading from "../UI/Loading";
import IngestSheetErrorsState from "./ErrorsState";
import IngestSheetUnapprovedState from "./UnapprovedState";
import {
  GET_INGEST_SHEET_ERRORS,
  GET_INGEST_SHEET_VALIDATIONS
} from "./ingestSheet.query";

function IngestSheetReport({ ingestSheetId, progress, status }) {
  const sheetHasErrors = () => {
    return ["FILE_FAIL", "ROW_FAIL"].indexOf(status) > -1;
  };

  const { loading, error, data } = useQuery(
    sheetHasErrors() ? GET_INGEST_SHEET_ERRORS : GET_INGEST_SHEET_VALIDATIONS,
    {
      variables: { ingestSheetId },
      fetchPolicy: "network-only"
    }
  );

  if (loading) return <Loading />;
  if (error) return <Error error={error} />;

  const ingestSheetRows = data.ingestSheetRows;

  {
    /* Don't show if sheet isn't complete */
  }
  if (progress.percentComplete === 0) {
    return null;
  }

  if (sheetHasErrors()) {
    return <IngestSheetErrorsState validations={ingestSheetRows} />;
  } else {
    return (
      <>
        <IngestSheetUnapprovedState validations={ingestSheetRows} />
      </>
    );
  }
}

IngestSheetReport.propTypes = {
  ingestSheetId: PropTypes.string.isRequired,
  progress: PropTypes.object.isRequired,
  status: PropTypes.string
};

export default IngestSheetReport;

1	import React from "react";
2	import PropTypes from "prop-types";
3	import { useQuery } from "@apollo/react-hooks";
4	import Error from "../UI/Error";
5	import Loading from "../UI/Loading";
6	import IngestSheetErrorsState from "./ErrorsState";
7	import IngestSheetUnapprovedState from "./UnapprovedState";
8	import {
9	GET_INGEST_SHEET_ERRORS,
10	GET_INGEST_SHEET_VALIDATIONS
11	} from "./ingestSheet.query";
12
13	function IngestSheetReport({ ingestSheetId, progress, status }) {
14	const sheetHasErrors = () => {	×
NEW 15	return ["FILE_FAIL", "ROW_FAIL"].indexOf(status) > -1;	×
16	};
17
18	const { loading, error, data } = useQuery(	×
19	sheetHasErrors() ? GET_INGEST_SHEET_ERRORS : GET_INGEST_SHEET_VALIDATIONS,	×
20	{
21	variables: { ingestSheetId },
22	fetchPolicy: "network-only"
23	}
24	);
25
26	if (loading) return <Loading />;	×
27	if (error) return <Error error={error} />;	×
28
29	const ingestSheetRows = data.ingestSheetRows;	×
30
31	{
32	/* Don't show if sheet isn't complete */
33	}
34	if (progress.percentComplete === 0) {	×
35	return null;	×
36	}
37
38	if (sheetHasErrors()) {	×
39	return <IngestSheetErrorsState validations={ingestSheetRows} />;	×
40	} else {
41	return (	×
42	<>
43	<IngestSheetUnapprovedState validations={ingestSheetRows} />
44	</>
45	);
46	}
47	}
48
49	IngestSheetReport.propTypes = {	3✔
50	ingestSheetId: PropTypes.string.isRequired,
51	progress: PropTypes.object.isRequired,
52	status: PropTypes.string
53	};
54
55	export default IngestSheetReport;

nulib / meadow / b5b563e9-0de8-4bc4-bd8c-aed975b4aaac

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous