Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mXj6o-00023C-85 for pgadmin-hackers@arkaria.postgresql.org; Tue, 05 Oct 2021 11:59:46 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1mXj6n-0003tF-6n for pgadmin-hackers@arkaria.postgresql.org; Tue, 05 Oct 2021 11:59:45 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mXj6m-0003t7-W7 for pgadmin-hackers@lists.postgresql.org; Tue, 05 Oct 2021 11:59:45 +0000 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1mXj6k-000220-Ke for pgadmin-hackers@postgresql.org; Tue, 05 Oct 2021 11:59:44 +0000 Received: by mail-lf1-x12a.google.com with SMTP id g41so85007828lfv.1 for ; Tue, 05 Oct 2021 04:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb.com; s=google; h=mime-version:from:date:message-id:subject:to; bh=Qk/DeYdLJled46VYfjyPYHd+CF2u3W1EZC7AZ4SIH3M=; b=XA+3c2Lco7C3WG9eYs55gCH//tcAlqOCE7WcG9FFK2G+vb1ezxxMyFowialXF5WrbP rI3ZGoIZihme2i++5sESpZbhglZmMUtLCVvS8rcS1Tx0KzCqAJIevzGeTJCgAFI6YSgc HWe0we2Q2QzdyLtrB7VKFKWXWNHtx/G717PkgaxA1G7lkmtnFLbaK0U3fafCbtML5Dz4 nuFPnRJ9fNCbKjXIy/2+S6NW0fjJ1RFXhBeYMLJmqTLQT7Dt8PzTP9qVVZGwCvtUCBmh 1Cs45Hnen0mhm4dX72m0dWZbKe/rhz7fRX+wH4Iwrwwqu/4bA/Z55FxQ8z/YsY+ImwAK utBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Qk/DeYdLJled46VYfjyPYHd+CF2u3W1EZC7AZ4SIH3M=; b=HhDKT9v14P43FOUmcd1lVHjoV8UjbFvMkCUbjcPtsr/e3jVlh83r/wsFDAz9O0QqY6 4xuyCLt9am9GZIQV3YHnEjMloMms1eHZHPh2sxyOY73WlEA2T9Ue2ASLYgrJfkICN1vX EGqMJvNXSe4Xj7I3woBMkEHtrQ6RAosmCGWn+MfMfYAqJqbgl52CnvOwCt80AapuY1Up pOvUEDlrIb+MRm7kJ3u+Pa8P7D9e0PIHAeasuivho/RxjQ169L5dm/ISjp2FTrPb3FpD Q0doSA5tbW7+O4pTUBLyle26EW5TKGCsgQU7jUpvjp4m92cRRrQOg+Le3gWj7vLEDbC1 J4MQ== X-Gm-Message-State: AOAM531aPgIhi6xuBN1WTD+pYTeG6zWlc1kmMTo7sDrcyAZ3XxOacXsL jU3qN85MXA4ktWiEIRpARlrXyiGh3rfU8yHdZEx/MR/sPXcFo5l3OqAKFl3osDF7uCLXV2quJjQ IbG5RGYgtcoIJcJ4I+155hv+2tznewDboD0jhtzBK7++GkOnOcSN/jwbqma0CAJqpRAGnChazZg XJDZDp+LFenb06gtsO3yQG19cn8nsrR8GC/WPoP9pzAXP4EcnlTKzuZcby+3r+rNa0jQ== X-Google-Smtp-Source: ABdhPJz7BKTgN+JLe+R7CNVyqK1ifygKG2VmL0TchOn1bsTqC41OYrx2dGMtxihsxH2karSxIyjEP/laB55Y5T2Sgiw= X-Received: by 2002:ac2:5606:: with SMTP id v6mr3105253lfd.520.1633435179888; Tue, 05 Oct 2021 04:59:39 -0700 (PDT) MIME-Version: 1.0 From: Khushboo Vashi Date: Tue, 5 Oct 2021 17:29:28 +0530 Message-ID: Subject: [pgAdmin4][Patch] - Fixes for #6863 & #6861 To: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000a963e005cd99c328" X-CLOUD-SEC-AV-Info: enterprisedb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --000000000000a963e005cd99c328 Content-Type: multipart/alternative; boundary="000000000000a963de05cd99c326" --000000000000a963de05cd99c326 Content-Type: text/plain; charset="UTF-8" Hi, Please find the attached patch to fix the below RMs: RM # 6863 - Table Dialogue does not close on addition/deletion pf partition. RM # 6861 - Nodes are loaded multiple times in server mode on 'Rest Layout'. Thanks, Khushboo --000000000000a963de05cd99c326 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Please find the at= tached patch to fix the below RMs:

RM # 6863 -=C2=A0Table Dialogue does not close on addit= ion/deletion pf partition.
RM # 6861 -=C2=A0Nodes are loaded multiple times in server mode on '= Rest Layout'.

Thanks,
Khushboo

=
--000000000000a963de05cd99c326-- --000000000000a963e005cd99c328 Content-Type: application/octet-stream; name="RM_6861_6863.patch" Content-Disposition: attachment; filename="RM_6861_6863.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kue135xs0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9zdGF0aWMvanMvdGFibGUuanMgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvc3Rh dGljL2pzL3RhYmxlLmpzCmluZGV4IDk2MzQwMDE0NS4uNjA2MjFjMjFmIDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy90YWJsZXMvc3RhdGljL2pzL3RhYmxlLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9zdGF0aWMvanMvdGFi bGUuanMKQEAgLTM2Miw3ICszNjIsNiBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS50YWJsZScsIFsK ICAgICAgICAgICAgICdhZmZlY3RlZF9wYXJ0aXRpb25zJyBpbiBfbmV3Tm9kZURhdGEKICAgICAg ICAgKSB7CiAgICAgICAgICAgdmFyIHBhcnRpdGlvbnMgPSBfbmV3Tm9kZURhdGEuYWZmZWN0ZWRf cGFydGl0aW9ucywKLSAgICAgICAgICAgIHNlbGYgPSB0aGlzLAogICAgICAgICAgICAgbmV3UGFy dGl0aW9uc0lEcyA9IFtdLAogICAgICAgICAgICAgaW5zZXJ0Q2hpbGRUcmVlTm9kZXMgPSBbXSwK ICAgICAgICAgICAgIGluc2VydENoaWxkcmVuTm9kZXMgPSBmdW5jdGlvbigpIHsKQEAgLTQwOSw3 ICs0MDgsNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS50YWJsZScsIFsKICAgICAgICAgICAgICAg ICAgICAgJ3BhcmVudCc6IHRhYmxlc0NvbGxOb2RlLAogICAgICAgICAgICAgICAgICAgICAndHlw ZSc6ICd0YWJsZScsCiAgICAgICAgICAgICAgICAgICAgICd0cmVlSGllcmFyY2h5JzoKLSAgICAg ICAgICAgICAgICAgICAgICBwZ0FkbWluLkJyb3dzZXIuTm9kZXMuc2NoZW1hLmdldFRyZWVOb2Rl SGllcmFyY2h5KAorICAgICAgICAgICAgICAgICAgICAgIHBnQWRtaW4uQnJvd3Nlci50cmVlLmdl dFRyZWVOb2RlSGllcmFyY2h5KAogICAgICAgICAgICAgICAgICAgICAgICAgc2NoZW1hTm9kZQog ICAgICAgICAgICAgICAgICAgICAgICksCiAgICAgICAgICAgICAgICAgICAgICdjaGlsZHJlbklE cyc6IF8uY2xvbmUoY2hpbGRJRHMpLApAQCAtNDYwLDcgKzQ1OSw3IEBAIGRlZmluZSgncGdhZG1p bi5ub2RlLnRhYmxlJywgWwogICAgICAgICAgICAgICBpbnNlcnRDaGlsZFRyZWVOb2Rlcy5wdXNo KHsKICAgICAgICAgICAgICAgICAncGFyZW50JzogcGFydGl0aW9uc0NvbGxOb2RlLAogICAgICAg ICAgICAgICAgICd0eXBlJzogJ3BhcnRpdGlvbicsCi0gICAgICAgICAgICAgICAgJ3RyZWVIaWVy YXJjaHknOiBzZWxmLmdldFRyZWVOb2RlSGllcmFyY2h5KF9ub2RlKSwKKyAgICAgICAgICAgICAg ICAndHJlZUhpZXJhcmNoeSc6IHBnQWRtaW4uQnJvd3Nlci50cmVlLmdldFRyZWVOb2RlSGllcmFy Y2h5KF9ub2RlKSwKICAgICAgICAgICAgICAgICAnY2hpbGRyZW5JRHMnOiBuZXdQYXJ0aXRpb25z SURzLAogICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL2Jyb3dzZXIuanMgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3N0YXRpYy9qcy9icm93c2VyLmpzCmluZGV4IDA5YjEwZWQ4Mi4uZGZiYmZlNjdkIDEwMDY0NAot LS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9icm93c2VyLmpzCisrKyBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL2Jyb3dzZXIuanMKQEAgLTE4OTAsNyArMTg5MCw3IEBA IGRlZmluZSgncGdhZG1pbi5icm93c2VyJywgWwogICAgICAgICBfcGFyZW50Tm9kZSA9IG51bGw7 CiAKICAgICAgICAgZm9yICg7IGlkeCA8IHNpemU7IGlkeCsrKSB7Ci0gICAgICAgICAgY2hpbGRO b2RlID0gY2hpbGRyZW4uZXEoaWR4KTsKKyAgICAgICAgICBjaGlsZE5vZGUgPSBjaGlsZHJlbltp ZHhdOwogICAgICAgICAgIGNoaWxkTm9kZURhdGEgPSB0cmVlX2xvY2FsLml0ZW1EYXRhKGNoaWxk Tm9kZSk7CiAKICAgICAgICAgICBpZiAoY2hpbGROb2RlRGF0YS5fdHlwZSA9PSBfY29sbFR5cGUp IHsKQEAgLTE5MDYsNyArMTkwNiw3IEBAIGRlZmluZSgncGdhZG1pbi5icm93c2VyJywgWwogICAg ICAgICBzaXplID0gY2hpbGRyZW4ubGVuZ3RoOwogCiAgICAgICAgIGZvciAoOyBpZHggPCBzaXpl OyBpZHgrKykgewotICAgICAgICAgIGNoaWxkTm9kZSA9IGNoaWxkcmVuLmVxKGlkeCk7CisgICAg ICAgICAgY2hpbGROb2RlID0gY2hpbGRyZW5baWR4XTsKICAgICAgICAgICBjaGlsZE5vZGVEYXRh ID0gdHJlZV9sb2NhbC5pdGVtRGF0YShjaGlsZE5vZGUpOwogCiAgICAgICAgICAgaWYgKF9jaGls ZElkcy5pbmRleE9mKGNoaWxkTm9kZURhdGEuX2lkKSAhPSAtMSkgewpAQCAtMTk1Myw3ICsxOTUz LDcgQEAgZGVmaW5lKCdwZ2FkbWluLmJyb3dzZXInLCBbCiAgICAgICAgIGlkeCA9IDAsIG5vZGVE YXRhLCBub2RlOwogCiAgICAgICBmb3IoOyBpZHggPCBzaWJsaW5ncy5sZW5ndGg7IGlkeCsrKSB7 Ci0gICAgICAgIG5vZGUgPSBzaWJsaW5ncy5lcShpZHgpOworICAgICAgICBub2RlID0gc2libGlu Z3NbaWR4XTsKICAgICAgICAgbm9kZURhdGEgPSB0cmVlX2xvY2FsLml0ZW1EYXRhKG5vZGUpOwog CiAgICAgICAgIGlmIChub2RlRGF0YSAmJiBub2RlRGF0YS5faWQgPT0gX2lkKQpAQCAtMTk4Nyw3 ICsxOTg3LDcgQEAgZGVmaW5lKCdwZ2FkbWluLmJyb3dzZXInLCBbCiAgICAgICAgIHJldHVybiBu dWxsOwogCiAgICAgICBmb3IoOyBpZHggPCBjaGlsZHJlbi5sZW5ndGg7IGlkeCsrKSB7Ci0gICAg ICAgIG5vZGUgPSBjaGlsZHJlbi5lcShpZHgpOworICAgICAgICBub2RlID0gY2hpbGRyZW5baWR4 XTsKICAgICAgICAgbm9kZURhdGEgPSB0cmVlX2xvY2FsLml0ZW1EYXRhKG5vZGUpOwogCiAgICAg ICAgIGlmIChub2RlRGF0YSAmJiBub2RlRGF0YS5fdHlwZSA9PSBfY29sbFR5cGUpCkBAIC0yMDIx LDYgKzIwMjEsOCBAQCBkZWZpbmUoJ3BnYWRtaW4uYnJvd3NlcicsIFsKICAgICAgICAgICAgIG51 bGwsICdub2RlcycsIGNoaWxkRHVtbXlJbmZvLCB0cnVlLCBjaGlsZFRyZWVJbmZvCiAgICAgICAg ICAgKTsKIAorICAgICAgICAgIHZhciBfbm9kZSA9IF9ub2RlIHx8IGFyZ3VtZW50c1sxXTsKKwog ICAgICAgICAgICQuYWpheCh7CiAgICAgICAgICAgICB1cmw6IGNoaWxkTm9kZVVybCwKICAgICAg ICAgICAgIGRhdGFUeXBlOiAnanNvbicsCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2Vy L3N0YXRpYy9qcy9ub2RlLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvbm9kZS5q cwppbmRleCBmODg2ODAyYmQuLjE2ZGM0Zjk3ZSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zdGF0aWMvanMvbm9kZS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9q cy9ub2RlLmpzCkBAIC0xMDQ2LDE0ICsxMDQ2LDI4IEBAIGRlZmluZSgncGdhZG1pbi5icm93c2Vy Lm5vZGUnLCBbCiAgICAgICAgIGxldCB0cmVlID0gcGdCcm93c2VyLnRyZWUsCiAgICAgICAgICAg YXV0b19leHBhbmQgPSBwZ0Jyb3dzZXIuZ2V0X3ByZWZlcmVuY2UoJ2Jyb3dzZXInLCAnYXV0b19l eHBhbmRfc29sZV9jaGlsZHJlbicpOwogCi0gICAgICAgIHBnQnJvd3Nlci5FdmVudHMudHJpZ2dl cigncGdhZG1pbjpicm93c2VyOnRyZWU6dXBkYXRlLXRyZWUtc3RhdGUnLAotICAgICAgICAgIGl0 ZW0pOwotCiAgICAgICAgIGlmIChhdXRvX2V4cGFuZCAmJiBhdXRvX2V4cGFuZC52YWx1ZSA9PSB0 cnVlICYmIHRyZWUuY2hpbGRyZW4oaXRlbSkubGVuZ3RoID09IDEpIHsKICAgICAgICAgICAvLyBB dXRvbWF0aWNhbGx5IGV4cGFuZCB0aGUgY2hpbGQgbm9kZSwgaWYgYSB0cmVldmlldyBub2RlIGhh cyBvbmx5IGEgc2luZ2xlIGNoaWxkLgotICAgICAgICAgIHRyZWUub3Blbih0cmVlLmZpcnN0KGl0 ZW0pKTsKKyAgICAgICAgICBjb25zdCBmaXJzdF9jaGlsZCA9IHRyZWUuZmlyc3QoaXRlbSk7CisK KyAgICAgICAgICBpZiAoZmlyc3RfY2hpbGQuX2xvYWRlZCA9PSB0cnVlKSB7CisgICAgICAgICAg ICB0cmVlLm9wZW4oZmlyc3RfY2hpbGQpOworICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAg ICBjb25zdCBvcGVuU29sZUl0ZW0gPSBzZXRJbnRlcnZhbCgoKSA9PiB7CisgICAgICAgICAgICAg IGlmIChmaXJzdF9jaGlsZC5fbG9hZGVkKSB7CisgICAgICAgICAgICAgICAgdHJlZS5vcGVuKGZp cnN0X2NoaWxkKTsKKyAgICAgICAgICAgICAgICBjbGVhclNvbGVJdGVtSW50ZXJ2YWwoKTsKKyAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgfSwgMjAwKTsKKyAgICAgICAgICAgIGNvbnN0IGNs ZWFyU29sZUl0ZW1JbnRlcnZhbCA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICBjbGVhcklu dGVydmFsKG9wZW5Tb2xlSXRlbSk7CisgICAgICAgICAgICB9OworICAgICAgICAgIH0KKwogICAg ICAgICB9CiAKKyAgICAgICAgcGdCcm93c2VyLkV2ZW50cy50cmlnZ2VyKCdwZ2FkbWluOmJyb3dz ZXI6dHJlZTp1cGRhdGUtdHJlZS1zdGF0ZScsIGl0ZW0pOworCiAgICAgICB9LAogICAgICAgY2xv c2VkOiBmdW5jdGlvbihpdGVtKSB7CiAgICAgICAgIHBnQnJvd3Nlci5FdmVudHMudHJpZ2dlcign cGdhZG1pbjpicm93c2VyOnRyZWU6cmVtb3ZlLWZyb20tdHJlZS1zdGF0ZScsCg== --000000000000a963e005cd99c328--