Merge pull request #115 from frontside-folio/jc/stripes-1.0

Use stripes 1.0
folio-org · Oct 4, 2018 · 18b7dc0 · 18b7dc0
2 parents d077a05 + cca9093
commit 18b7dc0
Show file tree

Hide file tree

Showing 20 changed files with 84 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,10 @@
 # Change history for ui-circulation
 
-## 1.3.0 IN PROGRESS
+## 1.3.0 (https://github.com/folio-org/ui-circulation/tree/v1.3.0) (2018-10-04)
+[Full Changelog](https://github.com/folio-org/ui-circulation/compare/v1.2.0...v1.3.0)
 
 * Update `stripes-form` dependency to v1.0.0
+* Use `stripes` 1.0 framework
 
 ## 1.2.0 (https://github.com/folio-org/ui-circulation/tree/v1.2.0) (2017-09-12)
 [Full Changelog](https://github.com/folio-org/ui-circulation/compare/v1.1.1...v1.2.0)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@folio/circulation",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Circulation manager",
   "repository": "folio-org/ui-circulation",
   "publishConfig": {
@@ -112,10 +112,8 @@
   },
   "devDependencies": {
     "@folio/eslint-config-stripes": "^3.2.1",
+    "@folio/stripes": "^1.0.0",
     "@folio/stripes-cli": "^1.4.0",
-    "@folio/stripes-connect": "^3.1.2",
-    "@folio/stripes-core": "^2.11.0",
-    "@folio/stripes-logger": "^0.0.2",
     "babel-eslint": "^9.0.0",
     "eslint": "^5.5.0",
     "react": "^16.5.0",
@@ -124,9 +122,6 @@
     "redux": "^4.0.0"
   },
   "dependencies": {
-    "@folio/stripes-components": "^3.0.8",
-    "@folio/stripes-form": "^1.0.0",
-    "@folio/stripes-smart-components": "^1.8.0",
     "html-to-react": "^1.3.3",
     "isomorphic-fetch": "^2.2.1",
     "lodash": "^4.17.4",
@@ -140,8 +135,7 @@
     "redux-form": "^7.0.3"
   },
   "peerDependencies": {
-    "@folio/stripes-connect": "^3.1.0",
-    "@folio/stripes-core": "^2.11.0",
+    "@folio/stripes": "^1.0.0",
     "react": "*"
   }
 }
diff --git a/settings/CheckoutSettings.js b/settings/CheckoutSettings.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import _ from 'lodash';
-import { stripesShape } from '@folio/stripes-core/src/Stripes';
-import ConfigManager from '@folio/stripes-smart-components/lib/ConfigManager';
+import { stripesShape } from '@folio/stripes/core';
+import { ConfigManager } from '@folio/stripes/smart-components';
 
 import { patronIdentifierTypes } from '../constants';
 import CheckoutSettingsForm from './CheckoutSettingsForm';

diff --git a/settings/CheckoutSettingsForm.js b/settings/CheckoutSettingsForm.js
@@ -1,15 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import { stripesShape } from '@folio/stripes-core/src/Stripes';
-import { Row, Col } from '@folio/stripes-components/lib/LayoutGrid';
-import Button from '@folio/stripes-components/lib/Button';
-import Checkbox from '@folio/stripes-components/lib/Checkbox';
-import TextField from '@folio/stripes-components/lib/TextField';
-import stripesForm from '@folio/stripes-form';
-import Pane from '@folio/stripes-components/lib/Pane';
+import { stripesShape } from '@folio/stripes/core';
+import { Button, Checkbox, Col, Pane, Row, Select, TextField } from '@folio/stripes/components';
+import stripesForm from '@folio/stripes/form';
 import { Field, FieldArray, getFormValues } from 'redux-form';
-import Select from '@folio/stripes-components/lib/Select';
+
 import { patronIdentifierTypes } from '../constants';
 import css from './CheckoutSettingsForm.css';
 

diff --git a/settings/FixedDueDateScheduleDetail.js b/settings/FixedDueDateScheduleDetail.js
@@ -2,11 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import _ from 'lodash';
 import { FormattedMessage } from 'react-intl';
-import { Accordion, ExpandAllButton } from '@folio/stripes-components/lib/Accordion';
-import { stripesShape } from '@folio/stripes-core/src/Stripes';
-import KeyValue from '@folio/stripes-components/lib/KeyValue';
-import { Row, Col } from '@folio/stripes-components/lib/LayoutGrid';
-import ViewMetaData from '@folio/stripes-smart-components/lib/ViewMetaData';
+import { Accordion, Col, ExpandAllButton, KeyValue, Row } from '@folio/stripes/components';
+import { stripesShape } from '@folio/stripes/core';
+import { ViewMetaData } from '@folio/stripes/smart-components';
 import css from './FixedDueDateSchedule.css';
 
 class FixedDueDateScheduleDetail extends React.Component {

diff --git a/settings/FixedDueDateScheduleForm.js b/settings/FixedDueDateScheduleForm.js
@@ -3,21 +3,25 @@ import _ from 'lodash';
 import PropTypes from 'prop-types';
 import { Field, FieldArray } from 'redux-form';
 import { FormattedMessage } from 'react-intl';
-import { stripesShape } from '@folio/stripes-core/src/Stripes';
-import Button from '@folio/stripes-components/lib/Button';
-import { Row, Col } from '@folio/stripes-components/lib/LayoutGrid';
-import Datepicker from '@folio/stripes-components/lib/Datepicker';
-import TextField from '@folio/stripes-components/lib/TextField';
-import TextArea from '@folio/stripes-components/lib/TextArea';
-import Icon from '@folio/stripes-components/lib/Icon';
-import { Accordion, ExpandAllButton } from '@folio/stripes-components/lib/Accordion';
-import IfPermission from '@folio/stripes-components/lib/IfPermission';
-import Pane from '@folio/stripes-components/lib/Pane';
-import Paneset from '@folio/stripes-components/lib/Paneset';
-import PaneMenu from '@folio/stripes-components/lib/PaneMenu';
-import stripesForm from '@folio/stripes-form';
-import ConfirmationModal from '@folio/stripes-components/lib/ConfirmationModal';
-import ViewMetaData from '@folio/stripes-smart-components/lib/ViewMetaData';
+import { stripesShape } from '@folio/stripes/core';
+import {
+  Accordion,
+  Button,
+  Col,
+  ConfirmationModal,
+  Datepicker,
+  ExpandAllButton,
+  Icon,
+  IfPermission,
+  Pane,
+  PaneMenu,
+  Paneset,
+  Row,
+  TextArea,
+  TextField,
+} from '@folio/stripes/components';
+import stripesForm from '@folio/stripes/form';
+import { ViewMetaData } from '@folio/stripes/smart-components';
 import css from './FixedDueDateSchedule.css';
 
 class FixedDueDateScheduleForm extends React.Component {

diff --git a/settings/FixedDueDateScheduleManager.js b/settings/FixedDueDateScheduleManager.js
@@ -2,8 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import _ from 'lodash';
 import moment from 'moment';
-import { stripesShape } from '@folio/stripes-core/src/Stripes';
-import EntryManager from '@folio/stripes-smart-components/lib/EntryManager';
+import { stripesShape } from '@folio/stripes/core';
+import { EntryManager } from '@folio/stripes/smart-components';
 import FixedDueDateScheduleDetail from './FixedDueDateScheduleDetail';
 import FixedDueDateScheduleForm from './FixedDueDateScheduleForm';
 

diff --git a/settings/LoanPolicyDetail.js b/settings/LoanPolicyDetail.js
@@ -1,11 +1,9 @@
 import _ from 'lodash';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { stripesShape } from '@folio/stripes-core/src/Stripes';
-import KeyValue from '@folio/stripes-components/lib/KeyValue';
-import { Row, Col } from '@folio/stripes-components/lib/LayoutGrid';
-import { Accordion, ExpandAllButton } from '@folio/stripes-components/lib/Accordion';
-import ViewMetaData from '@folio/stripes-smart-components/lib/ViewMetaData';
+import { stripesShape } from '@folio/stripes/core';
+import { Accordion, Col, ExpandAllButton, KeyValue, Row } from '@folio/stripes/components';
+import { ViewMetaData } from '@folio/stripes/smart-components';
 import { FormattedMessage } from 'react-intl';
 
 import {

diff --git a/settings/LoanPolicyForm.js b/settings/LoanPolicyForm.js
@@ -2,14 +2,18 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Field, getFormValues } from 'redux-form';
 import _ from 'lodash';
-import { stripesShape } from '@folio/stripes-core/src/Stripes';
-import Checkbox from '@folio/stripes-components/lib/Checkbox';
-import { Row, Col } from '@folio/stripes-components/lib/LayoutGrid';
-import Select from '@folio/stripes-components/lib/Select';
-import TextField from '@folio/stripes-components/lib/TextField';
-import TextArea from '@folio/stripes-components/lib/TextArea';
-import { Accordion, ExpandAllButton } from '@folio/stripes-components/lib/Accordion';
-import ViewMetaData from '@folio/stripes-smart-components/lib/ViewMetaData';
+import { stripesShape } from '@folio/stripes/core';
+import {
+  Accordion,
+  Checkbox,
+  Col,
+  ExpandAllButton,
+  Row,
+  Select,
+  TextArea,
+  TextField
+} from '@folio/stripes/components';
+import { ViewMetaData } from '@folio/stripes/smart-components';
 import { FormattedMessage } from 'react-intl';
 
 import {

diff --git a/settings/LoanPolicySettings.js b/settings/LoanPolicySettings.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import _ from 'lodash';
-import { stripesShape } from '@folio/stripes-core/src/Stripes';
-import EntryManager from '@folio/stripes-smart-components/lib/EntryManager';
+import { stripesShape } from '@folio/stripes/core';
+import { EntryManager } from '@folio/stripes/smart-components';
 import LoanPolicyDetail from './LoanPolicyDetail';
 import LoanPolicyForm from './LoanPolicyForm';
 import { loanProfileMap, renewFromIds } from '../constants';

diff --git a/settings/LoanRules.js b/settings/LoanRules.js
@@ -1,9 +1,8 @@
 import { kebabCase } from 'lodash';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Paneset, Pane } from '@folio/stripes-components';
+import { Callout, Paneset, Pane } from '@folio/stripes/components';
 import fetch from 'isomorphic-fetch';
-import Callout from '@folio/stripes-components/lib/Callout';
 
 import LoanRulesForm from './lib/RuleEditor/LoanRulesForm';
 

diff --git a/settings/RequestCancellationReasons.js b/settings/RequestCancellationReasons.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ControlledVocab from '@folio/stripes-smart-components/lib/ControlledVocab';
+import { ControlledVocab } from '@folio/stripes/smart-components';
 
 class RequestCancellationReasons extends React.Component {
   static propTypes = {

diff --git a/settings/StaffSlips/PreviewModal.js b/settings/StaffSlips/PreviewModal.js
@@ -4,10 +4,7 @@ import PropTypes from 'prop-types';
 import Barcode from 'react-barcode';
 import HtmlToReact, { Parser } from 'html-to-react';
 import ReactToPrint from 'react-to-print';
-import { Row, Col } from '@folio/stripes-components/lib/LayoutGrid';
-import Button from '@folio/stripes-components/lib/Button';
-import Modal from '@folio/stripes-components/lib/Modal';
-
+import { Button, Col, Modal, Row } from '@folio/stripes/components';
 import formats from './formats';
 import { template } from './util';
 

diff --git a/settings/StaffSlips/StaffSlipDetail.js b/settings/StaffSlips/StaffSlipDetail.js
@@ -1,9 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import KeyValue from '@folio/stripes-components/lib/KeyValue';
+import { Button, Col, KeyValue, Row } from '@folio/stripes/components';
 import HtmlToReact, { Parser } from 'html-to-react';
-import Button from '@folio/stripes-components/lib/Button';
-import { Row, Col } from '@folio/stripes-components/lib/LayoutGrid';
 
 import formats from './formats';
 import PreviewModal from './PreviewModal';

diff --git a/settings/StaffSlips/StaffSlipEditor.css b/settings/StaffSlips/StaffSlipEditor.css
@@ -1,5 +1,11 @@
+@import '@folio/stripes-components/lib/variables';
+
 .preview {
   justify-content: flex-end;
   padding-right: 5px;
   margin-bottom: 5px;
 }
+
+.label {
+  font-size: var(--font-size-small);
+}
diff --git a/settings/StaffSlips/StaffSlipEditor.js b/settings/StaffSlips/StaffSlipEditor.js
@@ -1,9 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ReactQuill from 'react-quill';
-import { Row, Col } from '@folio/stripes-components/lib/LayoutGrid';
-import Button from '@folio/stripes-components/lib/Button';
-import formCss from '@folio/stripes-components/lib/sharedStyles/form.css';
+import { Button, Col, Row } from '@folio/stripes/components';
 
 // eslint-disable-next-line import/no-webpack-loader-syntax
 import '!style-loader!css-loader!react-quill/dist/quill.snow.css';
@@ -107,7 +105,7 @@ class StaffSlipEditor extends Component {
           <Col xs={12}>
             <Row bottom="xs">
               <Col xs={9}>
-                <label htmlFor="editor" className={formCss.label}>{label}</label>
+                <label htmlFor="editor" className={css.label}>{label}</label>
               </Col>
               <Col xs={3}>
                 <Row className={css.preview}>

diff --git a/settings/StaffSlips/StaffSlipForm.js b/settings/StaffSlips/StaffSlipForm.js
@@ -1,18 +1,20 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Pane from '@folio/stripes-components/lib/Pane';
-import KeyValue from '@folio/stripes-components/lib/KeyValue';
-import Checkbox from '@folio/stripes-components/lib/Checkbox';
-// eslint-disable-next-line import/no-unused-vars
-import TextArea from '@folio/stripes-components/lib/TextArea';
-import Button from '@folio/stripes-components/lib/Button';
-import Paneset from '@folio/stripes-components/lib/Paneset';
-import PaneMenu from '@folio/stripes-components/lib/PaneMenu';
-import IconButton from '@folio/stripes-components/lib/IconButton';
-import Icon from '@folio/stripes-components/lib/Icon';
 
-import { Row, Col } from '@folio/stripes-components/lib/LayoutGrid';
-import stripesForm from '@folio/stripes-form';
+import {
+  Button,
+  Checkbox,
+  Col,
+  Icon,
+  IconButton,
+  KeyValue,
+  Pane,
+  PaneMenu,
+  Paneset,
+  Row,
+  TextArea
+} from '@folio/stripes/components';
+import stripesForm from '@folio/stripes/form';
 import { Field } from 'redux-form';
 
 import StaffSlipEditor from './StaffSlipEditor';

diff --git a/settings/StaffSlips/StaffSlipManager.js b/settings/StaffSlips/StaffSlipManager.js
@@ -1,7 +1,7 @@
 import { sortBy } from 'lodash';
 import React from 'react';
 import PropTypes from 'prop-types';
-import EntryManager from '@folio/stripes-smart-components/lib/EntryManager';
+import { EntryManager } from '@folio/stripes/smart-components';
 
 import StaffSlipDetail from './StaffSlipDetail';
 import StaffSlipForm from './StaffSlipForm';

diff --git a/settings/index.js b/settings/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { Settings } from '@folio/stripes-smart-components';
-import { stripesShape } from '@folio/stripes-core/src/Stripes';
+import { Settings } from '@folio/stripes/smart-components';
+import { stripesShape } from '@folio/stripes/core';
 
 import LoanPolicySettings from './LoanPolicySettings';
 import LoanRules from './LoanRules';

diff --git a/settings/lib/RuleEditor/LoanRulesForm.js b/settings/lib/RuleEditor/LoanRulesForm.js
@@ -4,9 +4,9 @@ import {
   Col,
   Button,
   TextField
-} from '@folio/stripes-components';
+} from '@folio/stripes/components';
 import { Field } from 'redux-form';
-import stripesForm from '@folio/stripes-form';
+import stripesForm from '@folio/stripes/form';
 
 import LoanRulesField from './LoanRulesField';