WIP

alchemy-fr · Oct 10, 2023 · f4c6584 · f4c6584
1 parent 6452050
commit f4c6584
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 6 deletions.
diff --git a/bin/dev/deploy-minikube.sh b/bin/dev/deploy-minikube.sh
@@ -30,6 +30,7 @@ case $1 in
       (cd "${CHART_DIR}" && helm dependency update)
     fi
     kubectl create ns $NS || true
+    kubectl -n $NS delete jobs --all
     helm uninstall ${RELEASE_NAME} --namespace $NS || true;
     kubectl -n $NS delete pvc elasticsearch-databox-master-elasticsearch-databox-master-0 || true
     while [ $(kubectl -n $NS get pvc | wc -l) -gt 0 ] || [ $(kubectl -n $NS get pods | wc -l) -gt 0 ]

diff --git a/databox/client/yarn.lock b/databox/client/yarn.lock
@@ -9119,6 +9119,11 @@ react-i18next@^11.16.9:
     html-escaper "^2.0.2"
     html-parse-stringify "^3.0.1"
 
+react-icons@^4.8.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.11.0.tgz#4b0e31c9bfc919608095cc429c4f1846f4d66c65"
+  integrity sha512-V+4khzYcE5EBk/BvcuYRq6V/osf11ODUM2J8hg2FDSswRrGvqiYUYPRy4OdrWaQOBj4NcpJfmHZLNaD+VH0TyA==
+
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"

diff --git a/expose/client/src/component/ConfigWrapper.js b/expose/client/src/component/ConfigWrapper.js
@@ -7,6 +7,13 @@ import FullPageLoader from "./FullPageLoader";
 export default function ConfigWrapper() {
     const [loaded, setLoaded] = useState(false);
 
+    React.useEffect(() => {
+        const _mtm = window._mtm = window._mtm || [];
+        _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
+        const d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+        g.async=true; g.src='{YOUR_MATOMO_TAG_MANAGER_CONTAINER_URL}'; s.parentNode.insertBefore(g,s);
+    }, [])
+
     if (!loaded) {
         apiClient
             .get(`${config.getApiBaseUrl()}/config`)

diff --git a/expose/client/src/component/layouts/shared-components/AssetProxy.js b/expose/client/src/component/layouts/shared-components/AssetProxy.js
@@ -53,6 +53,7 @@ export default class AssetProxy extends PureComponent {
                     webVTTLink={asset.webVTTLink}
                     fluid={fluid}
                     mimeType={type}
+                    assetId={asset.assetId}
                 />
             case type.startsWith('image/'):
                 if (this.props.magnifier) {

diff --git a/expose/client/src/component/layouts/shared-components/VideoPlayer.tsx b/expose/client/src/component/layouts/shared-components/VideoPlayer.tsx
@@ -4,6 +4,7 @@ import {getPosterPlaceholder} from "./placeholders";
 
 type Props = {
     title?: string,
+    assetId: string | undefined,
     description?: string,
     url: string,
     posterUrl?: string,
@@ -20,6 +21,7 @@ export default React.forwardRef(function VideoPlayer({
     webVTTLink,
     fluid,
     mimeType,
+    assetId,
 }: Props, ref) {
     const player = React.useRef<VideoJsPlayer>();
 
@@ -64,6 +66,8 @@ export default React.forwardRef(function VideoPlayer({
             <video
                 ref={setRef}
                 className="video-js vjs-big-play-centered"
+                data-matomo-resource={assetId}
+                data-matomo-title={title}
             >
                 {webVTTLink && <track
                     kind="captions"

diff --git a/infra/helm/ps/Chart.lock b/infra/helm/ps/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: elasticsearch
   repository: https://helm.elastic.co
-  version: 7.10.1
-digest: sha256:1879e5719704ae1fd6e451ccaf696690356021b1640cb21073051fcc894993fb
-generated: "2022-10-19T17:12:20.370969568+02:00"
+  version: 7.17.3
+digest: sha256:5603ff8185f4a14b9a1bf190e3839e6f1875aa99c4e199bbb64ee183df072708
+generated: "2023-09-12T11:50:49.87771556+02:00"
diff --git a/infra/helm/ps/Chart.yaml b/infra/helm/ps/Chart.yaml
@@ -22,6 +22,6 @@ appVersion: 1.17.0
 
 dependencies:
   - name: elasticsearch
-    version: "7.10.1"
+    version: "7.17.3"
     repository: "https://helm.elastic.co"
     condition: elasticsearch.enabled
diff --git a/infra/helm/ps/templates/config/php-configmap.yaml b/infra/helm/ps/templates/config/php-configmap.yaml
@@ -4,6 +4,9 @@ metadata:
   name: php-config
 data:
   APP_ENV: prod
+  {{- if not .Values.security.verifySsl }}
+  VERIFY_SSL: "false"
+  {{- end }}
   TRUSTED_PROXIES: 127.0.0.1,REMOTE_ADDR
 {{- if .Values.newrelic.enabled }}
   NEWRELIC_ENABLED: "1"

diff --git a/infra/helm/ps/templates/databox/secrets.yaml b/infra/helm/ps/templates/databox/secrets.yaml
@@ -5,8 +5,8 @@ kind: Secret
 metadata:
   name: databox-secrets
 stringData:
-  SECRETS_PUBLIC_KEY: {{ required "Missing .databox.app.secrets.publicKey value" .secrets.publicKey | quote }}
-  SECRETS_SECRET_KEY: {{ required "Missing .databox.app.secrets.secretKey value" .secrets.secretKey | quote }}
+  SECRETS_PUBLIC_KEY: {{ required "Missing .databox.app.secrets.publicKey value" .publicKey | quote }}
+  SECRETS_SECRET_KEY: {{ required "Missing .databox.app.secrets.secretKey value" .secretKey | quote }}
 ---
 {{- end }}
 {{- end }}
diff --git a/infra/helm/ps/values.yaml b/infra/helm/ps/values.yaml
@@ -11,6 +11,9 @@ image:
     password:
     email:
 
+security:
+  verifySsl: true
+
 auth:
   enabled: true
   autoConnectIdP:

diff --git a/infra/helm/sample.yaml b/infra/helm/sample.yaml
@@ -6,10 +6,17 @@ auth:
     hostname: "api-auth.phrasea.minikube"
     baseUrl: "https://api-auth.phrasea.minikube"
 
+security:
+  verifySsl: false
+
 databox:
   api:
     hostname: "api-databox.phrasea.minikube"
     baseUrl: "https://api-databox.phrasea.minikube"
+  app:
+    secrets:
+      publicKey: 'j0J1OtLTd78OVhVMEQwd+98EusYkAdN8VNhHIENLlWI='
+      secretKey: 'Y6cqN347d5ShtLCmR3DGE+A2Z+SBw4S1wOTTFrISF3M='
   client:
     hostname: "databox.phrasea.minikube"
     baseUrl: "https://databox.phrasea.minikube"

diff --git a/uploader/client/yarn.lock b/uploader/client/yarn.lock
@@ -7291,6 +7291,11 @@ [email protected]:
     import-local "^3.0.2"
     jest-cli "^26.6.0"
 
+js-cookie@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc"
+  integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"