remove bureau_abbreviation; fron old cx reporting

* fix website step indicator * update admin stats table layout
GSA · Mar 31, 2022 · 7e5fe86 · 7e5fe86
1 parent c1ac496
commit 7e5fe86
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 140 deletions.
diff --git a/app/controllers/admin/service_providers_controller.rb b/app/controllers/admin/service_providers_controller.rb
@@ -109,7 +109,6 @@ def service_provider_params
         :department,
         :department_abbreviation,
         :bureau,
-        :bureau_abbreviation,
         :inactive,
         :new,
         :tag_list,

diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
@@ -219,7 +219,6 @@ def service_params
         :service_owner_id,
         :service_provider_id,
         :bureau,
-        :bureau_abbreviation,
         :department,
         :description,
         :hisp,

diff --git a/app/controllers/api/v1/collections_controller.rb b/app/controllers/api/v1/collections_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::CollectionsController < ::ApiController
   def index
     respond_to do |format|
       format.json {
-        render json: Collection.all, each_serializer: CollectionSerializer
+        render json: Collection.all.order(:id), each_serializer: CollectionSerializer
       }
     end
   end

diff --git a/app/controllers/api/v1/omb_cx_reporting_collections_controller.rb b/app/controllers/api/v1/omb_cx_reporting_collections_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::OmbCxReportingCollectionsController < ::ApiController
   def index
     respond_to do |format|
       format.json {
-        render json: OmbCxReportingCollection.all, each_serializer: OmbCxReportingCollectionSerializer
+        render json: OmbCxReportingCollection.all.order(:id), each_serializer: OmbCxReportingCollectionSerializer
       }
     end
   end

diff --git a/app/controllers/api/v1/organizations_controller.rb b/app/controllers/api/v1/organizations_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::OrganizationsController < ::ApiController
   def index
     respond_to do |format|
       format.json {
-        render json: Organization.all, each_serializer: OrganizationSerializer
+        render json: Organization.all.order(:id), each_serializer: OrganizationSerializer
       }
     end
   end

diff --git a/app/controllers/api/v1/services_controller.rb b/app/controllers/api/v1/services_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::ServicesController < ::ApiController
   def index
     respond_to do |format|
       format.json {
-        render json: Service.all, each_serializer: ServiceSerializer
+        render json: Service.all.order(:id), each_serializer: ServiceSerializer
       }
     end
   end

diff --git a/app/serializers/service_provider_serializer.rb b/app/serializers/service_provider_serializer.rb
@@ -10,7 +10,6 @@ class ServiceProviderSerializer < ActiveModel::Serializer
     :department,
     :department_abbreviation,
     :bureau,
-    :bureau_abbreviation,
     :inactive,
     :url,
     :new

diff --git a/app/serializers/service_serializer.rb b/app/serializers/service_serializer.rb
@@ -13,7 +13,6 @@ class ServiceSerializer < ActiveModel::Serializer
     :hisp,
     :department,
     :bureau,
-    :bureau_abbreviation,
     :service_abbreviation,
     :service_slug,
     :service_owner_email,

diff --git a/app/views/admin/service_providers/show.html.erb b/app/views/admin/service_providers/show.html.erb
@@ -85,11 +85,6 @@
       <%= @service_provider.bureau %>
     </p>
 
-    <p>
-      <strong>Bureau abbreviation:</strong>
-      <%= @service_provider.bureau_abbreviation %>
-    </p>
-
     <p>
       <strong>Slug:</strong>
       <%= @service_provider.slug %>

diff --git a/app/views/admin/services/_form.html.erb b/app/views/admin/services/_form.html.erb
@@ -112,11 +112,6 @@
       <%= form.text_field :bureau, class: "usa-input", placeholder: "Bureau" %>
     </div>
 
-    <div class="field">
-      <%= form.label :bureau_abbreviation, class: "usa-label" %>
-      <%= form.text_field :bureau_abbreviation, class: "usa-input", placeholder: "bureau_abbreviation" %>
-    </div>
-
     <div class="field">
       <%= form.label :service_abbreviation, class: "usa-label" %>
       <%= form.text_field :service_abbreviation, class: "usa-input", placeholder: "service_abbreviation" %>

diff --git a/app/views/admin/services/show.html.erb b/app/views/admin/services/show.html.erb
@@ -113,11 +113,6 @@
         <br>
         <%= @service.bureau %>
       </p>
-      <p>
-        <strong>Bureau abbreviation</strong>
-        <br>
-        <%= @service.bureau_abbreviation %>
-      </p>
       <p>
         <strong>Service abbreviation</strong>
         <br>

diff --git a/app/views/admin/websites/_step_indicator.html.erb b/app/views/admin/websites/_step_indicator.html.erb
@@ -55,7 +55,7 @@
         <% end %>
       </span>
     </li>
-    <li class="usa-step-indicator__segment <%= "usa-step-indicator__segment--complete" if website.in_development? || website.production? || website.redirect? || website.archived? || website.decommissioned? %> <%= "usa-step-indicator__segment--current" if website.newly_requested? %>">
+    <li class="usa-step-indicator__segment <%= "usa-step-indicator__segment--complete" if website.request_approved? || website.in_development? || website.production? || website.redirect? || website.archived? || website.decommissioned? %> <%= "usa-step-indicator__segment--current" if website.newly_requested? %>">
       <span class="usa-step-indicator__segment-label">
         Approved
         <span class="usa-sr-only">completed</span>

diff --git a/app/views/admin/websites/show.html.erb b/app/views/admin/websites/show.html.erb
@@ -56,22 +56,20 @@
         <%= time_ago_in_words(@website.updated_at) %> ago
       </small>
     </p>
-    <div class="grid-row">
-      <div class="grid-col-6">
+    <div class="grid-row grid-gap-lg">
+      <div class="tablet:grid-col-6">
         <label class="usa-label" for="domain">
           Domain
         </label>
         <%= link_to @website.domain, "https://#{@website.domain}", target: "_blank", rel: "noopener" %>
       </div>
-      <div class="grid-col-6">
-        <label class="usa-label" for="site_owner_email">
+      <div class="tablet:grid-col-6">
+        <label class="usa-label" for="redirects_to">
           Redirects to
         </label>
         <%= @website.redirects_to %>
       </div>
-    </div>
-    <div class="grid-row grid-gap-lg">
-      <div class="grid-col-6">
+      <div class="tablet:grid-col-6">
         <label class="usa-label" for="site_owner_email">
           Website owner emails
         </label>
@@ -81,6 +79,7 @@
         <label class="usa-label" for="site_owner_email">
           Website managers emails
         </label>
+        <br>
 
         <% if @website.website_managers.present? %>
         <% @website.website_managers.each do | manager | %>
@@ -96,22 +95,21 @@
         </div>
         <% end %>
       </div>
-      <div class="grid-col-6">
+      <div class="tablet:grid-col-6">
         <label class="usa-label" for="office">
           Office
         </label>
         <%= @website.office %>
         &nbsp;
       </div>
-    </div>
-    <div class="grid-row">
-      <div class="grid-col-6">
+
+      <div class="tablet:grid-col-6">
         <label class="usa-label" for="site_owner_email">
           Contact email
         </label>
         <%= @website.contact_email %>
       </div>
-      <div class="grid-col-6">
+      <div class="tablet:grid-col-6">
         <label class="usa-label" for="office">
           Sub-office
         </label>
@@ -142,7 +140,7 @@
       </p>
     </div>
     <div class="grid-col-6">
-      <label class="usa-label" for="parent_domain">
+      <label class="usa-label" for="digital_brand_category">
         Digital brand category
       </label>
       <p>
@@ -158,13 +156,13 @@
   </div>
   <div class="grid-row">
     <div class="grid-col-6">
-      <label class="usa-label" for="parent_domain">
+      <label class="usa-label" for="required_by_law_or_policy">
         Required by law or policy
       </label>
       <%= @website.required_by_law_or_policy || "no answer" %>
     </div>
     <div class="grid-col-6">
-      <label class="usa-label" for="parent_domain">
+      <label class="usa-label" for="notes">
         Notes
       </label>
       <%= @website.notes %>

diff --git a/app/views/components/_footer.html.erb b/app/views/components/_footer.html.erb
@@ -9,7 +9,7 @@
         </li>
         <li>
           <a href="mailto:[email protected]" class="usa-link">
-            Email for customer support</a>
+            Customer support</a>
         </li>
         <li>
           <a href="https://www.gsa.gov/about-us/organization/federal-acquisition-service/technology-transformation-services/tts-solutions#data" target="_blank" rel="noopener" class="usa-link">