Merge pull request #1303 from syucream/fix/1pw

Stop to show 1password shortcut
dmm-com · Oct 25, 2024 · c13b79a · c13b79a
2 parents 7703561 + deb538b
commit c13b79a
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 6 deletions.
diff --git a/frontend/src/components/entity/entityForm/BasicFields.tsx b/frontend/src/components/entity/entityForm/BasicFields.tsx
@@ -66,6 +66,7 @@ export const BasicFields: FC<Props> = ({ control }) => {
                     helperText={error?.message}
                     size="small"
                     fullWidth
+                    inputProps={{ "data-1p-ignore": true }}
                   />
                 )}
               />

diff --git a/frontend/src/components/entry/EntryForm.tsx b/frontend/src/components/entry/EntryForm.tsx
@@ -139,6 +139,7 @@ export const EntryForm: FC<EntryFormProps> = ({
                     error={error != null}
                     helperText={error?.message}
                     fullWidth
+                    inputProps={{ "data-1p-ignore": true }}
                   />
                 )}
               />

diff --git a/frontend/src/components/group/GroupForm.tsx b/frontend/src/components/group/GroupForm.tsx
@@ -74,6 +74,7 @@ export const GroupForm: FC<Props> = ({ control, setValue, groupId }) => {
                     error={error != null}
                     helperText={error?.message}
                     sx={{ width: "100%" }}
+                    inputProps={{ "data-1p-ignore": true }}
                   />
                 )}
               />

diff --git a/frontend/src/components/role/RoleForm.tsx b/frontend/src/components/role/RoleForm.tsx
@@ -92,6 +92,7 @@ export const RoleForm: FC<Props> = ({ control, setValue }) => {
                       error={error != null}
                       helperText={error?.message}
                       sx={{ width: "100%" }}
+                      inputProps={{ "data-1p-ignore": true }}
                     />
                   )}
                 />

diff --git a/frontend/src/pages/__snapshots__/EntityEditPage.test.tsx.snap b/frontend/src/pages/__snapshots__/EntityEditPage.test.tsx.snap
@@ -210,6 +210,7 @@ exports[`EditEntityPage should match snapshot 1`] = `
                         <input
                           aria-invalid="false"
                           class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall css-1n4twyu-MuiInputBase-input-MuiOutlinedInput-input"
+                          data-1p-ignore="true"
                           id="entity-name"
                           name="name"
                           placeholder="モデル名"
@@ -773,6 +774,7 @@ exports[`EditEntityPage should match snapshot 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input MuiOutlinedInput-input MuiInputBase-inputSizeSmall css-1n4twyu-MuiInputBase-input-MuiOutlinedInput-input"
+                        data-1p-ignore="true"
                         id="entity-name"
                         name="name"
                         placeholder="モデル名"

diff --git a/frontend/src/pages/__snapshots__/GroupEditPage.test.tsx.snap b/frontend/src/pages/__snapshots__/GroupEditPage.test.tsx.snap
@@ -179,6 +179,7 @@ exports[`EditGroupPage should match snapshot 1`] = `
                         <input
                           aria-invalid="false"
                           class="MuiInputBase-input MuiInput-input css-1x51dt5-MuiInputBase-input-MuiInput-input"
+                          data-1p-ignore="true"
                           id=":r0:"
                           name="name"
                           placeholder="グループ名"
@@ -613,6 +614,7 @@ exports[`EditGroupPage should match snapshot 1`] = `
                       <input
                         aria-invalid="false"
                         class="MuiInputBase-input MuiInput-input css-1x51dt5-MuiInputBase-input-MuiInput-input"
+                        data-1p-ignore="true"
                         id=":r0:"
                         name="name"
                         placeholder="グループ名"

diff --git a/frontend/src/pages/__snapshots__/RoleEditPage.test.tsx.snap b/frontend/src/pages/__snapshots__/RoleEditPage.test.tsx.snap
@@ -174,6 +174,7 @@ exports[`EditRolePage should match snapshot 1`] = `
                           <input
                             aria-invalid="false"
                             class="MuiInputBase-input MuiInput-input css-1x51dt5-MuiInputBase-input-MuiInput-input"
+                            data-1p-ignore="true"
                             id=":r0:"
                             name="name"
                             placeholder="ロール名"
@@ -815,6 +816,7 @@ exports[`EditRolePage should match snapshot 1`] = `
                         <input
                           aria-invalid="false"
                           class="MuiInputBase-input MuiInput-input css-1x51dt5-MuiInputBase-input-MuiInput-input"
+                          data-1p-ignore="true"
                           id=":r0:"
                           name="name"
                           placeholder="ロール名"

diff --git a/templates/edit_entity_content.html b/templates/edit_entity_content.html
@@ -8,7 +8,7 @@
       <table class="table table-bordered">
         <tr>
           <td>エンティティ名</td>
-          <td><input type="text" name="name" value="{{ entity.name }}" /></td>
+          <td><input type="text" name="name" value="{{ entity.name }}" data-1p-ignore /></td>
         </tr>
         <tr>
           <td>備考</td>

diff --git a/templates/edit_entry/attrs.html b/templates/edit_entry/attrs.html
@@ -96,7 +96,7 @@
 
         {% if attr.type|bitwise_and:attr_type_value_named %}
           <div class='col-3'>
-            <input type='text' class='form-control referral_key' attr_id="{{ attr.id }}" entity_attr_id="{{ attr.entity_attr_id }}" value="{{ attr.last_value.value }}" enabled="True" index="0"></input>
+            <input type='text' class='form-control referral_key' attr_id="{{ attr.id }}" entity_attr_id="{{ attr.entity_attr_id }}" value="{{ attr.last_value.value }}" enabled="True" index="0" data-1p-ignore></input>
           </div>
           <div class='col-9'>
         {% else %}
@@ -183,7 +183,7 @@
     </div>
     {% else %}
 
-      <input type="text" class="form-control attr_value" attr_id="{{ attr.id }}" entity_attr_id="{{ attr.entity_attr_id }}" enabled="True" value="{{ attr.last_value }}" {%if attr.is_mandatory%}mandatory="true"{%endif%}/>
+      <input type="text" class="form-control attr_value" attr_id="{{ attr.id }}" entity_attr_id="{{ attr.entity_attr_id }}" enabled="True" value="{{ attr.last_value }}" {%if attr.is_mandatory%}mandatory="true"{%endif%} data-1p-ignore/>
 
     {% endif %}
   {% endif %}

diff --git a/templates/edit_entry/content.html b/templates/edit_entry/content.html
@@ -9,7 +9,7 @@
         <tr>
           <td>エントリ名</td>
           <td>
-            <input type="text" class="form-control" name="entry_name" pattern="^(?!\s*$).+" title="有効なエントリ名(空白のみは不許可)" value="{{ entry.name }}" required />
+            <input type="text" class="form-control" name="entry_name" pattern="^(?!\s*$).+" title="有効なエントリ名(空白のみは不許可)" value="{{ entry.name }}" required data-1p-ignore />
           {% if entry.is_deleted %}
             [削除済]
           {% elif entry.status|bitwise_and:STATUS_ENTRY.EDITING %}

diff --git a/templates/edit_group.html b/templates/edit_group.html
@@ -25,7 +25,7 @@
   <div class="form-row">
     <div class="form-group col-md-11">
       <label class="col-form-label">グループ名</label>
-      <input type="text" name="name" class="form-control" id="group-name" value="{{ current_group_name }}"/>
+      <input type="text" name="name" class="form-control" id="group-name" value="{{ current_group_name }}" data-1p-ignore />
     </div>
   </div>
   <div class="form-row">

diff --git a/templates/role/create.html b/templates/role/create.html
@@ -22,7 +22,7 @@
   <div class="form-row">
     <div class="form-group col-md-11">
       <input type="text" name="name" class="form-control" id="role_name"
-       value="{{ name }}" placeholder="ロール名"/>
+       value="{{ name }}" placeholder="ロール名" data-1p-ignore />
       <div class='invalid-feedback role_name'></div>
     </div>
     <div class="form-group col-md-1">