Fix initial value in type selectbox

gramps-project · Jan 5, 2023 · 541a57f · 541a57f
1 parent 496ac80
commit 541a57f
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 23 deletions.
diff --git a/src/components/GrampsjsFilterType.js b/src/components/GrampsjsFilterType.js
@@ -29,6 +29,7 @@ export class GrampsjsFilterType extends GrampsjsTranslateMixin(LitElement) {
       filters: {type: Array},
       label: {type: String},
       types: {type: Object},
+      loadingTypes: {type: Boolean},
       typesLocale: {type: Object},
       typeName: {type: String},
       rule: {type: String},
@@ -42,6 +43,7 @@ export class GrampsjsFilterType extends GrampsjsTranslateMixin(LitElement) {
     this.types = {}
     this.typesLocale = {}
     this.typeName = ''
+    this.loadingTypes = false
     this.rule = 'HasType'
   }
 
@@ -57,6 +59,7 @@ export class GrampsjsFilterType extends GrampsjsTranslateMixin(LitElement) {
         .strings="${this.strings}"
         typeName="${this.typeName}"
         defaultTypeName=""
+        ?loadingTypes=${this.loadingTypes}
         .types="${this.types}"
         .typesLocale="${this.typesLocale}"
         @formdata:changed="${this._handleChange}"

diff --git a/src/components/GrampsjsFormChildRef.js b/src/components/GrampsjsFormChildRef.js
@@ -30,6 +30,7 @@ class GrampsjsFormChildRef extends GrampsjsObjectForm {
         id="child-frel"
         heading="${this._('Relationship to _Father:').replace(':', '')}"
         .strings="${this.strings}"
+        ?loadingTypes=${this.loadingTypes}
         typeName="child_reference_types"
         .types="${this.types}"
         .typesLocale="${this.typesLocale}"
@@ -40,6 +41,7 @@ class GrampsjsFormChildRef extends GrampsjsObjectForm {
         id="child-mrel"
         heading="${this._('Relationship to _Mother:').replace(':', '')}"
         .strings="${this.strings}"
+        ?loadingTypes=${this.loadingTypes}
         typeName="child_reference_types"
         .types="${this.types}"
         .typesLocale="${this.typesLocale}"

diff --git a/src/components/GrampsjsFormEditAttribute.js b/src/components/GrampsjsFormEditAttribute.js
@@ -18,6 +18,7 @@ class GrampsjsFormEditAttribute extends GrampsjsObjectForm {
         heading="${this._('Type')}"
         .strings="${this.strings}"
         typeName="attribute_types"
+        ?loadingTypes=${this.loadingTypes}
         .types="${this.types}"
         .typesLocale="${this.typesLocale}"
         .data="${this.data}"

diff --git a/src/components/GrampsjsFormEditName.js b/src/components/GrampsjsFormEditName.js
@@ -19,6 +19,7 @@ class GrampsjsFormEditName extends GrampsjsObjectForm {
         label="${this._('Name type')}"
         .strings="${this.strings}"
         typeName="name_types"
+        ?loadingTypes=${this.loadingTypes}
         defaultTypeName="Birth Name"
         initialValue=${this.data?.type || ''}
         .types="${this.types}"
@@ -32,6 +33,7 @@ class GrampsjsFormEditName extends GrampsjsObjectForm {
         showMore
         id="name"
         @formdata:changed="${this._handleFormData}"
+        ?loadingTypes=${this.loadingTypes}
         .strings="${this.strings}"
         .data="${this.data}"
         .types="${this.types}"

diff --git a/src/components/GrampsjsFormEditUrl.js b/src/components/GrampsjsFormEditUrl.js
@@ -19,6 +19,7 @@ class GrampsjsFormEditUrl extends GrampsjsObjectForm {
           heading="${this._('Type')}"
           .strings="${this.strings}"
           typeName="url_types"
+          ?loadingTypes=${this.loadingTypes}
           .types="${this.types}"
           .typesLocale="${this.typesLocale}"
           .data="${this.data}"

diff --git a/src/components/GrampsjsFormEventRef.js b/src/components/GrampsjsFormEventRef.js
@@ -30,6 +30,7 @@ class GrampsjsFormEventRef extends GrampsjsObjectForm {
         id="event-role-type"
         .strings="${this.strings}"
         typeName="event_role_types"
+        ?loadingTypes=${this.loadingTypes}
         .types="${this.types}"
         .typesLocale="${this.typesLocale}"
       >

diff --git a/src/components/GrampsjsFormName.js b/src/components/GrampsjsFormName.js
@@ -38,6 +38,7 @@ class GrampsjsFormName extends GrampsjsTranslateMixin(LitElement) {
     return {
       data: {type: Object},
       showMore: {type: Boolean},
+      loadingTypes: {type: Boolean},
       types: {type: Object},
       typesLocale: {type: Object},
       origintype: {type: Boolean},
@@ -50,6 +51,7 @@ class GrampsjsFormName extends GrampsjsTranslateMixin(LitElement) {
     this.showMore = false
     this.types = {}
     this.typesLocale = {}
+    this.loadingTypes = false
     this.origintype = false
   }
 
@@ -110,9 +112,9 @@ class GrampsjsFormName extends GrampsjsTranslateMixin(LitElement) {
         ></grampsjs-form-string>
       </p>
 
-      <h4 class="label ${classMap({hide: !this.showMore})}">${this._(
-      'Surnames'
-    )}</h4>
+      <h4 class="label ${classMap({hide: !this.showMore})}">
+        ${this._('Surnames')}
+      </h4>
 
       ${(this.data.surname_list || [{}]).map(
         (obj, i, arr) => html`
@@ -125,6 +127,7 @@ class GrampsjsFormName extends GrampsjsTranslateMixin(LitElement) {
             .strings="${this.strings}"
             .data="${obj}"
             .types="${this.types}"
+            ?loadingTypes=${this.loadingTypes}
             .typesLocale="${this.typesLocale}"
           >
           </grampsjs-form-surname>
@@ -136,19 +139,17 @@ class GrampsjsFormName extends GrampsjsTranslateMixin(LitElement) {
         <mwc-icon-button
           @click="${this._handleAddSurname}"
           icon="add"
-        ></mwc-button>
+        ></mwc-icon-button>
       </p>
 
-      ${
-        this.showMore
-          ? ''
-          : html`
-    <mwc-icon-button
-      @click="${this._handleShowMore}"
-      icon="more_horiz"
-    ></mwc-button>
-  `
-      }
+      ${this.showMore
+        ? ''
+        : html`
+            <mwc-icon-button
+              @click="${this._handleShowMore}"
+              icon="more_horiz"
+            ></mwc-icon-button>
+          `}
     `
   }
 

diff --git a/src/components/GrampsjsFormNoteRef.js b/src/components/GrampsjsFormNoteRef.js
@@ -25,7 +25,6 @@ class GrampsjsFormNoteRef extends GrampsjsObjectForm {
         label="${this._('Select')}"
         class="edit"
       ></grampsjs-form-select-object-list>
-    </grampsjs-form-select-type>
     `
   }
 }

diff --git a/src/components/GrampsjsFormRepoRef.js b/src/components/GrampsjsFormRepoRef.js
@@ -41,6 +41,7 @@ class GrampsjsFormRepoRef extends GrampsjsObjectForm {
         heading="${this._('Type')}"
         .strings="${this.strings}"
         typeName="source_media_types"
+        ?loadingTypes=${this.loadingTypes}
         defaultTypeName="Book"
         .types="${this.types}"
         .typesLocale="${this.typesLocale}"

diff --git a/src/components/GrampsjsFormSelectType.js b/src/components/GrampsjsFormSelectType.js
@@ -22,7 +22,6 @@ class GrampsjsFormSelectType extends GrampsjsTranslateMixin(LitElement) {
       defaultTypeName: {type: String},
       types: {type: Object},
       typesLocale: {type: Object},
-      disabled: {type: Boolean},
       loadingTypes: {type: Boolean},
       required: {type: Boolean},
       initialValue: {type: String},
@@ -37,7 +36,6 @@ class GrampsjsFormSelectType extends GrampsjsTranslateMixin(LitElement) {
     super()
     this.types = {}
     this.typesLocale = {}
-    this.disabled = false
     this.typeName = ''
     this.heading = ''
     this.label = ''
@@ -70,8 +68,8 @@ class GrampsjsFormSelectType extends GrampsjsTranslateMixin(LitElement) {
       <p>
         <mwc-select
           style="width:100%"
-          ?required=${!this._hasCustomType && !this.nocustom}
-          ?disabled=${this._hasCustomType}
+          ?required=${this.required && !this._hasCustomType && !this.nocustom}
+          ?disabled=${this.loadingTypes || this._hasCustomType}
           validationMessage="${this._('This field is mandatory')}"
           @change="${this.handleChange}"
           label="${this.loadingTypes ? this._('Loading items...') : this.label}"

diff --git a/src/components/GrampsjsFormSurname.js b/src/components/GrampsjsFormSurname.js
@@ -40,6 +40,7 @@ class GrampsjsFormSurname extends GrampsjsTranslateMixin(LitElement) {
       idx: {type: Number},
       types: {type: Object},
       typesLocale: {type: Object},
+      loadingTypes: {type: Boolean},
       origintype: {type: Boolean},
     }
   }
@@ -51,6 +52,7 @@ class GrampsjsFormSurname extends GrampsjsTranslateMixin(LitElement) {
     this.idx = 0
     this.types = {}
     this.typesLocale = {}
+    this.loadingTypes = false
     this.origintype = false
   }
 
@@ -70,6 +72,7 @@ class GrampsjsFormSurname extends GrampsjsTranslateMixin(LitElement) {
                 initialValue=${this.data?.origintype || ''}
                 .types="${this.types}"
                 .typesLocale="${this.typesLocale}"
+                ?loadingTypes=${this.loadingTypes}
                 @formdata:changed="${this._handleFormData}"
               >
               </grampsjs-form-select-type>

diff --git a/src/mixins/GrampsjsNewNoteMixin.js b/src/mixins/GrampsjsNewNoteMixin.js
@@ -19,7 +19,6 @@ export const GrampsjsNewNoteMixin = superClass =>
           id="select-note-type"
           .strings="${this.strings}"
           ?loadingTypes="${this.loadingTypes}"
-          ?disabled="${this.loadingTypes}"
           typeName="note_types"
           defaultTypeName="General"
           .types="${this.types}"

diff --git a/src/views/GrampsjsViewNewEvent.js b/src/views/GrampsjsViewNewEvent.js
@@ -31,7 +31,6 @@ export class GrampsjsViewNewEvent extends GrampsjsViewNewObject {
         id="select-type"
         .strings="${this.strings}"
         ?loadingTypes="${this.loadingTypes}"
-        ?disabled="${this.loadingTypes}"
         typeName="event_types"
         .types="${this.types}"
         .typesLocale="${this.typesLocale}"

diff --git a/src/views/GrampsjsViewNewPlace.js b/src/views/GrampsjsViewNewPlace.js
@@ -41,7 +41,6 @@ export class GrampsjsViewNewPlace extends GrampsjsViewNewObject {
         id="select-place-type"
         .strings="${this.strings}"
         ?loadingTypes="${this.loadingTypes}"
-        ?disabled="${this.loadingTypes}"
         typeName="place_types"
         .types="${this.types}"
         .typesLocale="${this.typesLocale}"

diff --git a/src/views/GrampsjsViewNewRepository.js b/src/views/GrampsjsViewNewRepository.js
@@ -42,7 +42,6 @@ export class GrampsjsViewNewRepository extends GrampsjsViewNewObject {
         id="select-repository-type"
         .strings="${this.strings}"
         ?loadingTypes="${this.loadingTypes}"
-        ?disabled="${this.loadingTypes}"
         typeName="repository_types"
         .types="${this.types}"
         .typesLocale="${this.typesLocale}"