From f4c658436efcf39f7449cfdb596f1424469079d7 Mon Sep 17 00:00:00 2001 From: Arthur de Moulins Date: Tue, 10 Oct 2023 23:53:59 +0200 Subject: [PATCH] WIP --- bin/dev/deploy-minikube.sh | 1 + databox/client/yarn.lock | 5 +++++ expose/client/src/component/ConfigWrapper.js | 7 +++++++ .../src/component/layouts/shared-components/AssetProxy.js | 1 + .../component/layouts/shared-components/VideoPlayer.tsx | 4 ++++ infra/helm/ps/Chart.lock | 6 +++--- infra/helm/ps/Chart.yaml | 2 +- infra/helm/ps/templates/config/php-configmap.yaml | 3 +++ infra/helm/ps/templates/databox/secrets.yaml | 4 ++-- infra/helm/ps/values.yaml | 3 +++ infra/helm/sample.yaml | 7 +++++++ uploader/client/yarn.lock | 5 +++++ 12 files changed, 42 insertions(+), 6 deletions(-) diff --git a/bin/dev/deploy-minikube.sh b/bin/dev/deploy-minikube.sh index daaf0e07a..b31250d71 100755 --- 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 index 42b10e7de..c5c458acd 100644 --- 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 index 013b167ac..d1dbda35a 100644 --- 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 index 326c90cb4..68ac2c95b 100644 --- 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 index 4335dc97e..6ad42204e 100644 --- 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(); @@ -64,6 +66,8 @@ export default React.forwardRef(function VideoPlayer({