Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deploy 19-06-2024 #100

Merged
merged 37 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
d2fafa6
chore: remove remaining references to google_tag module
lazysoundsystem May 13, 2024
15a3fef
fix: undo composer change
lazysoundsystem May 13, 2024
823315c
Merge pull request #86 from UN-OCHA/fix/google_tag
lazysoundsystem May 13, 2024
7f36176
Merge pull request #87 from UN-OCHA/main
lazysoundsystem May 15, 2024
7718801
chore: Update all outdated drupal/* unocha/* drush/* packages.
unocha-jenkins May 16, 2024
ee24555
Merge pull request #88 from UN-OCHA/update/patch-7f36176
lazysoundsystem May 16, 2024
372329a
feat: Feedback form
attiks May 22, 2024
690ee94
chore: Update all outdated drupal/* unocha/* drush/* packages.
unocha-jenkins May 23, 2024
a86442e
Merge pull request #90 from UN-OCHA/update/patch-ee24555
lazysoundsystem May 27, 2024
e13110b
chore: add and configure seckit
lazysoundsystem May 28, 2024
ce8656d
Merge pull request #91 from UN-OCHA/feature/OPS-10398-add-seckit
lazysoundsystem May 28, 2024
052a518
chore: Update all outdated drupal/* unocha/* drush/* packages.
unocha-jenkins May 30, 2024
831bee2
Merge pull request #92 from UN-OCHA/update/patch-ce8656d
lazysoundsystem May 30, 2024
c59a3ca
Merge branch 'develop' into OPS-10417
attiks May 30, 2024
5ea85ed
feat: Feedback form copy button
attiks May 30, 2024
6db80e9
feat: Log timing, add stats page, export and json
attiks May 31, 2024
992edd1
chore: Fix join
attiks Jun 1, 2024
89615ce
chore: Fix join, add thumbs, timings
attiks Jun 4, 2024
0148d78
bug: fix z-index
attiks Jun 4, 2024
16f79df
chore: allow google tracking
lazysoundsystem Jun 4, 2024
d1706b7
Merge pull request #93 from UN-OCHA/feature/OPS-10398-add-seckit
lazysoundsystem Jun 4, 2024
d853ccd
chore: Update all outdated drupal/* unocha/* drush/* packages.
unocha-jenkins Jun 6, 2024
bee7b61
Merge pull request #94 from UN-OCHA/update/patch-d1706b7
lazysoundsystem Jun 6, 2024
96c21df
chore: Small tweaks
attiks Jun 6, 2024
652790a
chore: Small tweaks
attiks Jun 6, 2024
c8d59fa
Merge pull request #89 from UN-OCHA/OPS-10417
attiks Jun 6, 2024
25f14dd
chore: Small tweaks
attiks Jun 6, 2024
4eb4947
chore: remove ad domains from csp
lazysoundsystem Jun 10, 2024
6948497
fix: add spaces for phpcs
lazysoundsystem Jun 10, 2024
b377ec0
chore: remove line which shouldn't be included
lazysoundsystem Jun 10, 2024
1d9084c
Merge pull request #96 from UN-OCHA/feature/OPS-10398-add-seckit
lazysoundsystem Jun 10, 2024
767b143
chore(deps): bump composer/composer from 2.7.6 to 2.7.7
dependabot[bot] Jun 10, 2024
6a69b46
Merge pull request #97 from UN-OCHA/dependabot/composer/composer/comp…
lazysoundsystem Jun 11, 2024
93205c6
chore(deps-dev): bump braces
dependabot[bot] Jun 11, 2024
01e132a
Merge pull request #98 from UN-OCHA/dependabot/npm_and_yarn/html/them…
lazysoundsystem Jun 11, 2024
a1aa8a6
chore: Update all outdated drupal/* unocha/* drush/* packages.
unocha-jenkins Jun 13, 2024
7efd8b1
Merge pull request #99 from UN-OCHA/update/patch-01e132a
lazysoundsystem Jun 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"drupal/private_content": "^2.0",
"drupal/queue_ui": "^3.1",
"drupal/redirect": "^1.8",
"drupal/seckit": "^2.0",
"drupal/social_auth_hid": "^3.2",
"drupal/stable": "^2.0",
"drupal/user_display_name": "^1.1",
Expand Down
761 changes: 425 additions & 336 deletions composer.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dependencies:
- comment.type.ai_feedback
- field.field.comment.ai_feedback.comment_body
- field.field.comment.ai_feedback.field_rating
- field.field.comment.ai_feedback.field_thumbs
module:
- text
id: comment.ai_feedback.default
Expand All @@ -20,14 +21,20 @@ content:
third_party_settings: { }
comment_body:
type: text_textarea
weight: 2
weight: 3
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
field_rating:
type: options_select
weight: 2
region: content
settings: { }
third_party_settings: { }
field_thumbs:
type: options_buttons
weight: 1
region: content
settings: { }
Expand Down
10 changes: 9 additions & 1 deletion config/core.entity_view_display.comment.ai_feedback.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dependencies:
- comment.type.ai_feedback
- field.field.comment.ai_feedback.comment_body
- field.field.comment.ai_feedback.field_rating
- field.field.comment.ai_feedback.field_thumbs
module:
- options
- text
Expand All @@ -19,9 +20,16 @@ content:
label: hidden
settings: { }
third_party_settings: { }
weight: 1
weight: 2
region: content
field_rating:
type: list_default
label: inline
settings: { }
third_party_settings: { }
weight: 1
region: content
field_thumbs:
type: list_default
label: inline
settings: { }
Expand Down
2 changes: 1 addition & 1 deletion config/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ module:
config_split: 0
config_translation: 0
content_moderation: 0
csp: 0
ctools: 0
datetime: 0
datetime_range: 0
Expand Down Expand Up @@ -61,6 +60,7 @@ module:
queue_ui: 0
redirect: 0
responsive_image: 0
seckit: 0
social_api: 0
social_auth: 0
social_auth_hid: 0
Expand Down
76 changes: 0 additions & 76 deletions config/csp.settings.yml

This file was deleted.

21 changes: 21 additions & 0 deletions config/field.field.comment.ai_feedback.field_thumbs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
uuid: 9b2f5370-a881-4beb-ad4f-3423b9770471
langcode: en
status: true
dependencies:
config:
- comment.type.ai_feedback
- field.storage.comment.field_thumbs
module:
- options
id: comment.ai_feedback.field_thumbs
field_name: field_thumbs
entity_type: comment
bundle: ai_feedback
label: Thumbs
description: ''
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings: { }
field_type: list_string
30 changes: 30 additions & 0 deletions config/field.storage.comment.field_thumbs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
uuid: 040291b4-fd6a-4322-ad67-06edd49e0acd
langcode: en
status: true
dependencies:
module:
- comment
- options
id: comment.field_thumbs
field_name: field_thumbs
entity_type: comment
type: list_string
settings:
allowed_values:
-
value: up
label: Up
-
value: down
label: Down
-
value: neutral
label: 'Provide detailed feedback'
allowed_values_function: ''
module: options
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
3 changes: 3 additions & 0 deletions config/field.storage.node.field_document_language.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ settings:
-
value: Arabic
label: Arabic
-
value: ara
label: Arabic
-
value: chi_sim
label: Chinese
Expand Down
22 changes: 0 additions & 22 deletions config/monitoring.sensor_config.core_requirements_csp.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ settings:
file: file
file_mdm: file_mdm
filter: filter
google_tag: google_tag
image: image
imageapi_optimize: imageapi_optimize
imageapi_optimize_binaries: imageapi_optimize_binaries
Expand Down
56 changes: 56 additions & 0 deletions config/seckit.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
_core:
default_config_hash: x6bhN6WZwfVUI_LLMvRJIUW_2c26VTaBozbfXmJWmro
seckit_xss:
csp:
checkbox: true
vendor-prefix:
x: true
webkit: false
report-only: false
default-src: "'self'"
script-src: "'self' 'unsafe-inline' fonts.googleapis.com www.gstatic.com https://*.google.com https://*.googletagmanager.com *.google-analytics.com https://tagmanager.google.com"
object-src: "'none'"
style-src: "'self' 'unsafe-inline' https://googletagmanager.com https://tagmanager.google.com fonts.googleapis.com"
img-src: "'self' data: https://*.google-analytics.com https://*.googletagmanager.com gstatic.com https://www.google.com https://google.com"
media-src: "'none'"
frame-src: "'self' https://www.googletagmanager.com"
frame-ancestors: "'self'"
child-src: "'self'"
font-src: "'self' data: fonts.gstatic.com"
connect-src: "'self' https://*.google-analytics.com https://analytics.google.com https://*.analytics.google.com https://*.googletagmanager.com"
report-uri: /report-csp-violation
upgrade-req: false
policy-uri: ''
x_xss:
seckit_x_xss_option_disable: Disabled
seckit_x_xss_option_0: '0'
seckit_x_xss_option_1: 1;
seckit_x_xss_option_1_block: '1; mode=block'
select: 0
seckit_csrf:
origin: true
origin_whitelist: ''
seckit_clickjacking:
js_css_noscript: false
noscript_message: 'Sorry, you need to enable JavaScript to visit this website.'
x_frame: '1'
x_frame_allow_from: ''
seckit_ssl:
hsts: true
hsts_subdomains: true
hsts_max_age: 31536000
hsts_preload: false
seckit_ct:
expect_ct: false
max_age: 86400
report_uri: ''
enforce: false
seckit_fp:
feature_policy: false
feature_policy_policy: ''
seckit_various:
from_origin: false
from_origin_destination: same
referrer_policy: false
referrer_policy_policy: strict-origin-when-cross-origin
disable_autocomplete: false
2 changes: 2 additions & 0 deletions config/user.role.user_manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- content_moderation
- node
- node_view_permissions
- ocha_ai_summarize
- toolbar
id: user_manager
label: 'User manager'
Expand All @@ -18,6 +19,7 @@ permissions:
- 'access user profiles'
- 'administer users'
- 'edit any summary content'
- 'ocha_ai_summarize stats'
- 'view any action_points content'
- 'view any summary content'
- 'view any unpublished content'
Expand Down
61 changes: 61 additions & 0 deletions html/modules/custom/ocha_ai_summarize/ocha_ai_summarize.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?php

/**
* @file
* Defines schema for the OCHA AI Summarize module tables.
*/

/**
* Implements hook_schema().
*/
function ocha_ai_summarize_schema() {
$schema['ocha_ai_summarize_log_time'] = [
'fields' => [
'id' => [
'description' => 'Unique ID.',
'type' => 'serial',
'unsigned' => TRUE,
'size' => 'normal',
'not null' => TRUE,
],
'nid' => [
'description' => 'Node id.',
'type' => 'int',
'unsigned' => TRUE,
'size' => 'normal',
'not null' => TRUE,
'default' => 0,
],
'action' => [
'description' => 'Action',
'type' => 'varchar_ascii',
'length' => 128,
'not null' => TRUE,
'default' => '',
],
'duration' => [
'description' => 'Duration in milliseconds.',
'type' => 'int',
'unsigned' => TRUE,
'size' => 'normal',
'not null' => FALSE,
'default' => 0,
],
],
'primary key' => ['id'],
];

return $schema;
}

/**
* Implements hook_update_N().
*
* Add the OCHA AI timing logs table.
*/
function ocha_ai_summarize_update_10001(array &$sandbox) {
$schema = \Drupal::database()->schema();
if (!$schema->tableExists('ocha_ai_summarize_log_time')) {
$schema->createTable('ocha_ai_summarize_log_time', ocha_ai_summarize_schema()['ocha_ai_summarize_log_time']);
}
}
Loading
Loading