Merge branch 'staging' of github.com:internetee/registry into staging

app/views/admin/domains/form/_pending_delete.haml

@@ -1,8 +1,8 @@
-- if (status == DomainStatus::PENDING_DELETE && f.object.pending_json.present?)
-  = link_to(t(:apply_pending), admin_domain_pending_delete_path(f.object.id, f.object.id),
+- if (status == DomainStatus::PENDING_DELETE || status == DomainStatus::PENDING_DELETE_CONFIRMATION)
+  = link_to(t(:accept_delete), admin_domain_pending_delete_path(f.object.id, f.object.id),
     method: :patch, data: { confirm: t(:are_you_sure) },
     class: 'btn btn-danger btn-xs')
 
-  = link_to(t(:delete_pending), admin_domain_pending_delete_path(f.object.id, f.object.id), 
+  = link_to(t(:reject_delete), admin_domain_pending_delete_path(f.object.id, f.object.id),
     method: :delete, data: { confirm: t(:are_you_sure) },
     class: 'btn btn-danger btn-xs')

app/views/admin/shared/form/_statuses.haml

@@ -9,8 +9,9 @@
         .pull-left= t(:status)
         .pull-right
           - if model == 'domain'
-            = render 'admin/domains/form/pending_update', f: f, status: s
-            = render 'admin/domains/form/pending_delete', f: f, status: s
+            .hide-when-new
+              = render 'admin/domains/form/pending_update', f: f, status: s
+              = render 'admin/domains/form/pending_delete', f: f, status: s
           = link_to(t(:delete), '#', class: 'btn btn-danger btn-xs js-destroy-status', style: delete_style)
       .panel-body
         .form-group
@@ -37,6 +38,7 @@
       if el.find('.js-disabled-value')
         el.find('.js-disabled-value').remove()
         el.find('.js-select').show()
+        el.find('.hide-when-new').hide()
         el.find('.js-destroy-status').show()
 
   $(document).on 'click', '.js-destroy-status', (e) ->

app/views/epp/domains/info.xml.builder

@@ -61,19 +61,34 @@ xml.epp_head do
     end
 
     xml.extension do
+      def tag_key_data(xml, key)
+        xml.tag!('secDNS:keyData') do
+          xml.tag!('secDNS:flags', key.flags)
+          xml.tag!('secDNS:protocol', key.protocol)
+          xml.tag!('secDNS:alg', key.alg)
+          xml.tag!('secDNS:pubKey', key.public_key)
+        end
+      end
+
+      def tag_ds_data(xml, key)
+        xml.tag!('secDNS:dsData') do
+          xml.tag!('secDNS:keyTag', key.ds_key_tag)
+          xml.tag!('secDNS:alg', key.ds_alg)
+          xml.tag!('secDNS:digestType', key.ds_digest_type)
+          xml.tag!('secDNS:digest', key.ds_digest)
+          tag_key_data(xml, key) if key.public_key.present?
+        end
+      end
+
       xml.tag!('secDNS:infData', 'xmlns:secDNS' => 'urn:ietf:params:xml:ns:secDNS-1.1') do
-        @domain.dnskeys.sort.each do |key|
-          xml.tag!('secDNS:dsData') do
-            xml.tag!('secDNS:keyTag', key.ds_key_tag)
-            xml.tag!('secDNS:alg', key.ds_alg)
-            xml.tag!('secDNS:digestType', key.ds_digest_type)
-            xml.tag!('secDNS:digest', key.ds_digest)
-            xml.tag!('secDNS:keyData') do
-              xml.tag!('secDNS:flags', key.flags)
-              xml.tag!('secDNS:protocol', key.protocol)
-              xml.tag!('secDNS:alg', key.alg)
-              xml.tag!('secDNS:pubKey', key.public_key)
-            end
+        # might not have ds in first key? maybe check any? k.ds_digest if requirements change (DS not accepted by EIS)
+        if @domain.dnskeys[0].ds_digest.blank?
+          @domain.dnskeys.sort.each do |key|
+            tag_key_data(xml, key)
+          end
+        else
+          @domain.dnskeys.sort.each do |key|
+            tag_ds_data(xml, key)
           end
         end
       end

app/views/registrar/domains/partials/_dnskeys.haml

@@ -19,7 +19,22 @@
         - if x.css('digest').text.present?
           %dt= t(:ds_digest)
           %dd= x.css('digest').text
+        - @data.css('keyData').each do |x|
+          %dl.dl-horizontal
+            %dt= t(:flag)
+            %dd= x.css('flags').text
 
+            %dt= t(:protocol)
+            %dd= x.css('protocol').text
+
+            %dt= t(:algorithm)
+            %dd= x.css('alg').text
+
+            %dt= t(:public_key)
+            %dd= x.css('pubKey').text
+
+    - @data.css('keyData').each do |x|
+      %dl.dl-horizontal
         %dt= t(:flag)
         %dd= x.css('flags').text
 
@@ -27,7 +42,7 @@
         %dd= x.css('protocol').text
 
         %dt= t(:algorithm)
-        %dd= x.css('keyData > alg').text
+        %dd= x.css('alg').text
 
         %dt= t(:public_key)
         %dd= x.css('pubKey').text