From 9cc4bfac58b901b32c58d36ffab3585645f79be5 Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Fri, 16 Jun 2023 08:22:10 -0400
Subject: [PATCH] Fix popover attributes in member add dialog

Using popovers in the member table is broken in chrome 114, because of
their new "popover" feature.

Closes-Bug: #2024188
Change-Id: Idb009295495c1d8c732e792a72d58912e0e8d3a7
---
 .../project/lbaasv2/workflow/members/members.html      | 10 +++++-----
 .../fix-chrome-member-dialog-154981a7794d5fb4.yaml     |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/fix-chrome-member-dialog-154981a7794d5fb4.yaml

diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html
index 022d86a0..19827864 100644
--- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html
+++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/members/members.html
@@ -54,7 +54,7 @@
                        ng-required="true" ng-disabled="row.allocatedMember"
                        popover-placement="top" popover-append-to-body="true"
                        popover-trigger="focus"
-                       ng-attr-popover="{$ memberDetailsForm[row.id + '-address'].$invalid && memberDetailsForm[row.id + '-address'].$dirty ? ctrl.ipError : '' $}">
+                       uib-popover="{$ memberDetailsForm[row.id + '-address'].$invalid && memberDetailsForm[row.id + '-address'].$dirty ? ctrl.ipError : '' $}">
               </div>
               <span ng-if="row.addresses.length === 1">{$ row.address.ip $}</span>
               <div ng-if="row.addresses.length > 1"
@@ -83,7 +83,7 @@
                        ng-required="true" ng-disabled="row.allocatedMember"
                        popover-placement="top" popover-append-to-body="true"
                        popover-trigger="focus"
-                       ng-attr-popover="{$ memberDetailsForm[row.id + '-port'].$invalid && memberDetailsForm[row.id + '-port'].$dirty ? ctrl.portError : '' $}">
+                       uib-popover="{$ memberDetailsForm[row.id + '-port'].$invalid && memberDetailsForm[row.id + '-port'].$dirty ? ctrl.portError : '' $}">
               </div>
             </td>
             <td class="rsp-p1">
@@ -94,7 +94,7 @@
                        ng-disabled="row.allocatedMember"
                        popover-placement="top" popover-append-to-body="true"
                        popover-trigger="focus"
-                       ng-attr-popover="{$ memberDetailsForm[row.id + '-weight'].$invalid && memberDetailsForm[row.id + '-weight'].$dirty ? ctrl.weightError : '' $}">
+                       uib-popover="{$ memberDetailsForm[row.id + '-weight'].$invalid && memberDetailsForm[row.id + '-weight'].$dirty ? ctrl.weightError : '' $}">
               </div>
             </td>
             <td class="actions_column">
@@ -126,7 +126,7 @@
                                                                                                             ng-disabled="row.allocatedMember"
                                                                                                             popover-placement="top" popover-append-to-body="true"
                                                                                                                                     popover-trigger="focus"
-                                                                                                                                    ng-attr-popover="{$ memberDetailsForm[row.id + '-monitor-address'].$invalid && memberDetailsForm[row.id + '-monitor-address'].$dirty ? ctrl.ipError : '' $}">
+                                                                                                                                    uib-popover="{$ memberDetailsForm[row.id + '-monitor-address'].$invalid && memberDetailsForm[row.id + '-monitor-address'].$dirty ? ctrl.ipError : '' $}">
                   </dd>
                 </dl>
                 <dl class="col-lg-5 col-md-5 col-sm-5">
@@ -138,7 +138,7 @@
                                                                                                                                      ng-disabled="row.allocatedMember"
                                                                                                                                      popover-placement="top" popover-append-to-body="true"
                                                                                                                                                              popover-trigger="focus"
-                                                                                                                                                             ng-attr-popover="{$ memberDetailsForm[row.id + '-monitor-port'].$invalid && memberDetailsForm[row.id + '-monitor-port'].$dirty ? ctrl.portError : '' $}">
+                                                                                                                                                             uib-popover="{$ memberDetailsForm[row.id + '-monitor-port'].$invalid && memberDetailsForm[row.id + '-monitor-port'].$dirty ? ctrl.portError : '' $}">
                   </dd>
                 </dl>
                 <dl class="col-lg-5 col-md-5 col-sm-5">
diff --git a/releasenotes/notes/fix-chrome-member-dialog-154981a7794d5fb4.yaml b/releasenotes/notes/fix-chrome-member-dialog-154981a7794d5fb4.yaml
new file mode 100644
index 00000000..f75b62e3
--- /dev/null
+++ b/releasenotes/notes/fix-chrome-member-dialog-154981a7794d5fb4.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixed a bug when displaying the member list, some fields were not displayed
+    correctly and new members could not be added.
+    This bug affected only Google Chrome 114 and above.