PGOV-1277 Re-order council document form display fields and remove eCouncil Attorney tab

web/modules/custom/portland/portland.links.menu.yml

@@ -10,6 +10,12 @@ portland.logout:
   route_name: user.logout
   weight: 60
   menu_name: editor-toolbar
+portland.council_toolbar.committees:
+  title: 'Committees'
+  description: 'Edit council committees'
+  url: "internal:/admin/structure/taxonomy/manage/council_committee/overview"
+  menu_name: council-toolbar
+  weight: 40
 portland.policy_toolbar.policy_categories:
   title: 'Policy Categories'
   description: 'Edit policy categories'

web/sites/default/config/bulk_user_registration.settings.yml

@@ -5,7 +5,6 @@ allowed_roles:
   publisher: publisher
   policy_author: policy_author
   policy_editor: policy_editor
-  attorney: attorney
   council_author: council_author
   council_clerk: council_clerk
   budget: budget

web/sites/default/config/core.entity_form_display.node.council_document.default.yml

@@ -36,7 +36,6 @@ dependencies:
     - field.field.node.council_document.field_purpose_and_background
     - field.field.node.council_document.field_requested_council_date
     - field.field.node.council_document.field_requested_start_time
-    - field.field.node.council_document.field_reviewed_by_city_attorney
     - field.field.node.council_document.field_reviewer
     - field.field.node.council_document.field_substituted_by_council
     - field.field.node.council_document.field_time_requested
@@ -414,11 +413,12 @@ content:
           dependee: field_council_document_type
           settings:
             state: visible
+            reset: false
             condition: value
             grouping: OR
             values_set: 3
             value: ''
-            values: "72\r\n73"
+            values: '73'
             value_form:
               -
                 target_id: '73'
@@ -514,19 +514,20 @@ content:
           dependee: field_council_document_type
           settings:
             state: visible
+            reset: false
             condition: value
             grouping: OR
             values_set: 3
             value: ''
-            values: "72\r\n73\r\n74"
+            values: '73'
             value_form: {  }
             effect: show
             effect_options: {  }
             selector: ''
             form_mode: default
   field_neighborhood:
     type: select2_entity_reference
-    weight: 10
+    weight: 11
     region: content
     settings:
       width: 100%
@@ -716,7 +717,6 @@ content:
 hidden:
   field_date_prepared: true
   field_redirects: true
-  field_reviewed_by_city_attorney: true
   group_content: true
   langcode: true
   promote: true

web/sites/default/config/core.entity_form_display.taxonomy_term.council_committee.default.yml

@@ -5,7 +5,6 @@ dependencies:
   config:
     - field.field.taxonomy_term.council_committee.field_chair
     - field.field.taxonomy_term.council_committee.field_committee_members
-    - field.field.taxonomy_term.council_committee.field_prefix
     - field.field.taxonomy_term.council_committee.field_vice_chair
     - taxonomy.vocabulary.council_committee
   module:
@@ -44,14 +43,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  field_prefix:
-    type: string_textfield
-    weight: 2
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
   field_vice_chair:
     type: entity_reference_autocomplete
     weight: 4

web/sites/default/config/core.entity_view_display.node.council_document.default.yml

@@ -36,7 +36,6 @@ dependencies:
     - field.field.node.council_document.field_purpose_and_background
     - field.field.node.council_document.field_requested_council_date
     - field.field.node.council_document.field_requested_start_time
-    - field.field.node.council_document.field_reviewed_by_city_attorney
     - field.field.node.council_document.field_reviewer
     - field.field.node.council_document.field_substituted_by_council
     - field.field.node.council_document.field_time_requested
@@ -311,7 +310,6 @@ hidden:
   field_is_amends_budget: true
   field_needs_attorney_review: true
   field_neighborhood: true
-  field_reviewed_by_city_attorney: true
   field_reviewer: true
   group_content: true
   langcode: true

web/sites/default/config/core.entity_view_display.node.council_document.embedded.yml

@@ -37,7 +37,6 @@ dependencies:
     - field.field.node.council_document.field_purpose_and_background
     - field.field.node.council_document.field_requested_council_date
     - field.field.node.council_document.field_requested_start_time
-    - field.field.node.council_document.field_reviewed_by_city_attorney
     - field.field.node.council_document.field_reviewer
     - field.field.node.council_document.field_substituted_by_council
     - field.field.node.council_document.field_time_requested
@@ -153,7 +152,6 @@ hidden:
   field_purpose_and_background: true
   field_requested_council_date: true
   field_requested_start_time: true
-  field_reviewed_by_city_attorney: true
   field_reviewer: true
   field_substituted_by_council: true
   field_time_requested: true

web/sites/default/config/core.entity_view_display.node.council_document.search_result.yml

@@ -37,7 +37,6 @@ dependencies:
     - field.field.node.council_document.field_purpose_and_background
     - field.field.node.council_document.field_requested_council_date
     - field.field.node.council_document.field_requested_start_time
-    - field.field.node.council_document.field_reviewed_by_city_attorney
     - field.field.node.council_document.field_reviewer
     - field.field.node.council_document.field_substituted_by_council
     - field.field.node.council_document.field_time_requested
@@ -152,7 +151,6 @@ hidden:
   field_purpose_and_background: true
   field_requested_council_date: true
   field_requested_start_time: true
-  field_reviewed_by_city_attorney: true
   field_reviewer: true
   field_substituted_by_council: true
   field_time_requested: true

web/sites/default/config/core.entity_view_display.node.council_document.teaser.yml

@@ -37,7 +37,6 @@ dependencies:
     - field.field.node.council_document.field_purpose_and_background
     - field.field.node.council_document.field_requested_council_date
     - field.field.node.council_document.field_requested_start_time
-    - field.field.node.council_document.field_reviewed_by_city_attorney
     - field.field.node.council_document.field_reviewer
     - field.field.node.council_document.field_substituted_by_council
     - field.field.node.council_document.field_time_requested
@@ -125,7 +124,6 @@ hidden:
   field_purpose_and_background: true
   field_requested_council_date: true
   field_requested_start_time: true
-  field_reviewed_by_city_attorney: true
   field_reviewer: true
   field_substituted_by_council: true
   field_time_requested: true

web/sites/default/config/core.entity_view_display.taxonomy_term.council_committee.default.yml

@@ -5,7 +5,6 @@ dependencies:
   config:
     - field.field.taxonomy_term.council_committee.field_chair
     - field.field.taxonomy_term.council_committee.field_committee_members
-    - field.field.taxonomy_term.council_committee.field_prefix
     - field.field.taxonomy_term.council_committee.field_vice_chair
     - taxonomy.vocabulary.council_committee
     - views.view.council_documents
@@ -162,6 +161,5 @@ content:
     weight: 3
     region: content
 hidden:
-  field_prefix: true
   langcode: true
   search_api_excerpt: true

web/sites/default/config/diff.plugins.yml

@@ -1126,9 +1126,6 @@ fields:
         show_header: 1
         markdown: drupal_html_to_text
         compare_entity_reference: 1
-    field_reviewed_by_city_attorney:
-      type: hidden
-      settings: {  }
     field_reviewer:
       type: entity_reference_field_diff_builder
       settings:

web/sites/default/config/field.field.node.council_document.field_reviewer.yml

@@ -18,7 +18,7 @@ field_name: field_reviewer
 entity_type: node
 bundle: council_document
 label: Reviewer
-description: "<p>Add one or more reviewers to move the Council document through the following review states.</p>\r\n<ul>\r\n<li><strong>Bureau review:</strong> assign to the appropriate staff for internal or bureau-specific reviews (e.g. supervisor, director, etc.).</li>\r\n<li><strong>Attorney review:</strong> assign to the City Attorney that your bureau partners with for Council document review. City Attorney approval is required for intergovernmental agreements, contracts, code amendments, easements, charter amendments, and comprehensive plan amendments.</li>\r\n<li><strong>Code review:</strong> assign to “Council Clerk” to request review of a Code amendment at least two weeks before the requested Council meeting date.</li>\r\n<li><strong>Budget office review:</strong> assign to \"Council Document Review - Budget Office\".</li>\r\n<li><strong>Elected review:</strong> assign to staff in the Office of the Commissioner-in-Charge to approve item to be placed on the Council agenda.</li>\r\n<li><strong>Council clerk review:</strong> (elected Offices only)</li>\r\n</ul>\r\n<p>The filing deadline for Elected Offices is 12:00 p.m. on Tuesday for the following week’s meetings. The Council Clerk’s Office will review Council documents set to Council Clerk review and note changes or questions in the revision log, then place the item in the Ready for Agenda state when finalized.</p>"
+description: "<p>Add one or more reviewers to move the Council document through the following review states.</p>\r\n<ul>\r\n<li><strong>Bureau review:</strong> assign to the appropriate staff for internal or bureau-specific reviews (e.g. supervisor, director, etc.).</li>\r\n<li><strong>Attorney review:</strong> assign to the City Attorney that your bureau partners with for Council document review. City Attorney approval is required for intergovernmental agreements, contracts, code amendments, easements, charter amendments, and comprehensive plan amendments.</li>\r\n<li><strong>Code review:</strong> assign to “Council Clerk” to request review of a Code amendment at least two weeks before the requested Council meeting date.</li>\r\n<li><strong>Elected review:</strong> assign to staff in the Office of the Commissioner-in-Charge to approve item to be placed on the Council agenda.</li>\r\n<li><strong>Council clerk review:</strong> (elected Offices only)</li>\r\n</ul>\r\n<p>The filing deadline for Elected Offices is 12:00 p.m. on Tuesday for the following week’s meetings. The Council Clerk’s Office will review Council documents set to Council Clerk review and note changes or questions in the revision log, then place the item in the Ready for Agenda state when finalized.</p>"
 required: false
 translatable: false
 default_value: {  }

web/sites/default/config/field.storage.node.field_reviewer.yml

@@ -3,12 +3,8 @@ langcode: en
 status: true
 dependencies:
   module:
-    - field_permissions
     - node
     - user
-third_party_settings:
-  field_permissions:
-    permission_type: public
 id: node.field_reviewer
 field_name: field_reviewer
 entity_type: node

web/sites/default/config/samlauth.authentication.yml

@@ -54,7 +54,6 @@ map_users_roles:
   publisher: publisher
   policy_author: policy_author
   policy_editor: policy_editor
-  attorney: attorney
   council_author: council_author
   council_clerk: council_clerk
   budget: budget