- ' + filter_html_help: false + filter_html_nofollow: true + filter_html_escape: + id: filter_html_escape + provider: filter + status: false + weight: -45 + settings: { } + filter_html_image_secure: + id: filter_html_image_secure + provider: filter + status: false + weight: -36 + settings: { } + filter_htmlcorrector: + id: filter_htmlcorrector + provider: filter + status: true + weight: -47 + settings: { } + filter_image_lazy_load: + id: filter_image_lazy_load + provider: filter + status: false + weight: -35 + settings: { } + filter_url: + id: filter_url + provider: filter + status: false + weight: -40 + settings: + filter_url_length: 72 + ocha_reliefweb_external_link_filter: + id: ocha_reliefweb_external_link_filter + provider: ocha_reliefweb + status: true + weight: -46 + settings: { } diff --git a/config/ocha_reliefweb.reliefweb_resource_type.report.yml b/config/ocha_reliefweb.reliefweb_resource_type.report.yml new file mode 100644 index 00000000..0adc0783 --- /dev/null +++ b/config/ocha_reliefweb.reliefweb_resource_type.report.yml @@ -0,0 +1,15 @@ +uuid: fdaaac6c-8399-4135-8423-3df6a61848b7 +langcode: en +status: true +dependencies: + enforced: + module: + - ocha_reliefweb +settings: + disable_page_title: true + preview_warning: + value: '
This is a preview. The document is not yet published.
The URLs (document, files and images) are not publicly accessible so do not share them.
' + format: ocha_reliefweb_editor +id: report +label: Report +description: 'ReliefWeb report' diff --git a/config/ocha_reliefweb.settings.yml b/config/ocha_reliefweb.settings.yml new file mode 100644 index 00000000..d3292201 --- /dev/null +++ b/config/ocha_reliefweb.settings.yml @@ -0,0 +1,14 @@ +reliefweb_api_url: 'https://api.reliefweb.int/v1' +reliefweb_api_appname: unocha.org +reliefweb_api_cache_enabled: true +reliefweb_api_cache_lifetime: 300 +reliefweb_api_cache_namespace: 'reliefweb:api' +reliefweb_api_verify_ssl: true +reliefweb_website: 'https://reliefweb.int' +reliefweb_document_not_found_max_age: 600 +reliefweb_api_converter: 'https://reliefweb.int/search/converter/json' +reliefweb_api_use_redirects: true +reliefweb_api_post_api_schema_url: 'https://reliefweb.int/post-api-schemas/v2/' +reliefweb_api_submission_base_url: /reliefweb-submissions +reliefweb_api_submission_file_base_uri: 'public://reliefweb-submissions' +template_class_prefix: ocha-reliefweb diff --git a/config/user.role.anonymous.yml b/config/user.role.anonymous.yml index e8e00301..247cfaa5 100644 --- a/config/user.role.anonymous.yml +++ b/config/user.role.anonymous.yml @@ -5,6 +5,7 @@ dependencies: module: - contact - media + - ocha_reliefweb - system _core: default_config_hash: j5zLMOdJBqC0bMvSdth5UebkprJB8g_2FXHqhfpJzow @@ -14,5 +15,6 @@ weight: 0 is_admin: false permissions: - 'access content' + - 'access reliefweb resource update webhook' - 'access site-wide contact form' - 'view media' diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml index e288ba21..e7b80c92 100644 --- a/config/user.role.editor.yml +++ b/config/user.role.editor.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - filter.format.ckeditor + - filter.format.ocha_reliefweb_editor - filter.format.text_editor_simple - media.type.image - media.type.video @@ -15,6 +16,7 @@ dependencies: - node.type.resource - node.type.response - node.type.story + - ocha_reliefweb.reliefweb_resource_type.report - taxonomy.vocabulary.contacts - taxonomy.vocabulary.country - taxonomy.vocabulary.event_type @@ -31,6 +33,7 @@ dependencies: - node - ocha_datawrapper - ocha_key_figures + - ocha_reliefweb - paragraphs - path - redirect @@ -49,6 +52,8 @@ permissions: - 'access content overview' - 'access content samples' - 'access media overview' + - 'access reliefweb resource preview files' + - 'access reliefweb resource update webhook' - 'access stories entity browser pages' - 'access taxonomy overview' - 'access toolbar' @@ -65,6 +70,7 @@ permissions: - 'administer ocha presences' - 'administer redirects' - 'administer reliefweb breadcrumbs' + - 'administer reliefweb resources' - 'administer taxonomy' - 'create basic content' - 'create content translations' @@ -74,6 +80,7 @@ permissions: - 'create media' - 'create media_collection content' - 'create region content' + - 'create report content' - 'create resource content' - 'create response content' - 'create story content' @@ -85,12 +92,15 @@ permissions: - 'create terms in theme' - 'create url aliases' - 'create video media' + - 'delete any report content' + - 'delete own report content' - 'edit any basic content' - 'edit any event content' - 'edit any image media' - 'edit any leader content' - 'edit any media_collection content' - 'edit any region content' + - 'edit any report content' - 'edit any resource content' - 'edit any response content' - 'edit any story content' @@ -112,6 +122,7 @@ permissions: - 'edit own leader content' - 'edit own media_collection content' - 'edit own region content' + - 'edit own report content' - 'edit own resource content' - 'edit own response content' - 'edit own story content' @@ -158,6 +169,7 @@ permissions: - 'update content translations' - 'update media' - 'use text format ckeditor' + - 'use text format ocha_reliefweb_editor' - 'use text format text_editor_simple' - 'view all media revisions' - 'view all revisions' diff --git a/docker/Dockerfile b/docker/Dockerfile index 10935842..c7ccc722 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -44,7 +44,7 @@ LABEL info.humanitarianresponse.build.date=$BUILD_DATE \ RUN mkdir -p /etc/nginx/custom && \ # Permit nginx access to the MAPBX_SECRET env variable. - sed -i 's/env NGINX_OVERRIDE_PROTOCOL;/env NGINX_OVERRIDE_PROTOCOL;\n\n## Mapbox access token.\nenv MAPBOX_TOKEN;/' /etc/nginx/nginx.conf + sed -i 's/env NGINX_OVERRIDE_PROTOCOL;/env NGINX_OVERRIDE_PROTOCOL;\n\n## Mapbox access token.\nenv MAPBOX_TOKEN;\n\n## ReliefWeb site.\nenv RELIEFWEB_SITE;/' /etc/nginx/nginx.conf COPY --from=builder /srv/www/assets /srv/www/assets COPY --from=builder /srv/www/config /srv/www/config diff --git a/docker/etc/nginx/custom/01_attachment_redirections.conf b/docker/etc/nginx/custom/01_attachment_redirections.conf index 82e51de2..4a300fe1 100644 --- a/docker/etc/nginx/custom/01_attachment_redirections.conf +++ b/docker/etc/nginx/custom/01_attachment_redirections.conf @@ -44,10 +44,12 @@ location @reliefweb-file { ## Ensure the proxy host is in a variable, so nginx will not cache the IP ## indefinitely and cause 502 errors if the load balancer IPs change. - set $reliefweb_host "reliefweb.int"; + ## Retrieve the mapbox access token. + set_by_lua $reliefweb_site 'return os.getenv("RELIEFWEB_SITE") or "https://reliefweb.int"'; ## Pass the request to ReliefWeb. - proxy_pass https://$reliefweb_host; + proxy_ssl_server_name on; + proxy_pass $reliefweb_site; ## Override connection and buffer vars: do not attempt to buffer, just throw ## the data out right away and close the docstore connection when done. diff --git a/html/modules/custom/unocha_reliefweb/unocha_reliefweb.module b/html/modules/custom/unocha_reliefweb/unocha_reliefweb.module index 7ba6dc24..7ee87fb9 100644 --- a/html/modules/custom/unocha_reliefweb/unocha_reliefweb.module +++ b/html/modules/custom/unocha_reliefweb/unocha_reliefweb.module @@ -5,6 +5,8 @@ * Module file for the ReliefWeb integration. */ +use Drupal\Core\Form\FormStateInterface; + /** * Implements hook_theme(). */ @@ -187,3 +189,34 @@ function unocha_reliefweb_theme() { return $themes; } + +/** + * Implements hook_form_FORM_ID_alter(). + */ +function unocha_reliefweb_form_reliefweb_resource_report_add_form_alter(array &$form, FormStateInterface $form_state, string $form_id) { + // Set OCHA as the default source. + if (isset($form['content']['widget'][0]['value']['source'])) { + if (empty($form['content']['widget'][0]['value']['source']['#default_value'])) { + $form['content']['widget'][0]['value']['source']['#default_value'] = [1503]; + } + } + + // Set Situation Report as the default content format. + if (isset($form['content']['widget'][0]['value']['format'])) { + if (empty($form['content']['widget'][0]['value']['format']['#default_value'])) { + $form['content']['widget'][0]['value']['format']['#default_value'] = 10; + } + } + + // Set English as the default language. + if (isset($form['content']['widget'][0]['value']['language'])) { + if (empty($form['content']['widget'][0]['language']['source']['#default_value'])) { + $form['content']['widget'][0]['value']['language']['#default_value'] = [267]; + } + } + + // Hide the origin field. + if (isset($form['content']['widget'][0]['value']['origin'])) { + $form['content']['widget'][0]['value']['origin']['#access'] = FALSE; + } +}