Merge pull request #831 from UN-OCHA/develop

Main -> Develop - v2.12.0

config/core.entity_form_display.taxonomy_term.career_category.default.yml

@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.taxonomy_term.career_category.field_example_job_posting
     - taxonomy.vocabulary.career_category
   module:
     - allowed_formats
@@ -23,6 +24,14 @@ content:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
+  field_example_job_posting:
+    type: string_textarea
+    weight: 26
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   name:
     type: string_textfield
     weight: 0

config/core.entity_view_display.taxonomy_term.career_category.default.yml

@@ -0,0 +1,24 @@
+uuid: fef95ead-4c02-40c3-b873-87b5dd8a5d4b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.taxonomy_term.career_category.field_example_job_posting
+    - taxonomy.vocabulary.career_category
+  module:
+    - text
+id: taxonomy_term.career_category.default
+targetEntityType: taxonomy_term
+bundle: career_category
+mode: default
+content:
+  description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  field_example_job_posting: true
+  langcode: true

config/core.entity_view_display.taxonomy_term.job_type.default.yml

@@ -0,0 +1,22 @@
+uuid: cb9d4999-507d-4dee-9269-ccd3f93c8245
+langcode: en
+status: true
+dependencies:
+  config:
+    - taxonomy.vocabulary.job_type
+  module:
+    - text
+id: taxonomy_term.job_type.default
+targetEntityType: taxonomy_term
+bundle: job_type
+mode: default
+content:
+  description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  langcode: true

config/field.field.taxonomy_term.career_category.field_example_job_posting.yml

@@ -0,0 +1,19 @@
+uuid: 20621feb-6d79-438c-8400-b094d6adea7b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.taxonomy_term.field_example_job_posting
+    - taxonomy.vocabulary.career_category
+id: taxonomy_term.career_category.field_example_job_posting
+field_name: field_example_job_posting
+entity_type: taxonomy_term
+bundle: career_category
+label: 'Example job posting'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string_long

config/field.storage.taxonomy_term.field_example_job_posting.yml

@@ -0,0 +1,19 @@
+uuid: 54227357-8d35-4da4-ad1f-6a554c1a9fb6
+langcode: en
+status: true
+dependencies:
+  module:
+    - taxonomy
+id: taxonomy_term.field_example_job_posting
+field_name: field_example_job_posting
+entity_type: taxonomy_term
+type: string_long
+settings:
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

config/ocha_ai.settings.yml

@@ -38,6 +38,17 @@ plugins:
       max_tokens: 8192
       api_secret: REPLACE_WITH_SECRET
       role_arn: null
+    aws_bedrock_titan_embed_text_v2:
+      model: amazon.titan-embed-text-v2:0
+      endpoint: ''
+      version: ''
+      region: null
+      api_key: null
+      batch_size: 1
+      dimensions: 1024
+      max_tokens: 8192
+      api_secret: null
+      role_arn: null
     azure_openai:
       model: text-embedding-ada-002
       endpoint: REPLACE_WITH_ENDPOINT

config/ocha_ai_tag.settings.yml

@@ -6,16 +6,16 @@ defaults:
       value: 'The process of posting jobs via ReliefWeb is now even smoother. The form now includes an automated function for the "career" and "themes" categories; fewer fields for users to fill and higher efficiency overall.'
       format: markdown_editor
   plugins:
-    completion:
-      plugin_id: aws_bedrock
     embedding:
-      plugin_id: aws_bedrock
-    source:
-      plugin_id: reliefweb
+      plugin_id: aws_bedrock_titan_embed_text_v2
     text_extractor:
       application/pdf:
         plugin_id: mupdf
     text_splitter:
       plugin_id: token
     vector_store:
       plugin_id: elasticsearch
+    completion:
+      plugin_id: aws_bedrock
+    source:
+      plugin_id: reliefweb

config/reliefweb_job_tagger.settings.yml

@@ -0,0 +1 @@
+use_es: true

config/seckit.settings.yml

@@ -8,16 +8,16 @@ seckit_xss:
       webkit: false
     report-only: false
     default-src: "'self'"
-    script-src: "'self' 'unsafe-inline' 'unsafe-eval' fonts.googleapis.com www.gstatic.com https://*.google.com https://*.googletagmanager.com *.google-analytics.com"
+    script-src: "'self' 'unsafe-inline' fonts.googleapis.com www.gstatic.com https://*.google.com https://*.googletagmanager.com *.google-analytics.com https://tagmanager.google.com  https://www.googleadservices.com  https://googleads.g.doubleclick.net"
     object-src: "'none'"
-    style-src: "'self' 'unsafe-inline' fonts.googleapis.com"
+    style-src: "'self' 'unsafe-inline' https://googletagmanager.com https://tagmanager.google.com fonts.googleapis.com"
     img-src: "'self' data: https://*"
     media-src: "'none'"
-    frame-src: "'self' https://*.mapbox.com https://www.youtube.com https://youtu.be"
+    frame-src: "'self' https://www.googletagmanager.com https://bid.g.doubleclick.net https://td.doubleclick.net https://*.mapbox.com https://www.youtube.com https://youtu.be"
     frame-ancestors: "'self'"
     child-src: "'self' blob: https:"
     font-src: "'self' data: fonts.gstatic.com"
-    connect-src: "'self' https://api.reliefweb.int https://*.google-analytics.com https://analytics.google.com https://*.analytics.google.com https://*.googletagmanager.com"
+    connect-src: "'self' https://*"
     report-uri: /report-csp-violation
     upgrade-req: true
     policy-uri: ''

html/modules/custom/reliefweb_job_tagger/config/install/reliefweb_job_tagger.settings.yml

@@ -0,0 +1 @@
+use_es: true

html/modules/custom/reliefweb_job_tagger/reliefweb_job_tagger.permissions.yml

@@ -5,3 +5,7 @@ enforce ocha ai job tag:
 bypass ocha ai job tag:
   title: 'Bypass OCHA AI Job tag'
   description: 'Allow users to ignore Access OCHA AI Chat advanced features.'
+
+test ocha ai job tag:
+  title: 'Test OCHA AI Job tag'
+  description: 'Allow users to use a form to test job tagging.'

html/modules/custom/reliefweb_job_tagger/reliefweb_job_tagger.routing.yml

@@ -0,0 +1,7 @@
+test_ocha_ai_job_tag:
+  path: '/admin/test-job-tagger'
+  defaults:
+    _form: '\Drupal\reliefweb_job_tagger\Form\RwJobTagger'
+    _title: 'Test job tagger'
+  requirements:
+    _permission: 'test ocha ai job tag'