Merge pull request #42 from /issues/41-load-record-form-in-user-role

Issues/41 load record form in user role
kbss-cvut · Dec 12, 2023 · 3596605 · 3596605
2 parents d2a7240 + 792a0a9
commit 3596605
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/js/components/record/Record.js b/js/components/record/Record.js
@@ -41,6 +41,11 @@ class Record extends React.Component {
     render() {
         const {recordLoaded, recordSaved, showAlert, record, formTemplate, currentUser} = this.props;
 
+        if (!record?.formTemplate) {
+            if (formTemplate) {
+                record.formTemplate = formTemplate;
+            }
+        }
         if (recordLoaded.status === ACTION_STATUS.ERROR) {
             return <AlertMessage type={ALERT_TYPES.DANGER}
                                  message={this.props.formatMessage('record.load-error', {error: this.props.recordLoaded.error.message})}/>;
@@ -59,7 +64,7 @@ class Record extends React.Component {
                     {this._showInstitution() && this._renderInstitution()}
                     <RecordProvenance record={record}/>
                 </form>
-                {record.formTemplate && this._renderForm()}
+                {this._renderForm()}
                 {this._renderButtons()}
                 {showAlert && recordSaved.status === ACTION_STATUS.ERROR &&
                 <div>

diff --git a/js/components/record/RecordForm.js b/js/components/record/RecordForm.js
@@ -125,7 +125,7 @@ class RecordForm extends React.Component {
             return <Loader/>;
         }
 
-        return <SForms
+        return !!this.state.form && <SForms
             ref={this.refForm}
             form={this.state.form}
             formData={this.props.record.question}

diff --git a/js/components/record/RequiredAttributes.js b/js/components/record/RequiredAttributes.js
@@ -24,16 +24,6 @@ class RequiredAttributes extends React.Component {
         this.i18n = this.props.i18n;
     }
 
-    componentDidMount() {
-        const {record, formTemplate} = this.props;
-
-        if (!record.formTemplate) {
-            if (formTemplate) {
-                record.formTemplate = formTemplate;
-            }
-        }
-    }
-
     render() {
         const {record, formTemplate} = this.props;
         const possibleValuesEndpoint = `${API_URL}/rest/formGen/formTemplates`;