Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1ibkC7-0001UN-Jj for pgadmin-hackers@arkaria.postgresql.org; Mon, 02 Dec 2019 11:48:48 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1ibkC6-0004aF-FI for pgadmin-hackers@arkaria.postgresql.org; Mon, 02 Dec 2019 11:48:46 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1ibk9O-00026a-7m for pgadmin-hackers@lists.postgresql.org; Mon, 02 Dec 2019 11:45:58 +0000 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1ibk9L-00028o-Ib for pgadmin-hackers@postgresql.org; Mon, 02 Dec 2019 11:45:56 +0000 Received: by mail-lf1-x12a.google.com with SMTP id 203so27670619lfa.12 for ; Mon, 02 Dec 2019 03:45:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=UUnQtiwO/VfnIoz7M19xACQSac5vUUzTwVO9QCcoWmw=; b=OpmjAWaCBU9oS22/vw7AfwMSgew4Qu97uWlcV2IXdoVqpjwtZdn7fkMLQQ0VvznNMD PhEKe7NCLtapk0GTPQTt+rXaQqFD4iQxBRzE1+0B78m4gQkHKVx0VKhL9aVaBd6whv/g kpBEpYnmdoF3ponx2zlnWZPsTAQeQ8E6ACH4rd5yYC3vX1toJL8wayXKN5zeMFjxy4EC KM6ARILzmj8k0jhLj5YcB6nIzmapF73a+jV2OXsK5iZflNAYy8RPAV+jjxIW9GecAxrh K74Ub2ZB6Hxo0JwF/IN3PpqhWUOq0r4qfYRlVlo8Q0ps4xoRj837xh6JSZ1yHRa2cQ0k +1MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=UUnQtiwO/VfnIoz7M19xACQSac5vUUzTwVO9QCcoWmw=; b=etUS7Q1ELHKryGpjXChlMjO9jjNEszrZ65tmL4Ygb/07bb9rcflrrAwexDkxSG1+MZ 1Ab7UPzFfW+4Phi49LLYh09iyq16PgevJm5e/dhEtEcu0BJIfVMedRpjvgbSQEFEgzM9 iNkjtG0EeqX2FB2kNzJCVSQXCXMmgGU/JZfaOPL+2MTrVQJH0i4v7xq+iNagZDxPJmbJ +vma6XMX2J9gOrRYLgbYx5kYuJgmLaSG9EhpnRg73wv7Gy1jyhy2jJAHhfiGYiVq75oq IKXZPVF6/OW6FGHwYyB4e29XPyybBFXleExuxzqGxnrrBi20QvMGT27p6Zh8UQQ0/QMm oN9A== X-Gm-Message-State: APjAAAV34vonSft9PvPZDc5+eVOs/6YgBboefosHCDKYmh5s/nCeAIcA /WQUugz1wUNvkcA6QUHwTRXXxSHAAKOsND8lCu361eNgzp3iGKQVq/2xY3IOB5oOT1IRCO994VA T2VLlGYR8VB5BmPKFibsfimCs5CgTAM2OnfxJ2GnTv1OOYhHrIBi4tOtirNgmj7glOwGboQGozQ EnpYmben1+u6MERk9ftGEslXRwsuAji0+lfKIszBUDhlM9A/PTGXlfUJoo X-Google-Smtp-Source: APXvYqws2V/e5tYwQBtNogwg9rt9smUKSf/x4Q51B28UKOVHcjTSSORLVOeRR9UsmOy9lftDWeHx5ZXlonHnT5OpdrE= X-Received: by 2002:ac2:4244:: with SMTP id m4mr13213014lfl.85.1575287153673; Mon, 02 Dec 2019 03:45:53 -0800 (PST) MIME-Version: 1.0 From: Khushboo Vashi Date: Mon, 2 Dec 2019 17:15:45 +0530 Message-ID: Subject: [pgAdmin 4][Patch] - RM #4923 - Enhancement for RM#3279 To: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000370ca00598b71fe6" X-CLOUD-SEC-AV-Info: edb,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: Precedence: bulk --000000000000370ca00598b71fe6 Content-Type: multipart/alternative; boundary="000000000000370c9d0598b71fe4" --000000000000370c9d0598b71fe4 Content-Type: text/plain; charset="UTF-8" Hi, Please find the attached patch to fix the RM #4923 - Enhancement for RM#3279. Earlier we had *Delete/Drop* label in the context menu to remove the server which was not appropriate, so we have changed it to *Remove Server*, but the approach taken was not generic, which has been fixed in this patch. Apart from that, the Server Group drop label has been changed to 'Remove Server Group' in this patch as requested in the RM. Thanks, Khushboo --000000000000370c9d0598b71fe4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Please find the attached= patch to fix the RM #4923 -=C2=A0Enhancement for RM#3279.
=

= Earlier we had *Delete/Drop* label in the context menu to remove the server= which was not appropriate, so we have changed it to *Remove Server*, but t= he approach taken was not generic, which has been fixed in this patch. Apar= t from that, the Server Group drop label=C2=A0has been=C2=A0changed to '= ;Remove Server Group' in this patch as requested in the RM.

Thanks,
Khushboo
--000000000000370c9d0598b71fe4-- --000000000000370ca00598b71fe6 Content-Type: application/octet-stream; name="RM_4923.patch" Content-Disposition: attachment; filename="RM_4923.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k3od6s8v0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3N0 YXRpYy9qcy9zZXJ2ZXIuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9zdGF0aWMvanMvc2VydmVyLmpzCmluZGV4IDg0Mzc5NGQ1My4uOGQ2MzYxMzc4IDEwMDY0 NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9zdGF0aWMv anMvc2VydmVyLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2 ZXJzL3N0YXRpYy9qcy9zZXJ2ZXIuanMKQEAgLTU4LDYgKzU4LDggQEAgZGVmaW5lKCdwZ2FkbWlu Lm5vZGUuc2VydmVyJywgWwogICAgICAgZGlhbG9nSGVscDogdXJsX2ZvcignaGVscC5zdGF0aWMn LCB7J2ZpbGVuYW1lJzogJ3NlcnZlcl9kaWFsb2cuaHRtbCd9KSwKICAgICAgIGxhYmVsOiBnZXR0 ZXh0KCdTZXJ2ZXInKSwKICAgICAgIGNhbkRyb3A6IHRydWUsCisgICAgICBkcm9wQXNSZW1vdmU6 IHRydWUsCisgICAgICBkcm9wUHJpb3JpdHk6IDUsCiAgICAgICBoYXNTdGF0aXN0aWNzOiB0cnVl LAogICAgICAgaGFzQ29sbGVjdGl2ZVN0YXRpc3RpY3M6IHRydWUsCiAgICAgICBjYW5fZXhwYW5k OiBmdW5jdGlvbihkKSB7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc3RhdGljL2pzL3NlcnZlcl9ncm91cC5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zdGF0aWMvanMvc2VydmVyX2dyb3VwLmpzCmluZGV4IDYyZGFhM2Q1Yi4uODQ1 N2RiNjU4IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc3Rh dGljL2pzL3NlcnZlcl9ncm91cC5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc3RhdGljL2pzL3NlcnZlcl9ncm91cC5qcwpAQCAtNzAsNiArNzAsNyBAQCBkZWZpbmUo J3BnYWRtaW4ubm9kZS5zZXJ2ZXJfZ3JvdXAnLCBbCiAgICAgICAgIH0sCiAgICAgICB9KSwKICAg ICAgIGNhbkRyb3A6IGZ1bmN0aW9uKGl0ZW1EYXRhKSB7IHJldHVybiBpdGVtRGF0YS5jYW5fZGVs ZXRlOyB9LAorICAgICAgZHJvcEFzUmVtb3ZlOiB0cnVlLAogICAgICAgY2FuRGVsZXRlOiBmdW5j dGlvbihpKSB7CiAgICAgICAgIHZhciBzID0gcGdBZG1pbi5Ccm93c2VyLnRyZWUuc2libGluZ3Mo aSwgdHJ1ZSk7CiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL25v ZGUuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9ub2RlLmpzCmluZGV4IGZiY2Uz NDZmMC4uZTdlODBjOGQ3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9q cy9ub2RlLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL25vZGUuanMKQEAg LTI4LDEwICsyOCw2IEBAIGRlZmluZSgncGdhZG1pbi5icm93c2VyLm5vZGUnLCBbCiAgICAgICBG MTogMTEyLAogICAgIH07CiAKLSAgY29uc3QgUkVNT1ZFX1NFUlZFUl9QUklPUklUWSA9IDU7Ci0g IGNvbnN0IFJFTU9WRV9TRVJWRVJfTEFCRUwgPSAnUmVtb3ZlIFNlcnZlcic7Ci0gIGNvbnN0IFNF UlZFUiA9ICdzZXJ2ZXInOwotCiAgIC8vIEl0IGhhcyBhbHJlYWR5IGJlZW4gZGVmaW5lZC4KICAg Ly8gQXZvaWQgcnVubmluZyB0aGlzIHNjcmlwdCBhZ2Fpbi4KICAgaWYgKHBnQnJvd3Nlci5Ob2Rl KQpAQCAtMTQ2LDggKzE0Miw4IEBAIGRlZmluZSgncGdhZG1pbi5icm93c2VyLm5vZGUnLCBbCiAg ICAgICAgICAgbW9kdWxlOiBzZWxmLAogICAgICAgICAgIGFwcGxpZXM6IFsnb2JqZWN0JywgJ2Nv bnRleHQnXSwKICAgICAgICAgICBjYWxsYmFjazogJ2RlbGV0ZV9vYmonLAotICAgICAgICAgIHBy aW9yaXR5OiBzZWxmLmdldF9tZW51X2l0ZW1fcHJpb3JpdHkoc2VsZi50eXBlLCAyKSwKLSAgICAg ICAgICBsYWJlbDogc2VsZi5jaGFuZ2VfbWVudV9sYWJlbChzZWxmLnR5cGUsIGdldHRleHQoJ0Rl bGV0ZS9Ecm9wJykpLAorICAgICAgICAgIHByaW9yaXR5OiBzZWxmLmRyb3BQcmlvcml0eSwKKyAg ICAgICAgICBsYWJlbDogKHNlbGYuZHJvcEFzUmVtb3ZlKSA/IGdldHRleHQoJ1JlbW92ZSAlcycs IHNlbGYubGFiZWwpIDogZ2V0dGV4dCgnRGVsZXRlL0Ryb3AnKSwKICAgICAgICAgICBkYXRhOiB7 CiAgICAgICAgICAgICAndXJsJzogJ2Ryb3AnLAogICAgICAgICAgIH0sCkBAIC01MzksNiArNTM1 LDE0IEBAIGRlZmluZSgncGdhZG1pbi5icm93c2VyLm5vZGUnLCBbCiAgICAgICogT3ZlcnJpZGUg dGhpcywgd2hlbiBhIG5vZGUgaXMgbm90IGRlbGV0YWJsZS4KICAgICAgKi8KICAgICBjYW5Ecm9w Q2FzY2FkZTogZmFsc2UsCisgICAgLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICAgIGRyb3BB c1JlbW92ZSBzaG91bGQgYmUgdHJ1ZSBpbiBjYXNlLCBEcm9wIG9iamVjdCBsYWJlbCBuZWVkcyB0 byBiZSByZXBsYWNlZCBieSBSZW1vdmUKKyAgICAqLworICAgIGRyb3BBc1JlbW92ZTogZmFsc2Us CisgICAgLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKgorICAgIGRyb3BQcmlvcml0eSBpcyBzZXQgdG8g MiBieSBkZWZhdWx0LCBvdmVycmlkZSBpdCB3aGVuIGNoYW5nZSBpcyByZXF1aXJlZAorICAgICov CisgICAgZHJvcFByaW9yaXR5OiAyLAogICAgIC8vIExpc3Qgb2YgY29tbW9uIGNhbGxiYWNrcyAt IHRoYXQgY2FuIGJlIHVzZWQgZm9yIGRpZmZlcmVudAogICAgIC8vIG9wZXJhdGlvbnMhCiAgICAg Y2FsbGJhY2tzOiB7CkBAIC03NDgsNyArNzUyLDEwIEBAIGRlZmluZSgncGdhZG1pbi5icm93c2Vy Lm5vZGUnLCBbCiAgICAgICAgIG9iaiA9IHBnQnJvd3Nlci5Ob2Rlc1tkLl90eXBlXTsKICAgICAg ICAgdmFyIG9iak5hbWUgPSBkLmxhYmVsOwogCi0gICAgICAgIHZhciBtc2csIHRpdGxlOworICAg ICAgICB2YXIgbXNnLCB0aXRsZSwgZHJvcF9sYWJlbDsKKworICAgICAgICBpZiAob2JqLmRyb3BB c1JlbW92ZSkgZHJvcF9sYWJlbCA9ICdSZW1vdmUnOyBlbHNlIGRyb3BfbGFiZWwgPSAnRHJvcCc7 CisKICAgICAgICAgaWYgKGlucHV0LnVybCA9PSAnZGVsZXRlJykgewogCiAgICAgICAgICAgbXNn ID0gZ2V0dGV4dCgnQXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGRyb3AgJXMgIiVzIiBhbmQgYWxs IHRoZSBvYmplY3RzIHRoYXQgZGVwZW5kIG9uIGl0PycsCkBAIC03NjQsMzEgKzc3MSwxNSBAQCBk ZWZpbmUoJ3BnYWRtaW4uYnJvd3Nlci5ub2RlJywgWwogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICB2YXIgcmVtb3ZlX2Ryb3BfdGV4 dDsKLSAgICAgICAgICBpZihvYmoudHlwZSA9PT0gU0VSVkVSKSB7Ci0gICAgICAgICAgICByZW1v dmVfZHJvcF90ZXh0ID0gJ1JlbW92ZSc7Ci0gICAgICAgICAgfQotICAgICAgICAgIGVsc2Ugewot ICAgICAgICAgICAgcmVtb3ZlX2Ryb3BfdGV4dCA9ICdEUk9QJzsKLSAgICAgICAgICB9Ci0KLSAg ICAgICAgICBtc2cgPSBnZXR0ZXh0KCdBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8gJXMgJXMgIiVz Ij8nLCByZW1vdmVfZHJvcF90ZXh0LnRvTG93ZXJDYXNlKCksIG9iai5sYWJlbC50b0xvd2VyQ2Fz ZSgpLCBkLmxhYmVsKTsKLSAgICAgICAgICB0aXRsZSA9IGdldHRleHQoJyVzICVzPycsIHJlbW92 ZV9kcm9wX3RleHQsIG9iai5sYWJlbCk7CisgICAgICAgICAgbXNnID0gZ2V0dGV4dCgnQXJlIHlv dSBzdXJlIHlvdSB3YW50IHRvICVzICVzICIlcyI/JywgZHJvcF9sYWJlbC50b0xvd2VyQ2FzZSgp LCBvYmoubGFiZWwudG9Mb3dlckNhc2UoKSwgZC5sYWJlbCk7CisgICAgICAgICAgdGl0bGUgPSBn ZXR0ZXh0KCclcyAlcz8nLCBkcm9wX2xhYmVsLCBvYmoubGFiZWwpOwogCiAgICAgICAgICAgaWYg KCEoXy5pc0Z1bmN0aW9uKG9iai5jYW5Ecm9wKSA/CiAgICAgICAgICAgICBvYmouY2FuRHJvcC5h cHBseShvYmosIFtkLCBpXSkgOiBvYmouY2FuRHJvcCkpIHsKLSAgICAgICAgICAgIGlmKG9iai50 eXBlID09PSBTRVJWRVIpIHsKLSAgICAgICAgICAgICAgQWxlcnRpZnkuZXJyb3IoCi0gICAgICAg ICAgICAgICAgZ2V0dGV4dCgnVGhlICVzICIlcyIgY2Fubm90IGJlIHJlbW92ZWQuJywgb2JqLmxh YmVsLCBkLmxhYmVsKSwKLSAgICAgICAgICAgICAgICAxMAotICAgICAgICAgICAgICApOwotICAg ICAgICAgICAgfQotICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgIEFsZXJ0aWZ5LmVy cm9yKAotICAgICAgICAgICAgICAgIGdldHRleHQoJ1RoZSAlcyAiJXMiIGNhbm5vdCBiZSBkcm9w cGVkLicsIG9iai5sYWJlbCwgZC5sYWJlbCksCi0gICAgICAgICAgICAgICAgMTAKLSAgICAgICAg ICAgICAgKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIEFsZXJ0aWZ5LmVycm9yKAorICAg ICAgICAgICAgICBnZXR0ZXh0KCdUaGUgJXMgIiVzIiBjYW5ub3QgYmUgZHJvcHBlZC9yZW1vdmVk LicsIG9iai5sYWJlbCwgZC5sYWJlbCksCisgICAgICAgICAgICAgIDEwCisgICAgICAgICAgICAp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtODE3LDE0 ICs4MDgsOSBAQCBkZWZpbmUoJ3BnYWRtaW4uYnJvd3Nlci5ub2RlJywgWwogICAgICAgICAgICAg ICAgICAgICBjb25zb2xlLndhcm4oZS5zdGFjayB8fCBlKTsKICAgICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgaWYob2JqLnR5cGUgPT09IFNFUlZF UikgewotICAgICAgICAgICAgICAgICAgcGdCcm93c2VyLnJlcG9ydF9lcnJvcigKLSAgICAgICAg ICAgICAgICAgICAgZ2V0dGV4dCgnRXJyb3IgcmVtb3ZpbmcgJXM6ICIlcyInLCBvYmoubGFiZWws IG9iak5hbWUpLCBtc2cpOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBlbHNl IHsKLSAgICAgICAgICAgICAgICAgIHBnQnJvd3Nlci5yZXBvcnRfZXJyb3IoCi0gICAgICAgICAg ICAgICAgICAgIGdldHRleHQoJ0Vycm9yIGRyb3BwaW5nICVzOiAiJXMiJywgb2JqLmxhYmVsLCBv YmpOYW1lKSwgbXNnKTsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgcGdCcm93 c2VyLnJlcG9ydF9lcnJvcigKKyAgICAgICAgICAgICAgICAgIGdldHRleHQoJ0Vycm9yIGRyb3Bw aW5nL3JlbW92aW5nICVzOiAiJXMiJywgb2JqLmxhYmVsLCBvYmpOYW1lKSwgbXNnKTsKKwogICAg ICAgICAgICAgICB9KTsKICAgICAgICAgICB9LAogICAgICAgICAgIG51bGwpLnNob3coKTsKQEAg LTE4MjksMTggKzE4MTUsNiBAQCBkZWZpbmUoJ3BnYWRtaW4uYnJvd3Nlci5ub2RlJywgWwogICAg ICAgICByZXR1cm4gdGhpcy5wYXJlbnRfdHlwZTsKICAgICAgIH0KICAgICB9LAotICAgIGdldF9t ZW51X2l0ZW1fcHJpb3JpdHk6IGZ1bmN0aW9uKHR5cGUsIGRlZmF1bHRfcHJpb3JpdHkpIHsgLy9k b3duZ3JhZGUgUmVtb3ZlIFNlcnZlciBwcmlvcml0eSBpbiBtZW51cyBvbmx5IGZvciBTZXJ2ZXJz Ci0gICAgICBpZih0eXBlICYmIHR5cGUgPT09IFNFUlZFUikgewotICAgICAgICByZXR1cm4gUkVN T1ZFX1NFUlZFUl9QUklPUklUWTsKLSAgICAgIH0KLSAgICAgIHJldHVybiBkZWZhdWx0X3ByaW9y aXR5OwotICAgIH0sCi0gICAgY2hhbmdlX21lbnVfbGFiZWw6IGZ1bmN0aW9uKHR5cGUsIGRlZmF1 bHRfbGFiZWwpIHsgLy9jaGFuZ2UgRGVsZXRlL0Ryb3AgbWVudSBvcHRpb24gdG8gUmVtb3ZlIFNl cnZlcgotICAgICAgaWYodHlwZSAmJiB0eXBlID09PSBTRVJWRVIpIHsKLSAgICAgICAgcmV0dXJu IGdldHRleHQoUkVNT1ZFX1NFUlZFUl9MQUJFTCk7Ci0gICAgICB9Ci0gICAgICByZXR1cm4gZGVm YXVsdF9sYWJlbDsKLSAgICB9LAogICB9KTsKIAogICByZXR1cm4gcGdBZG1pbi5Ccm93c2VyLk5v ZGU7Cg== --000000000000370ca00598b71fe6--