Skip to content

Commit 54c1858

Browse files
authored
Refactored shared components and styles (#263)
1 parent 3dfc074 commit 54c1858

55 files changed

Lines changed: 427 additions & 632 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

snprc_ehr/src/client/BirthRecordReport/BirthRecordReport.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import AnimalSelectionPanel from './components/AnimalSelectionPanel'
99
import fetchNewAnimalData from './api/fetchNewAnimalData'
1010
import SummaryGridPanel from './components/SummaryGridPanel'
1111
import { getReportPath } from './services/printToPDF'
12-
import InfoPanel from './components/InfoPanel'
12+
import InfoPanel from '../Shared/components/InfoPanel'
1313

1414
export default class BirthRecordReport extends React.Component {
1515
state = new BirthRecordState();

snprc_ehr/src/client/BirthRecordReport/api/__mocks__/api.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

snprc_ehr/src/client/BirthRecordReport/api/fetchNewAnimalData.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Filter } from '@labkey/api'
22
import moment from 'moment'
3-
import { request } from './api'
3+
import { request } from '../../Shared/api/api'
44

55
const parse = rows => {
66
return rows.map(({ data }) => {
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import "../../styles/style";
2-
@import "./components/wizard";
3-
@import "./components/panels";
4-
@import "./components/infoPanel";
5-
@import "./components/shared";
6-
@import "./components//summaryGridPanel"
1+
@import "../../Shared/styles/style";
2+
@import "../../Shared/styles/components/shared";
3+
@import "../../shared/styles/formatting/wizard";
4+
@import "../../shared/styles/formatting/panels";
5+
@import "../../Shared/styles/components/infoPanel";
6+
@import "../../Shared/styles/components/summaryGridPanel";

snprc_ehr/src/client/BirthRecordReport/tests/BirthRecordReport.test.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import React from 'react'
44
import { shallow } from 'enzyme'
55
import Select from 'react-select'
66
import BirthRecordReport from '../BirthRecordReport'
7-
import { request } from '../api/api'
7+
import { request } from '../../Shared/api/api'
88
import data from './fixtures/testData'
99

10-
jest.mock('../api/api')
10+
jest.mock('../../Shared/api/api')
1111

1212
let wrapper
1313

snprc_ehr/src/client/NewAnimalPage/NewAnimalPage.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import LocationPanel from './components/LocationPanel'
2525
import AccountPanel from './components/AccountPanel'
2626
import DietPanel from './components/DietPanel'
2727
import SpeciesPanel from './components/SpeciesPanel'
28-
import InfoPanel from './components/InfoPanel'
28+
import InfoPanel from '../Shared/components/InfoPanel'
2929
import SummaryGridPanel from './components/SummaryGridPanel'
3030
import CancelChangeModal from './components/CancelChangeModal'
3131
import SaveModal from './components/SaveModal'

snprc_ehr/src/client/NewAnimalPage/api/api.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

snprc_ehr/src/client/NewAnimalPage/api/fetchAccounts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { request } from './api'
1+
import { request } from '../../Shared/api/api'
22

33
const parse = rows => {
44
return rows.map(({ data }, key) => {

snprc_ehr/src/client/NewAnimalPage/api/fetchAcquisitionTypes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Filter } from '@labkey/api'
2-
import { request } from './api'
2+
import { request } from '../../Shared/api/api'
33

44
const parse = rows => {
55
return rows.map(({ data }, key) => {

snprc_ehr/src/client/NewAnimalPage/api/fetchBdStatus.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { request } from './api'
1+
import { request } from '../../Shared/api/api'
22

33
const parse = rows => {
44
return rows.map(({ data }, key) => {

0 commit comments

Comments
 (0)