Merge bd5c1e4 into 8a9e6ad

openmrs · Oct 23, 2018 · 3130cfc · 3130cfc
2 parents 8a9e6ad + bd5c1e4
commit 3130cfc
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 61 deletions.
diff --git a/src/components/bulkConcepts/component/ActionButtons.jsx b/src/components/bulkConcepts/component/ActionButtons.jsx
@@ -7,7 +7,7 @@ import PreviewCard from './PreviewCard';
 export class ActionButtons extends Component {
   static propTypes = {
     previewConcept: PropTypes.func.isRequired,
-    id: PropTypes.number.isRequired,
+    id: PropTypes.string.isRequired,
     params: PropTypes.shape({
       type: PropTypes.string,
       typeName: PropTypes.string,

diff --git a/src/components/bulkConcepts/component/PreviewCard.jsx b/src/components/bulkConcepts/component/PreviewCard.jsx
@@ -44,11 +44,12 @@ PreviewCard.propTypes = {
   closeModal: PropTypes.func.isRequired,
   addConcept: PropTypes.func.isRequired,
   concept: PropTypes.shape({
-    display_name: PropTypes.string.isRequired,
-    descriptions: PropTypes.array.isRequired,
+    display_name: PropTypes.string,
+    descriptions: PropTypes.array,
     mappings: PropTypes.any,
-    display_locale: PropTypes.string.isRequired,
+    display_locale: PropTypes.string,
   }).isRequired,
 };
 
+
 export default PreviewCard;
diff --git a/src/components/bulkConcepts/container/BulkConceptsPage.jsx b/src/components/bulkConcepts/container/BulkConceptsPage.jsx
@@ -25,7 +25,7 @@ export class BulkConceptsPage extends Component {
     preview: PropTypes.shape({
       url: PropTypes.string,
       display_name: PropTypes.string,
-    }).isRequired,
+    }),
     addConcept: PropTypes.func.isRequired,
     datatypes: PropTypes.array.isRequired,
     previewConcept: PropTypes.func.isRequired,
@@ -39,7 +39,9 @@ export class BulkConceptsPage extends Component {
       }).isRequired,
     }).isRequired,
   };
-
+  static defaultProps = {
+    preview: {},
+  }
   constructor(props) {
     super(props);
     this.state = {
@@ -129,7 +131,7 @@ export class BulkConceptsPage extends Component {
             <SearchBar
               handleSearch={this.handleSearch}
               handleChange={this.handleChange}
-              inputValue={searchInput}
+              searchInput={searchInput}
             />
             <Paginations
               concepts={lastConcept}

diff --git a/src/components/dashboard/components/dictionary/DictionaryContainer.jsx b/src/components/dashboard/components/dictionary/DictionaryContainer.jsx
@@ -13,9 +13,7 @@ export class DictionaryOverview extends Component {
         typeName: propTypes.string,
       }),
     }).isRequired,
-    dictionary: propTypes.objectOf(propTypes.shape({
-      dictionaryName: propTypes.string,
-    })).isRequired,
+    dictionary: propTypes.object.isRequired,
     dictionaryConcepts: propTypes.array.isRequired,
     versions: propTypes.array.isRequired,
     fetchDictionary: propTypes.func.isRequired,

diff --git a/src/components/dashboard/components/dictionary/DictionaryDetailCard.jsx b/src/components/dashboard/components/dictionary/DictionaryDetailCard.jsx
@@ -38,8 +38,6 @@ const DictionaryDetailCard = (props) => {
     openVersionModal,
     handleCreateVersion,
     handleChange,
-    versionId,
-    versionDescription,
     inputLength,
     download,
   } = props;
@@ -83,8 +81,8 @@ const DictionaryDetailCard = (props) => {
               <b>Public Access</b>: {public_access}
             </p>
             {description ? (
-              <p id="desc">
-                <b>Description</b>: {description}
+              <p id="desc">	
+                <b>Description</b>: {description}	
               </p>
             ) : (
               <p><b>Description</b>: No Description</p>
@@ -104,8 +102,6 @@ const DictionaryDetailCard = (props) => {
                 id="editB"
                 to="#"
                 onClick={showEditModal}
-                versionId={versionId}
-                versionDescription={versionDescription}
               >
                 Edit
               </Link>
@@ -161,30 +157,32 @@ const DictionaryDetailCard = (props) => {
             <legend>Released Version</legend>
             <div className="card" id="versionCard">
               <table>
-                <tr>
-                  <th>Version</th>
-                  <th>Date</th>
-                  <th>Actions</th>
-                </tr>
-                {releasedVersions.length >= 1 ? (
-            releasedVersions.map(version => (
-              <DictionaryVersionsTable
-                version={version}
-                key={version.id}
-                hide={hideSubModal}
-                showSubModal={showSubModal}
-                show={subModal}
-                url={subUrl}
-                download={download}
-              />
-            ))
-          ) : (
-            <tr>
-              <td className="version-msg" colSpan="4">
-                No released Versions
-              </td>
-            </tr>
-          )}
+                <tbody>
+                  <tr>
+                    <th>Version</th>
+                    <th>Date</th>
+                    <th>Actions</th>
+                  </tr>
+                  {releasedVersions.length >= 1 ? (
+                    releasedVersions.map(version => (
+                      <DictionaryVersionsTable
+                        version={version}
+                        key={version.id}
+                        hide={hideSubModal}
+                        showSubModal={showSubModal}
+                        show={subModal}
+                        url={subUrl}
+                        download={download}
+                      />
+                    ))
+                  ) : (
+                    <tr>
+                      <td className="version-msg" colSpan="4">
+                        No released Versions
+                      </td>
+                    </tr>
+                  )}
+                </tbody>
               </table>
             </div>
           </fieldset>
@@ -223,8 +221,6 @@ DictionaryDetailCard.propTypes = {
   openVersionModal: PropTypes.bool.isRequired,
   handleCreateVersion: PropTypes.func.isRequired,
   handleChange: PropTypes.func.isRequired,
-  versionId: PropTypes.string.isRequired,
-  versionDescription: PropTypes.string.isRequired,
   inputLength: PropTypes.number.isRequired,
   download: PropTypes.func.isRequired,
 };

diff --git a/src/components/dashboard/components/dictionary/DictionaryVersionsTable.jsx b/src/components/dashboard/components/dictionary/DictionaryVersionsTable.jsx
@@ -18,11 +18,13 @@ const DictionaryVersionsTable = (version) => {
       <td>{id}</td>
       <td>{ (new Date(updated_on)).toLocaleDateString('en-US', DATE_OPTIONS)}</td>
       <td><a href={version_url}>Browse in OCL</a> <Link className="downloadConcepts" onClick={download} to="#">Download</Link> <Link className="subscription-link" onClick={() => { showSubModal(version_url); }} to="#">Subscription URL</Link></td>
-      <SubscriptionModal
-        show={show}
-        click={hide}
-        url={url}
-      />
+      <td className="d-none">
+        <SubscriptionModal
+          show={show}
+          click={hide}
+          url={url}
+        />
+      </td>
     </tr>
   );
 };

diff --git a/src/components/dashboard/components/dictionary/EditDictionary.jsx b/src/components/dashboard/components/dictionary/EditDictionary.jsx
@@ -12,7 +12,7 @@ export class EditDictionary extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      defaultLocaleOption: '',
+      defaultLocaleOption: {},
     };
   }
 

diff --git a/src/components/dashboard/components/dictionary/common/DictionaryModal.jsx b/src/components/dashboard/components/dictionary/common/DictionaryModal.jsx
@@ -361,7 +361,6 @@ export class DictionaryModal extends React.Component {
                     <Select
                       id="copy_dictionary"
                       closeMenuOnSelect={false}
-                      isLoading={this.props.isLoadingDictionaries}
                       options={[...this.props.userDictionaries, ...this.props.dictionaries]}
                       onChange={val => this.handleCopyDictionary(val)}
                       onInputChange={val => this.searchInputValues(val)}
@@ -402,21 +401,24 @@ DictionaryModal.propTypes = {
   submit: PropTypes.func.isRequired,
   organizations: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.string,
-  })).isRequired,
-  dictionary: PropTypes.object.isRequired,
+  })),
+  dictionary: PropTypes.object,
   modalhide: PropTypes.func.isRequired,
-  defaultLocaleOption: PropTypes.object.isRequired,
-  isEditingDictionary: PropTypes.object.isRequired,
+  defaultLocaleOption: PropTypes.object,
+  isEditingDictionary: PropTypes.bool,
   searchDictionaries: PropTypes.func.isRequired,
   dictionaries: PropTypes.array.isRequired,
   userDictionaries: PropTypes.array.isRequired,
-  isLoadingDictionaries: PropTypes.array.isRequired,
 };
 
 DictionaryModal.defaultProps = {
   title: 'Add Dictionary',
   show: false,
   buttonname: 'Add Dictionary',
+  organizations: [],
+  dictionary: {},
+  isEditingDictionary: false,
+  defaultLocaleOption: {},
 };
 
 function mapStateToProps(state) {

diff --git a/src/components/dashboard/components/dictionary/common/ReleaseVersionModal.jsx b/src/components/dashboard/components/dictionary/common/ReleaseVersionModal.jsx
@@ -77,9 +77,14 @@ ReleaseVersionModal.propTypes = {
   click: PropTypes.func.isRequired,
   handleCreateVersion: PropTypes.func.isRequired,
   handleChange: PropTypes.func.isRequired,
-  versionId: PropTypes.string.isRequired,
-  versionDescription: PropTypes.string.isRequired,
+  versionId: PropTypes.string,
+  versionDescription: PropTypes.string,
   inputLength: PropTypes.number.isRequired,
 };
 
+ReleaseVersionModal.defaultProps = {
+  versionId: '',
+  versionDescription: '',
+};
+
 export default ReleaseVersionModal;
diff --git a/src/components/dashboard/components/dictionary/messages/InlineError.jsx b/src/components/dashboard/components/dictionary/messages/InlineError.jsx
@@ -5,7 +5,10 @@ const InlineError = ({ text }) => (
   <div><span id="inline-error"> {text} </span></div>
 );
 InlineError.propTypes = {
-  text: PropTypes.string.isRequired,
+  text: PropTypes.string,
+};
+InlineError.defaultProps = {
+  text: '',
 };
 
 export default InlineError;
diff --git a/src/components/login/container/index.jsx b/src/components/login/container/index.jsx
@@ -49,10 +49,8 @@ export class Login extends Component {
         <Title title="Login" />
         <div className="row form-container">
           <div className="col-lg-5 col-md-9 col-sm-12">
-            <p className="paragraphs">
-              <h1 className="login-title">Open Concept Lab</h1>
-              <h4 className="low-title">for OpenMRS</h4>
-            </p>
+            <h1 className="login-title">Open Concept Lab</h1>
+            <h4 className="low-title">for OpenMRS</h4>
             <h6 className="low-title-msg">
               Use the shared Open Concept Lab to create OpenMRS dictionaries by mixing
               expert-defined content with your own custom concepts.
@@ -72,6 +70,7 @@ export class Login extends Component {
                     value={username.trim()}
                     onChange={this.handleInput}
                   />
+
                 </div>
                 <div className="form-group">
                   <label htmlFor="password">Password</label>