From ea0a9d2ecc0a579548f4721899079c11f21708e6 Mon Sep 17 00:00:00 2001 From: Emmanuel Torres Date: Wed, 24 Apr 2024 11:21:22 +0200 Subject: [PATCH 01/12] chore: add improvements documentation --- UPGRADE.md | 5 +- example/README.md | 8 +- example/azure-pipelines.yml | 8 +- example/azure/common-steps.yaml | 4 +- example/src/examples/sdk/BuildingFullInfo.tsx | 6 +- example/src/examples/sdk/InfoFromBuilding.tsx | 4 +- example/src/examples/sdk/RouteBetweenPOIs.tsx | 4 +- .../src/examples/wayfinding/NavigateToPoi.tsx | 11 +- example/src/examples/wayfinding/SelectPoi.tsx | 11 +- .../examples/wayfinding/SelectPoiCategory.tsx | 11 +- .../examples/wayfinding/SetFavoritePois.tsx | 11 +- .../src/examples/wayfinding/Wayfinding.tsx | 11 +- example/src/situm.tsx | 27 +++- src/wayfinding/components/MapView.tsx | 2 +- yarn.lock | 138 +++++++++++------- 15 files changed, 177 insertions(+), 84 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index 2a1387f0..eb8b3c66 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -40,16 +40,15 @@ In this file we share a way to upgrade previous versions of react-native-situm-p ```js // your imports -const SITUM_EMAIL = "YOUR_EMAIL_HERE"; const SITUM_API_KEY = "YOUR_APIKEY_HERE"; -const SITUM_BUILDING_ID = "YOUR_BUILDING_ID_HERE"; +const BUILDING_IDENTIFIER = "YOUR_BUILDING_IDENTIFIER_HERE"; const App: React.FC = () => { return ( diff --git a/example/README.md b/example/README.md index ebb7fa0d..113fc5f8 100644 --- a/example/README.md +++ b/example/README.md @@ -62,16 +62,14 @@ pod install ### Step 2: Set your credentials For this step you must create a situm account, so [setup your account](../README.md#setup-your-account) before continuing. -After creating your situm account, you can set your credentials on the properties of [`src/situm.tsx`](./src/situm.tsx), like so: +After creating your situm account, you can set your [credentials](https://situm.com/docs/built-in-wayfinding-ui/#prepare-viewer) on the properties of [`src/situm.tsx`](./src/situm.tsx), like so: ```js -export const SITUM_EMAIL = ''; export const SITUM_API_KEY = ''; -export const SITUM_BUILDING_ID = ''; // Identifier of the building -export const SITUM_DASHBOARD_URL = 'https://dashboard.situm.com'; +export const BUILDING_IDENTIFIER = ''; ``` -**NOTE**: You should also fill the [SITUM_BUILDING_ID](https://situm.com/docs/sdk-cartography/#building-identifier) and [SITUM_FLOOR_ID](https://situm.com/docs/sdk-cartography/#floor-identifier) variables so all the examples are able to work as expected. In case you haven't created POIs or paths yet, learn [how to create these cartography elements](https://situm.com/docs/sdk-cartography/#sdk-a-basic-complete-cartography-example). +**NOTE**: You should also fill the [BUILDING_IDENTIFIER](https://situm.com/docs/sdk-cartography/#building-identifier) and [SITUM_FLOOR_IDENTIFIER](https://situm.com/docs/sdk-cartography/#floor-identifier) variables so all the examples are able to work as expected. In case you haven't created POIs or paths yet, learn [how to create these cartography elements](https://situm.com/docs/sdk-cartography/#sdk-a-basic-complete-cartography-example). ### Step 3: Run the app diff --git a/example/azure-pipelines.yml b/example/azure-pipelines.yml index d73bcaa6..f5bc4e69 100644 --- a/example/azure-pipelines.yml +++ b/example/azure-pipelines.yml @@ -52,8 +52,8 @@ jobs: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" - echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" - echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_ID_EXAMPLES))" + echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_IDENTIFIER_EXAMPLES))" + echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_IDENTIFIER_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -109,8 +109,8 @@ jobs: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" - echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" - echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_ID_EXAMPLES))" + echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_IDENTIFIER_EXAMPLES))" + echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_IDENTIFIER_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml index 296c05b0..71a68d38 100644 --- a/example/azure/common-steps.yaml +++ b/example/azure/common-steps.yaml @@ -57,8 +57,8 @@ steps: echo "export const SITUM_EMAIL = '${{ parameters.XAPIEMAIL }}';" > example/src/situm.tsx echo "export const SITUM_API_KEY = '${{ parameters.XAPIKEY }}';" >> example/src/situm.tsx - echo "export const SITUM_BUILDING_ID = '${{ parameters.BUILDINGID }}';" >> example/src/situm.tsx - echo "export const SITUM_FLOOR_ID = '${{ parameters.FLOORID }}';" >> example/src/situm.tsx + echo "export const BUILDING_IDENTIFIER = '${{ parameters.BUILDINGID }}';" >> example/src/situm.tsx + echo "export const SITUM_FLOOR_IDENTIFIER = '${{ parameters.FLOORID }}';" >> example/src/situm.tsx echo "export const SITUM_DASHBOARD_URL = '${{ parameters.DASHBOARD_URL }}';" >> example/src/situm.tsx displayName: Configure credentials diff --git a/example/src/examples/sdk/BuildingFullInfo.tsx b/example/src/examples/sdk/BuildingFullInfo.tsx index a6b5206d..61602db4 100644 --- a/example/src/examples/sdk/BuildingFullInfo.tsx +++ b/example/src/examples/sdk/BuildingFullInfo.tsx @@ -3,7 +3,7 @@ import {ScrollView} from 'react-native'; import SitumPlugin from '@situm/react-native'; import type {Building, Floor, Poi} from '@situm/react-native'; -import {SITUM_BUILDING_ID} from '../../situm'; +import {BUILDING_IDENTIFIER} from '../../situm'; import styles from '../styles/styles'; import {fetchBuilding} from '../Utils/CommonFetchs'; import {Card, Text} from 'react-native-paper'; @@ -41,7 +41,7 @@ export const BuildingFullInfo = () => { }; useEffect(() => { - fetchBuilding(SITUM_BUILDING_ID) + fetchBuilding(BUILDING_IDENTIFIER) .then(setBuilding) .catch(error => { console.error(`Situm > example > Failed to fetch building: ${error}`); @@ -56,7 +56,7 @@ export const BuildingFullInfo = () => { return ( - {!SITUM_BUILDING_ID && ( + {!BUILDING_IDENTIFIER && ( No building id provided, please edit your situm.tsx file )} diff --git a/example/src/examples/sdk/InfoFromBuilding.tsx b/example/src/examples/sdk/InfoFromBuilding.tsx index 5454b449..155cac17 100644 --- a/example/src/examples/sdk/InfoFromBuilding.tsx +++ b/example/src/examples/sdk/InfoFromBuilding.tsx @@ -2,7 +2,7 @@ import React, {useEffect, useState} from 'react'; import {Text, ScrollView} from 'react-native'; import SitumPlugin, {BuildingInfo} from '@situm/react-native'; -import {SITUM_BUILDING_ID} from '../../situm'; +import {BUILDING_IDENTIFIER} from '../../situm'; import styles from '../styles/styles'; import {fetchBuilding} from '../Utils/CommonFetchs'; import {Card} from 'react-native-paper'; @@ -23,7 +23,7 @@ export const InfoFromBuilding = () => { }; useEffect(() => { - fetchBuilding(SITUM_BUILDING_ID) + fetchBuilding(BUILDING_IDENTIFIER) .then(myBuilding => getInfoFromBuilding(myBuilding)) .catch(e => { console.error(`Situm > example > Could not fetch building: ${e}`); diff --git a/example/src/examples/sdk/RouteBetweenPOIs.tsx b/example/src/examples/sdk/RouteBetweenPOIs.tsx index e17bfddb..9dcc2ccc 100644 --- a/example/src/examples/sdk/RouteBetweenPOIs.tsx +++ b/example/src/examples/sdk/RouteBetweenPOIs.tsx @@ -2,7 +2,7 @@ import React, {useEffect, useState} from 'react'; import {ScrollView, Text} from 'react-native'; import SitumPlugin, {Building, Poi} from '@situm/react-native'; -import {SITUM_BUILDING_ID} from '../../situm'; +import {BUILDING_IDENTIFIER} from '../../situm'; import styles from '../styles/styles'; import {fetchBuilding} from '../Utils/CommonFetchs'; import {Card} from 'react-native-paper'; @@ -51,7 +51,7 @@ export const RouteBetweenPOIs = () => { useEffect(() => { // first load the building - fetchBuilding(SITUM_BUILDING_ID) + fetchBuilding(BUILDING_IDENTIFIER) .then(setBuilding) .catch(e => { console.error(`Situm > example > Coult not fetch building ${e}`); diff --git a/example/src/examples/wayfinding/NavigateToPoi.tsx b/example/src/examples/wayfinding/NavigateToPoi.tsx index a43467ec..e2576ed5 100644 --- a/example/src/examples/wayfinding/NavigateToPoi.tsx +++ b/example/src/examples/wayfinding/NavigateToPoi.tsx @@ -8,7 +8,12 @@ import SitumPlugin, { requestPermission, } from '@situm/react-native'; import type {MapViewRef} from '@situm/react-native'; -import {SITUM_API_KEY, SITUM_BUILDING_ID} from '../../situm'; +import { + SITUM_API_KEY, + BUILDING_IDENTIFIER, + LANGUAGE, + REMOTE_IDENTIFIER, +} from '../../situm'; import {Button, TextInput} from 'react-native-paper'; const styles = StyleSheet.create({ @@ -88,8 +93,10 @@ const Screen: React.FC = () => { { setSelectedPoiIdentifier(evt?.identifier.toString()); diff --git a/example/src/examples/wayfinding/SelectPoi.tsx b/example/src/examples/wayfinding/SelectPoi.tsx index a67f7b5e..e6defa2e 100644 --- a/example/src/examples/wayfinding/SelectPoi.tsx +++ b/example/src/examples/wayfinding/SelectPoi.tsx @@ -8,7 +8,12 @@ import SitumPlugin, { requestPermission, } from '@situm/react-native'; import type {MapViewRef} from '@situm/react-native'; -import {SITUM_API_KEY, SITUM_BUILDING_ID} from '../../situm'; +import { + SITUM_API_KEY, + BUILDING_IDENTIFIER, + LANGUAGE, + REMOTE_IDENTIFIER, +} from '../../situm'; import {Button, TextInput} from 'react-native-paper'; const styles = StyleSheet.create({ @@ -88,8 +93,10 @@ const Screen: React.FC = () => { diff --git a/example/src/examples/wayfinding/SelectPoiCategory.tsx b/example/src/examples/wayfinding/SelectPoiCategory.tsx index 51e9c422..228078b5 100644 --- a/example/src/examples/wayfinding/SelectPoiCategory.tsx +++ b/example/src/examples/wayfinding/SelectPoiCategory.tsx @@ -8,7 +8,12 @@ import SitumPlugin, { requestPermission, } from '@situm/react-native'; import type {MapViewRef} from '@situm/react-native'; -import {SITUM_API_KEY, SITUM_BUILDING_ID} from '../../situm'; +import { + SITUM_API_KEY, + BUILDING_IDENTIFIER, + LANGUAGE, + REMOTE_IDENTIFIER, +} from '../../situm'; import {Button, TextInput} from 'react-native-paper'; const styles = StyleSheet.create({ @@ -90,8 +95,10 @@ const Screen: React.FC = () => { diff --git a/example/src/examples/wayfinding/SetFavoritePois.tsx b/example/src/examples/wayfinding/SetFavoritePois.tsx index 380c41f6..b2038888 100644 --- a/example/src/examples/wayfinding/SetFavoritePois.tsx +++ b/example/src/examples/wayfinding/SetFavoritePois.tsx @@ -9,7 +9,12 @@ import SitumPlugin, { } from '@situm/react-native'; import type {MapViewRef} from '@situm/react-native'; import type {OnFavoritePoisUpdatedResult} from '@situm/react-native'; -import {SITUM_API_KEY, SITUM_BUILDING_ID} from '../../situm'; +import { + SITUM_API_KEY, + BUILDING_IDENTIFIER, + LANGUAGE, + REMOTE_IDENTIFIER, +} from '../../situm'; import {Button, TextInput} from 'react-native-paper'; const styles = StyleSheet.create({ @@ -104,8 +109,10 @@ const Screen: React.FC = () => { ref={mapViewRef} onFavoritePoisUpdated={onFavoritePoisUpdated} configuration={{ - buildingIdentifier: SITUM_BUILDING_ID, + buildingIdentifier: BUILDING_IDENTIFIER, situmApiKey: SITUM_API_KEY, + remoteIdentifier: REMOTE_IDENTIFIER, + language: LANGUAGE, }} /> diff --git a/example/src/examples/wayfinding/Wayfinding.tsx b/example/src/examples/wayfinding/Wayfinding.tsx index 1aee4a23..c01da10c 100644 --- a/example/src/examples/wayfinding/Wayfinding.tsx +++ b/example/src/examples/wayfinding/Wayfinding.tsx @@ -20,7 +20,12 @@ import type { OnExternalLinkClickedResult, MapViewRef, } from '@situm/react-native'; -import {SITUM_API_KEY, SITUM_BUILDING_ID} from '../../situm'; +import { + SITUM_API_KEY, + BUILDING_IDENTIFIER, + LANGUAGE, + REMOTE_IDENTIFIER, +} from '../../situm'; const styles = StyleSheet.create({ container: { @@ -137,8 +142,10 @@ const Screen: React.FC = () => { ( * ref.selectPoi(122)} * configuration={{ - * buildingIdentifier: SITUM_BUILDING_ID, + * buildingIdentifier: BUILDING_IDENTIFIER, * }} * onLoad={onLoad} /> */ diff --git a/yarn.lock b/yarn.lock index 0304b146..294efaf9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -117,10 +117,10 @@ regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.6.1": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd" - integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA== +"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2": + version "0.6.2" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" + integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -2861,23 +2861,23 @@ babel-plugin-jest-hoist@^29.6.3: "@types/babel__traverse" "^7.0.6" babel-plugin-module-resolver@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz#2b7fc176bd55da25f516abf96015617b4f70fc73" - integrity sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q== + version "5.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.2.tgz#cdeac5d4aaa3b08dd1ac23ddbf516660ed2d293e" + integrity sha512-9KtaCazHee2xc0ibfqsDeamwDps6FZNo5S0Q81dUqEuFzVwPhcT4J5jOqIVvgCA3Q/wO9hKYxN/Ds3tIsp5ygg== dependencies: - find-babel-config "^2.0.0" - glob "^8.0.3" + find-babel-config "^2.1.1" + glob "^9.3.3" pkg-up "^3.1.0" reselect "^4.1.7" - resolve "^1.22.1" + resolve "^1.22.8" babel-plugin-polyfill-corejs2@^0.4.10: - version "0.4.10" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1" - integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ== + version "0.4.11" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" + integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.6.1" + "@babel/helper-define-polyfill-provider" "^0.6.2" semver "^6.3.1" babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4: @@ -2889,11 +2889,11 @@ babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4: core-js-compat "^3.36.1" babel-plugin-polyfill-regenerator@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.1.tgz#4f08ef4c62c7a7f66a35ed4c0d75e30506acc6be" - integrity sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g== + version "0.6.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e" + integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.6.1" + "@babel/helper-define-polyfill-provider" "^0.6.2" babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: version "7.0.0-beta.0" @@ -3190,9 +3190,9 @@ camelcase@^7.0.1: integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw== caniuse-lite@^1.0.30001587: - version "1.0.30001610" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz#2f44ed6e21d359e914271ae35b68903632628ccf" - integrity sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA== + version "1.0.30001612" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz#d34248b4ec1f117b70b24ad9ee04c90e0b8a14ae" + integrity sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g== chalk@5.3.0, chalk@^5.0.0, chalk@^5.0.1, chalk@^5.2.0, chalk@^5.3.0: version "5.3.0" @@ -3478,9 +3478,9 @@ convert-source-map@^2.0.0: integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== core-js-compat@^3.31.0, core-js-compat@^3.36.1: - version "3.36.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.36.1.tgz#1818695d72c99c25d621dca94e6883e190cea3c8" - integrity sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA== + version "3.37.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73" + integrity sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA== dependencies: browserslist "^4.23.0" @@ -3875,9 +3875,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.668: - version "1.4.737" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.737.tgz#3a774a58e04980741f65d440f5fdf57af18b6dde" - integrity sha512-QvLTxaLHKdy5YxvixAw/FfHq2eWLUL9KvsPjp0aHK1gI5d3EDuDgITkvj0nFO2c6zUY3ZqVAJQiBYyQP9tQpfw== + version "1.4.747" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.747.tgz#e37fa5b7b7e4c22607c5f59b5cf78f947266e77d" + integrity sha512-+FnSWZIAvFHbsNVmUxhEqWiaOiPMcfum1GQzlWCg/wLigVtshOsjXHyEFfmt6cFK6+HkS3QOJBv6/3OPumbBfw== emittery@^0.13.1: version "0.13.1" @@ -4540,12 +4540,12 @@ finalhandler@1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-babel-config@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-2.0.0.tgz#a8216f825415a839d0f23f4d18338a1cc966f701" - integrity sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw== +find-babel-config@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-2.1.1.tgz#93703fc8e068db5e4c57592900c5715dd04b7e5b" + integrity sha512-5Ji+EAysHGe1OipH7GN4qDjok5Z1uw5KAwDCbicU/4wyTZY7CqOCzcWbG7J5ad9mazq67k89fXlbc1MuIfl9uA== dependencies: - json5 "^2.1.1" + json5 "^2.2.3" path-exists "^4.0.0" find-cache-dir@^2.0.0: @@ -4600,9 +4600,9 @@ flow-enums-runtime@^0.0.5: integrity sha512-PSZF9ZuaZD03sT9YaIs0FrGJ7lSUw7rHZIex+73UYVXg46eL/wxN5PaVcPJFudE2cJu5f0fezitV5aBkLHPUOQ== flow-parser@0.*: - version "0.233.0" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.233.0.tgz#b983e65812d5ecae79f08ae3ed8ad2e131a9b966" - integrity sha512-E/mv51GYJfLuRX6fZnw4M52gBxYa8pkHUOgNEZOcQK2RTXS8YXeU5rlalkTcY99UpwbeNVCSUFKaavpOksi/pQ== + version "0.235.1" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.235.1.tgz#469c70adfa3c156f3a1792e7b6d7017f01f45f1d" + integrity sha512-s04193L4JE+ntEcQXbD6jxRRlyj9QXcgEl2W6xSjH4l9x4b0eHoCHfbYHjqf9LdZFUiM5LhgpiqsvLj/AyOyYQ== flow-parser@^0.206.0: version "0.206.0" @@ -4810,6 +4810,16 @@ glob@^8.0.3: minimatch "^5.0.1" once "^1.3.0" +glob@^9.3.3: + version "9.3.5" + resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.5.tgz#ca2ed8ca452781a3009685607fdf025a899dfe21" + integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q== + dependencies: + fs.realpath "^1.0.0" + minimatch "^8.0.2" + minipass "^4.2.4" + path-scurry "^1.6.1" + global-dirs@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -6108,9 +6118,9 @@ jetifier@^2.0.0: integrity sha512-J4Au9KuT74te+PCCCHKgAjyLlEa+2VyIAEPNCdE5aNkAJ6FAJcAqcdzEkSnzNksIa9NkGmC4tPiClk2e7tCJuQ== joi@^17.2.1: - version "17.12.3" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.12.3.tgz#944646979cd3b460178547b12ba37aca8482f63d" - integrity sha512-2RRziagf555owrm9IRVtdKynOBeITiDpuZqIpgwqXShPncPKNiRQoiGsl/T8SQdq+8ugRzH2LqY67irr2y/d+g== + version "17.13.0" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.0.tgz#b6f340b8029ee7af2397f821d17a4f03bf34b043" + integrity sha512-9qcrTyoBmFZRNHeVP4edKqIUEgFzq7MHvTNSDuHSqkpOPtiBkgNgcmTSqmiw1kw9tdKaiddvIDv/eCJDxmqWCA== dependencies: "@hapi/hoek" "^9.3.0" "@hapi/topo" "^5.1.0" @@ -6225,7 +6235,7 @@ json5@^1.0.2: dependencies: minimist "^1.2.0" -json5@^2.1.1, json5@^2.2.1, json5@^2.2.3: +json5@^2.2.1, json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -6457,6 +6467,11 @@ lowercase-keys@^3.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== +lru-cache@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" + integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== + lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -6957,6 +6972,13 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" +minimatch@^8.0.2: + version "8.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.4.tgz#847c1b25c014d4e9a7f68aaf63dedd668a626229" + integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA== + dependencies: + brace-expansion "^2.0.1" + minimatch@^9.0.0: version "9.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" @@ -6978,6 +7000,16 @@ minimist@^1.2.0, minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== +minipass@^4.2.4: + version "4.2.8" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a" + integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== + +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + mkdirp@^0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -7492,6 +7524,14 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +path-scurry@^1.6.1: + version "1.10.2" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" + integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== + dependencies: + lru-cache "^10.2.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -7775,17 +7815,17 @@ react-native-permissions@^3.8.4: integrity sha512-Gc5BxxpjZn4QNUDiVeHOO0vXh3AH7ToolmwTJozqC6DsxV7NAf3ttap+8BSmzDR8WxuAM3Cror+YNiBhHJx7/w== react-native-webview@*: - version "13.8.5" - resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.8.5.tgz#1ce4706042fb83c85c6e45f6948d97477dc5bee2" - integrity sha512-EkMuuss3g+xwkjCEJQeqaRYgRidks+EiQe4pmyxrYBvPQvx/pt3tb23x9t4v359gYSMktSGOVBTlvg8JWGFXiA== + version "13.8.6" + resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.8.6.tgz#5d4a62cb311d5ef8d910a8e112b3f1f2807bcd18" + integrity sha512-jtZ9OgB2AN6rhDwto6dNL3PtOtl/SI4VN93pZEPbMLvRjqHfxiUrilGllL5fKAXq5Ry5FJyfUi82A4Ii8olZ7A== dependencies: escape-string-regexp "2.0.0" invariant "2.2.4" react-native@^0.72.12: - version "0.72.12" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.72.12.tgz#480440d350530ac9485543f6eb058cd860fc1735" - integrity sha512-aQoibDdvylyPZ9qOqpLNpNPz6tU0rScc2yUgFj0VuhPEFB+gsqQW9CkZGSnhuYRkDF0cBqUEEcWiWbH3gR+Pog== + version "0.72.13" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.72.13.tgz#27c495a34025d55b5e5ef4ed65470b7ff1bdd123" + integrity sha512-YH2BZScuLdUtfSA3Ha2kJntOc/kkPPG7e4DFyrdsHahXBCDNfBmbtJ13aPrFVvndpKPU32vJAEessgVUgZGBSg== dependencies: "@jest/create-cache-key-function" "^29.2.1" "@react-native-community/cli" "^11.4.1" @@ -8129,7 +8169,7 @@ resolve.exports@^2.0.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.4: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.4, resolve@^1.22.8: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -8795,9 +8835,9 @@ temp@^0.8.4: rimraf "~2.6.2" terser@^5.15.0: - version "5.30.3" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.30.3.tgz#f1bb68ded42408c316b548e3ec2526d7dd03f4d2" - integrity sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA== + version "5.30.4" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.30.4.tgz#62b4d16a819424e6317fd5ceffb4ee8dc769803a" + integrity sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" From 2aaecf60ddeba6a9c49d881442560669475504fc Mon Sep 17 00:00:00 2001 From: Emmanuel Torres Date: Wed, 24 Apr 2024 13:35:20 +0200 Subject: [PATCH 02/12] chore:fix: add improvements documentation --- example/README.md | 2 +- example/azure-pipelines.yml | 4 +- example/azure/common-steps.yaml | 1 - example/src/situm.tsx | 3 - yarn.lock | 140 ++++++++++++-------------------- 5 files changed, 52 insertions(+), 98 deletions(-) diff --git a/example/README.md b/example/README.md index 113fc5f8..aa5ed14c 100644 --- a/example/README.md +++ b/example/README.md @@ -69,7 +69,7 @@ export const SITUM_API_KEY = ''; export const BUILDING_IDENTIFIER = ''; ``` -**NOTE**: You should also fill the [BUILDING_IDENTIFIER](https://situm.com/docs/sdk-cartography/#building-identifier) and [SITUM_FLOOR_IDENTIFIER](https://situm.com/docs/sdk-cartography/#floor-identifier) variables so all the examples are able to work as expected. In case you haven't created POIs or paths yet, learn [how to create these cartography elements](https://situm.com/docs/sdk-cartography/#sdk-a-basic-complete-cartography-example). +**NOTE**: You should also fill the [BUILDING_IDENTIFIER](https://situm.com/docs/sdk-cartography/#building-identifier) variables so all the examples are able to work as expected. In case you haven't created POIs or paths yet, learn [how to create these cartography elements](https://situm.com/docs/sdk-cartography/#sdk-a-basic-complete-cartography-example). ### Step 3: Run the app diff --git a/example/azure-pipelines.yml b/example/azure-pipelines.yml index f5bc4e69..b1648c90 100644 --- a/example/azure-pipelines.yml +++ b/example/azure-pipelines.yml @@ -53,7 +53,6 @@ jobs: echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_IDENTIFIER_EXAMPLES))" - echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_IDENTIFIER_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -109,8 +108,7 @@ jobs: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" - echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_IDENTIFIER_EXAMPLES))" - echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_IDENTIFIER_EXAMPLES))" + echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml index 71a68d38..1b76fbe7 100644 --- a/example/azure/common-steps.yaml +++ b/example/azure/common-steps.yaml @@ -58,7 +58,6 @@ steps: echo "export const SITUM_EMAIL = '${{ parameters.XAPIEMAIL }}';" > example/src/situm.tsx echo "export const SITUM_API_KEY = '${{ parameters.XAPIKEY }}';" >> example/src/situm.tsx echo "export const BUILDING_IDENTIFIER = '${{ parameters.BUILDINGID }}';" >> example/src/situm.tsx - echo "export const SITUM_FLOOR_IDENTIFIER = '${{ parameters.FLOORID }}';" >> example/src/situm.tsx echo "export const SITUM_DASHBOARD_URL = '${{ parameters.DASHBOARD_URL }}';" >> example/src/situm.tsx displayName: Configure credentials diff --git a/example/src/situm.tsx b/example/src/situm.tsx index 6e3a2725..45ddfa4e 100644 --- a/example/src/situm.tsx +++ b/example/src/situm.tsx @@ -4,9 +4,6 @@ export const SITUM_API_KEY = 'YOUR-SITUM-API-KEY'; // Set here the building identifier you want on the map. export const BUILDING_IDENTIFIER = 'YOUR-BUILDING-IDENTIFIER'; -// Set here the floor identifier you want on the map. -export const FLOOR_IDENTIFIER = 'YOUR-FLOOR-IDENTIFIER'; - // Alternatively, you can set an identifier that allows you to remotely configure all map settings.For now, you need to contact Situm to obtain yours. //For now, you need to contact Situm to obtain yours. export const REMOTE_IDENTIFIER = ''; diff --git a/yarn.lock b/yarn.lock index 294efaf9..f6e739c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -117,10 +117,10 @@ regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.6.1", "@babel/helper-define-polyfill-provider@^0.6.2": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz#18594f789c3594acb24cfdb4a7f7b7d2e8bd912d" - integrity sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ== +"@babel/helper-define-polyfill-provider@^0.6.1": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz#fadc63f0c2ff3c8d02ed905dcea747c5b0fb74fd" + integrity sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -2861,23 +2861,23 @@ babel-plugin-jest-hoist@^29.6.3: "@types/babel__traverse" "^7.0.6" babel-plugin-module-resolver@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.2.tgz#cdeac5d4aaa3b08dd1ac23ddbf516660ed2d293e" - integrity sha512-9KtaCazHee2xc0ibfqsDeamwDps6FZNo5S0Q81dUqEuFzVwPhcT4J5jOqIVvgCA3Q/wO9hKYxN/Ds3tIsp5ygg== + version "5.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz#2b7fc176bd55da25f516abf96015617b4f70fc73" + integrity sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q== dependencies: - find-babel-config "^2.1.1" - glob "^9.3.3" + find-babel-config "^2.0.0" + glob "^8.0.3" pkg-up "^3.1.0" reselect "^4.1.7" - resolve "^1.22.8" + resolve "^1.22.1" babel-plugin-polyfill-corejs2@^0.4.10: - version "0.4.11" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" - integrity sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q== + version "0.4.10" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz#276f41710b03a64f6467433cab72cbc2653c38b1" + integrity sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.6.2" + "@babel/helper-define-polyfill-provider" "^0.6.1" semver "^6.3.1" babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4: @@ -2889,11 +2889,11 @@ babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4: core-js-compat "^3.36.1" babel-plugin-polyfill-regenerator@^0.6.1: - version "0.6.2" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz#addc47e240edd1da1058ebda03021f382bba785e" - integrity sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg== + version "0.6.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.1.tgz#4f08ef4c62c7a7f66a35ed4c0d75e30506acc6be" + integrity sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g== dependencies: - "@babel/helper-define-polyfill-provider" "^0.6.2" + "@babel/helper-define-polyfill-provider" "^0.6.1" babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: version "7.0.0-beta.0" @@ -3190,9 +3190,9 @@ camelcase@^7.0.1: integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw== caniuse-lite@^1.0.30001587: - version "1.0.30001612" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz#d34248b4ec1f117b70b24ad9ee04c90e0b8a14ae" - integrity sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g== + version "1.0.30001610" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001610.tgz#2f44ed6e21d359e914271ae35b68903632628ccf" + integrity sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA== chalk@5.3.0, chalk@^5.0.0, chalk@^5.0.1, chalk@^5.2.0, chalk@^5.3.0: version "5.3.0" @@ -3478,9 +3478,9 @@ convert-source-map@^2.0.0: integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== core-js-compat@^3.31.0, core-js-compat@^3.36.1: - version "3.37.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.0.tgz#d9570e544163779bb4dff1031c7972f44918dc73" - integrity sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA== + version "3.36.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.36.1.tgz#1818695d72c99c25d621dca94e6883e190cea3c8" + integrity sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA== dependencies: browserslist "^4.23.0" @@ -3875,9 +3875,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.4.668: - version "1.4.747" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.747.tgz#e37fa5b7b7e4c22607c5f59b5cf78f947266e77d" - integrity sha512-+FnSWZIAvFHbsNVmUxhEqWiaOiPMcfum1GQzlWCg/wLigVtshOsjXHyEFfmt6cFK6+HkS3QOJBv6/3OPumbBfw== + version "1.4.737" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.737.tgz#3a774a58e04980741f65d440f5fdf57af18b6dde" + integrity sha512-QvLTxaLHKdy5YxvixAw/FfHq2eWLUL9KvsPjp0aHK1gI5d3EDuDgITkvj0nFO2c6zUY3ZqVAJQiBYyQP9tQpfw== emittery@^0.13.1: version "0.13.1" @@ -4540,12 +4540,12 @@ finalhandler@1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-babel-config@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-2.1.1.tgz#93703fc8e068db5e4c57592900c5715dd04b7e5b" - integrity sha512-5Ji+EAysHGe1OipH7GN4qDjok5Z1uw5KAwDCbicU/4wyTZY7CqOCzcWbG7J5ad9mazq67k89fXlbc1MuIfl9uA== +find-babel-config@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-2.0.0.tgz#a8216f825415a839d0f23f4d18338a1cc966f701" + integrity sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw== dependencies: - json5 "^2.2.3" + json5 "^2.1.1" path-exists "^4.0.0" find-cache-dir@^2.0.0: @@ -4600,9 +4600,9 @@ flow-enums-runtime@^0.0.5: integrity sha512-PSZF9ZuaZD03sT9YaIs0FrGJ7lSUw7rHZIex+73UYVXg46eL/wxN5PaVcPJFudE2cJu5f0fezitV5aBkLHPUOQ== flow-parser@0.*: - version "0.235.1" - resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.235.1.tgz#469c70adfa3c156f3a1792e7b6d7017f01f45f1d" - integrity sha512-s04193L4JE+ntEcQXbD6jxRRlyj9QXcgEl2W6xSjH4l9x4b0eHoCHfbYHjqf9LdZFUiM5LhgpiqsvLj/AyOyYQ== + version "0.233.0" + resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.233.0.tgz#b983e65812d5ecae79f08ae3ed8ad2e131a9b966" + integrity sha512-E/mv51GYJfLuRX6fZnw4M52gBxYa8pkHUOgNEZOcQK2RTXS8YXeU5rlalkTcY99UpwbeNVCSUFKaavpOksi/pQ== flow-parser@^0.206.0: version "0.206.0" @@ -4810,16 +4810,6 @@ glob@^8.0.3: minimatch "^5.0.1" once "^1.3.0" -glob@^9.3.3: - version "9.3.5" - resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.5.tgz#ca2ed8ca452781a3009685607fdf025a899dfe21" - integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q== - dependencies: - fs.realpath "^1.0.0" - minimatch "^8.0.2" - minipass "^4.2.4" - path-scurry "^1.6.1" - global-dirs@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" @@ -6118,9 +6108,9 @@ jetifier@^2.0.0: integrity sha512-J4Au9KuT74te+PCCCHKgAjyLlEa+2VyIAEPNCdE5aNkAJ6FAJcAqcdzEkSnzNksIa9NkGmC4tPiClk2e7tCJuQ== joi@^17.2.1: - version "17.13.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.0.tgz#b6f340b8029ee7af2397f821d17a4f03bf34b043" - integrity sha512-9qcrTyoBmFZRNHeVP4edKqIUEgFzq7MHvTNSDuHSqkpOPtiBkgNgcmTSqmiw1kw9tdKaiddvIDv/eCJDxmqWCA== + version "17.12.3" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.12.3.tgz#944646979cd3b460178547b12ba37aca8482f63d" + integrity sha512-2RRziagf555owrm9IRVtdKynOBeITiDpuZqIpgwqXShPncPKNiRQoiGsl/T8SQdq+8ugRzH2LqY67irr2y/d+g== dependencies: "@hapi/hoek" "^9.3.0" "@hapi/topo" "^5.1.0" @@ -6235,7 +6225,7 @@ json5@^1.0.2: dependencies: minimist "^1.2.0" -json5@^2.2.1, json5@^2.2.3: +json5@^2.1.1, json5@^2.2.1, json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -6467,11 +6457,6 @@ lowercase-keys@^3.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== -lru-cache@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" - integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== - lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -6972,13 +6957,6 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^8.0.2: - version "8.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.4.tgz#847c1b25c014d4e9a7f68aaf63dedd668a626229" - integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA== - dependencies: - brace-expansion "^2.0.1" - minimatch@^9.0.0: version "9.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" @@ -7000,16 +6978,6 @@ minimist@^1.2.0, minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== -minipass@^4.2.4: - version "4.2.8" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a" - integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== - -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": - version "7.0.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" - integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== - mkdirp@^0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -7524,14 +7492,6 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-scurry@^1.6.1: - version "1.10.2" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" - integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== - dependencies: - lru-cache "^10.2.0" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -7815,17 +7775,17 @@ react-native-permissions@^3.8.4: integrity sha512-Gc5BxxpjZn4QNUDiVeHOO0vXh3AH7ToolmwTJozqC6DsxV7NAf3ttap+8BSmzDR8WxuAM3Cror+YNiBhHJx7/w== react-native-webview@*: - version "13.8.6" - resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.8.6.tgz#5d4a62cb311d5ef8d910a8e112b3f1f2807bcd18" - integrity sha512-jtZ9OgB2AN6rhDwto6dNL3PtOtl/SI4VN93pZEPbMLvRjqHfxiUrilGllL5fKAXq5Ry5FJyfUi82A4Ii8olZ7A== + version "13.8.5" + resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-13.8.5.tgz#1ce4706042fb83c85c6e45f6948d97477dc5bee2" + integrity sha512-EkMuuss3g+xwkjCEJQeqaRYgRidks+EiQe4pmyxrYBvPQvx/pt3tb23x9t4v359gYSMktSGOVBTlvg8JWGFXiA== dependencies: escape-string-regexp "2.0.0" invariant "2.2.4" react-native@^0.72.12: - version "0.72.13" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.72.13.tgz#27c495a34025d55b5e5ef4ed65470b7ff1bdd123" - integrity sha512-YH2BZScuLdUtfSA3Ha2kJntOc/kkPPG7e4DFyrdsHahXBCDNfBmbtJ13aPrFVvndpKPU32vJAEessgVUgZGBSg== + version "0.72.12" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.72.12.tgz#480440d350530ac9485543f6eb058cd860fc1735" + integrity sha512-aQoibDdvylyPZ9qOqpLNpNPz6tU0rScc2yUgFj0VuhPEFB+gsqQW9CkZGSnhuYRkDF0cBqUEEcWiWbH3gR+Pog== dependencies: "@jest/create-cache-key-function" "^29.2.1" "@react-native-community/cli" "^11.4.1" @@ -8169,7 +8129,7 @@ resolve.exports@^2.0.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800" integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.4, resolve@^1.22.8: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.4: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -8835,9 +8795,9 @@ temp@^0.8.4: rimraf "~2.6.2" terser@^5.15.0: - version "5.30.4" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.30.4.tgz#62b4d16a819424e6317fd5ceffb4ee8dc769803a" - integrity sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ== + version "5.30.3" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.30.3.tgz#f1bb68ded42408c316b548e3ec2526d7dd03f4d2" + integrity sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -9571,4 +9531,4 @@ yn@3.1.1: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file From 4a66b1e6dc7f8e4af36e58a5b9a8d3e0ee9698af Mon Sep 17 00:00:00 2001 From: Emmanuel Torres Date: Wed, 24 Apr 2024 15:09:54 +0200 Subject: [PATCH 03/12] chore:fix2: add improvements documentation --- example/azure-pipelines.yml | 2 +- example/src/situm.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/azure-pipelines.yml b/example/azure-pipelines.yml index b1648c90..ac3db95e 100644 --- a/example/azure-pipelines.yml +++ b/example/azure-pipelines.yml @@ -52,7 +52,7 @@ jobs: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" - echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_IDENTIFIER_EXAMPLES))" + echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" diff --git a/example/src/situm.tsx b/example/src/situm.tsx index 45ddfa4e..809b2228 100644 --- a/example/src/situm.tsx +++ b/example/src/situm.tsx @@ -4,7 +4,7 @@ export const SITUM_API_KEY = 'YOUR-SITUM-API-KEY'; // Set here the building identifier you want on the map. export const BUILDING_IDENTIFIER = 'YOUR-BUILDING-IDENTIFIER'; -// Alternatively, you can set an identifier that allows you to remotely configure all map settings.For now, you need to contact Situm to obtain yours. +// Alternatively, you can set an identifier that allows you to remotely configure all map settings. //For now, you need to contact Situm to obtain yours. export const REMOTE_IDENTIFIER = ''; From a860587313c441157418082a3cdcdf63c00cf9e0 Mon Sep 17 00:00:00 2001 From: Emmanuel Torres Date: Wed, 24 Apr 2024 15:10:53 +0200 Subject: [PATCH 04/12] chore:fix3: add improvements documentation --- example/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/example/README.md b/example/README.md index aa5ed14c..6eab304c 100644 --- a/example/README.md +++ b/example/README.md @@ -69,7 +69,6 @@ export const SITUM_API_KEY = ''; export const BUILDING_IDENTIFIER = ''; ``` -**NOTE**: You should also fill the [BUILDING_IDENTIFIER](https://situm.com/docs/sdk-cartography/#building-identifier) variables so all the examples are able to work as expected. In case you haven't created POIs or paths yet, learn [how to create these cartography elements](https://situm.com/docs/sdk-cartography/#sdk-a-basic-complete-cartography-example). ### Step 3: Run the app From e1bc758a19eebbd792cd08f6252e4769204ce465 Mon Sep 17 00:00:00 2001 From: Emmanuel Torres Date: Mon, 29 Apr 2024 11:46:21 +0200 Subject: [PATCH 05/12] chore:fix4: add improvements documentation --- example/azure-pipelines.yml | 12 ------------ example/azure/build-examples.yaml | 4 +--- example/azure/common-steps.yaml | 4 ---- example/src/situm.tsx | 2 +- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/example/azure-pipelines.yml b/example/azure-pipelines.yml index ac3db95e..6ce03597 100644 --- a/example/azure-pipelines.yml +++ b/example/azure-pipelines.yml @@ -9,10 +9,6 @@ trigger: pr: none parameters: - - name: XAPIEMAIL - type: string - displayName: X-API-EMAIL - default: user@email.com - name: XAPIKEY type: string displayName: X-API-KEY @@ -51,7 +47,6 @@ jobs: - ${{ if ne(variables['Build.Reason'],'manual') }}: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" - echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -62,7 +57,6 @@ jobs: - ${{ if eq(variables['Build.Reason'],'manual') }}: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo ${{parameters.XAPIKEY}})" - echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})" echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})" echo "##vso[task.setvariable variable=FLOORID]$(echo ${{ parameters.FLOORID}})" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo ${{ parameters.DASHBOARD_URL }})" @@ -74,7 +68,6 @@ jobs: - template: azure/common-steps.yaml parameters: XAPIKEY: $(XAPIKEY) - XAPIEMAIL: $(XAPIEMAIL) BUILDINGID: $(BUILDINGID) FLOORID: $(FLOORID) DASHBOARD_URL: $(DASHBOARD_URL) @@ -85,7 +78,6 @@ jobs: DASHBOARD_URL: $(DASHBOARD_URL) system: $(ubuntuVersion) BUILDINGID: $(BUILDINGID) - XAPIEMAIL: $(XAPIEMAIL) BUILDNUMBER: $(BUILDNUMBER) - ${{ if ne(variables['Build.Reason'],'manual') }}: - template: azure-templates/teams-notifier.yml@sys_kubernetes_templates @@ -107,7 +99,6 @@ jobs: - ${{ if ne(variables['Build.Reason'],'manual') }}: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" - echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -118,7 +109,6 @@ jobs: - ${{ if eq(variables['Build.Reason'],'manual') }}: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo ${{parameters.XAPIKEY}})" - echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})" echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})" echo "##vso[task.setvariable variable=FLOORID]$(echo ${{ parameters.FLOORID}})" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo ${{ parameters.DASHBOARD_URL }})" @@ -137,7 +127,6 @@ jobs: - template: azure/common-steps.yaml parameters: XAPIKEY: $(XAPIKEY) - XAPIEMAIL: $(XAPIEMAIL) BUILDINGID: $(BUILDINGID) FLOORID: $(FLOORID) DASHBOARD_URL: $(DASHBOARD_URL) @@ -148,7 +137,6 @@ jobs: parameters: DASHBOARD_URL: $(DASHBOARD_URL) system: $(macOSVersion) - XAPIEMAIL: $(XAPIEMAIL) BUILDINGID: $(BUILDINGID) BUILDNUMBER: $(BUILDNUMBER) diff --git a/example/azure/build-examples.yaml b/example/azure/build-examples.yaml index 7e0ef767..dee3f1a5 100644 --- a/example/azure/build-examples.yaml +++ b/example/azure/build-examples.yaml @@ -3,8 +3,6 @@ parameters: type: string - name: DASHBOARD_URL type: string - - name: XAPIEMAIL - type: string - name: BUILDINGID type: string - name: BUILDNUMBER @@ -54,7 +52,7 @@ steps: gem install fastlane dashboard=$(echo ${{ parameters.DASHBOARD_URL }} | awk -F"/" '{print $3}') - export WHATS_NEW="Plugin version: $(pluginVersion), USER: ${{parameters.XAPIEMAIL}}, BUILDINGID: ${{ parameters.BUILDINGID }}, DASHBOARD_URL: $dashboard" + export WHATS_NEW="Plugin version: $(pluginVersion), BUILDINGID: ${{ parameters.BUILDINGID }}, DASHBOARD_URL: $dashboard" export BUILDNUMBER=${{ parameters.BUILDNUMBER }} echo -e "\n[+] Setting variables to deploy:" echo -e "\t[+] Set WHATS_NEW: $WHATS_NEW" diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml index 1b76fbe7..16b29c7c 100644 --- a/example/azure/common-steps.yaml +++ b/example/azure/common-steps.yaml @@ -1,8 +1,6 @@ parameters: - name: system type: string - - name: XAPIEMAIL - type: string - name: XAPIKEY type: string - name: BUILDINGID @@ -48,14 +46,12 @@ steps: echo "##vso[task.setvariable variable=pluginVersion]$(echo $pluginVersion)" echo -e "\n[+] Variables to set:" - echo -e "\t[+] X-API-EMAIL: ${{ parameters.XAPIEMAIL }}" echo -e "\t[+] BUILDINGID: ${{ parameters.BUILDINGID }}" echo -e "\t[+] FLOORID: ${{ parameters.FLOORID }}" echo -e "\t[+] DASHBOARD_URL: ${{ parameters.DASHBOARD_URL }}" echo -e "\t[+] BUILDNUMBER: ${{ parameters.BUILDNUMBER }}" echo -e "\t[+] Plugin Version used: $pluginVersion" - echo "export const SITUM_EMAIL = '${{ parameters.XAPIEMAIL }}';" > example/src/situm.tsx echo "export const SITUM_API_KEY = '${{ parameters.XAPIKEY }}';" >> example/src/situm.tsx echo "export const BUILDING_IDENTIFIER = '${{ parameters.BUILDINGID }}';" >> example/src/situm.tsx echo "export const SITUM_DASHBOARD_URL = '${{ parameters.DASHBOARD_URL }}';" >> example/src/situm.tsx diff --git a/example/src/situm.tsx b/example/src/situm.tsx index 809b2228..e38248fc 100644 --- a/example/src/situm.tsx +++ b/example/src/situm.tsx @@ -12,7 +12,7 @@ export const REMOTE_IDENTIFIER = ''; export const LANGUAGE = ''; // A String parameter that allows you to specify which domain will be displayed inside our webview. -export const SITUM_DASHBOARD_URL = 'https://dashboard.situm.com'; +export const API_DOMAIN = 'https://dashboard.situm.com'; // Supporting documentation ` From 637fc9b109f14532cb85037cf02e11af56149dd1 Mon Sep 17 00:00:00 2001 From: Emmanuel Torres Date: Mon, 29 Apr 2024 13:51:28 +0200 Subject: [PATCH 06/12] chore:fix5: add improvements documentation --- example/azure-pipelines.yml | 19 ++++++++++++------- example/azure/build-examples.yaml | 4 +++- example/azure/common-steps.yaml | 8 ++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/example/azure-pipelines.yml b/example/azure-pipelines.yml index 6ce03597..f2c2fdf3 100644 --- a/example/azure-pipelines.yml +++ b/example/azure-pipelines.yml @@ -9,6 +9,10 @@ trigger: pr: none parameters: + - name: XAPIEMAIL + type: string + displayName: X-API-EMAIL + default: user@email.com - name: XAPIKEY type: string displayName: X-API-KEY @@ -16,9 +20,6 @@ parameters: - name: BUILDINGID type: string default: "1" - - name: FLOORID - type: string - default: "1" - name: DASHBOARD_URL type: string default: "https://dashboard.situm.com" @@ -47,6 +48,7 @@ jobs: - ${{ if ne(variables['Build.Reason'],'manual') }}: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" + echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -57,8 +59,8 @@ jobs: - ${{ if eq(variables['Build.Reason'],'manual') }}: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo ${{parameters.XAPIKEY}})" + echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})" echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})" - echo "##vso[task.setvariable variable=FLOORID]$(echo ${{ parameters.FLOORID}})" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo ${{ parameters.DASHBOARD_URL }})" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -68,8 +70,8 @@ jobs: - template: azure/common-steps.yaml parameters: XAPIKEY: $(XAPIKEY) + XAPIEMAIL: $(XAPIEMAIL) BUILDINGID: $(BUILDINGID) - FLOORID: $(FLOORID) DASHBOARD_URL: $(DASHBOARD_URL) system: $(ubuntuVersion) @@ -78,6 +80,7 @@ jobs: DASHBOARD_URL: $(DASHBOARD_URL) system: $(ubuntuVersion) BUILDINGID: $(BUILDINGID) + XAPIEMAIL: $(XAPIEMAIL) BUILDNUMBER: $(BUILDNUMBER) - ${{ if ne(variables['Build.Reason'],'manual') }}: - template: azure-templates/teams-notifier.yml@sys_kubernetes_templates @@ -99,6 +102,7 @@ jobs: - ${{ if ne(variables['Build.Reason'],'manual') }}: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" + echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -109,8 +113,8 @@ jobs: - ${{ if eq(variables['Build.Reason'],'manual') }}: - bash: | echo "##vso[task.setvariable variable=XAPIKEY]$(echo ${{parameters.XAPIKEY}})" + echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})" echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})" - echo "##vso[task.setvariable variable=FLOORID]$(echo ${{ parameters.FLOORID}})" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo ${{ parameters.DASHBOARD_URL }})" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -127,8 +131,8 @@ jobs: - template: azure/common-steps.yaml parameters: XAPIKEY: $(XAPIKEY) + XAPIEMAIL: $(XAPIEMAIL) BUILDINGID: $(BUILDINGID) - FLOORID: $(FLOORID) DASHBOARD_URL: $(DASHBOARD_URL) system: $(macOSVersion) BUILDNUMBER: $(BUILDNUMBER) @@ -137,6 +141,7 @@ jobs: parameters: DASHBOARD_URL: $(DASHBOARD_URL) system: $(macOSVersion) + XAPIEMAIL: $(XAPIEMAIL) BUILDINGID: $(BUILDINGID) BUILDNUMBER: $(BUILDNUMBER) diff --git a/example/azure/build-examples.yaml b/example/azure/build-examples.yaml index dee3f1a5..7e0ef767 100644 --- a/example/azure/build-examples.yaml +++ b/example/azure/build-examples.yaml @@ -3,6 +3,8 @@ parameters: type: string - name: DASHBOARD_URL type: string + - name: XAPIEMAIL + type: string - name: BUILDINGID type: string - name: BUILDNUMBER @@ -52,7 +54,7 @@ steps: gem install fastlane dashboard=$(echo ${{ parameters.DASHBOARD_URL }} | awk -F"/" '{print $3}') - export WHATS_NEW="Plugin version: $(pluginVersion), BUILDINGID: ${{ parameters.BUILDINGID }}, DASHBOARD_URL: $dashboard" + export WHATS_NEW="Plugin version: $(pluginVersion), USER: ${{parameters.XAPIEMAIL}}, BUILDINGID: ${{ parameters.BUILDINGID }}, DASHBOARD_URL: $dashboard" export BUILDNUMBER=${{ parameters.BUILDNUMBER }} echo -e "\n[+] Setting variables to deploy:" echo -e "\t[+] Set WHATS_NEW: $WHATS_NEW" diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml index 16b29c7c..c1a7c195 100644 --- a/example/azure/common-steps.yaml +++ b/example/azure/common-steps.yaml @@ -1,12 +1,12 @@ parameters: - name: system type: string + - name: XAPIEMAIL + type: string - name: XAPIKEY type: string - name: BUILDINGID type: string - - name: FLOORID - type: string - name: DASHBOARD_URL type: string - name: BUILDNUMBER @@ -46,13 +46,13 @@ steps: echo "##vso[task.setvariable variable=pluginVersion]$(echo $pluginVersion)" echo -e "\n[+] Variables to set:" + echo -e "\t[+] X-API-EMAIL: ${{ parameters.XAPIEMAIL }}" echo -e "\t[+] BUILDINGID: ${{ parameters.BUILDINGID }}" - echo -e "\t[+] FLOORID: ${{ parameters.FLOORID }}" echo -e "\t[+] DASHBOARD_URL: ${{ parameters.DASHBOARD_URL }}" echo -e "\t[+] BUILDNUMBER: ${{ parameters.BUILDNUMBER }}" echo -e "\t[+] Plugin Version used: $pluginVersion" - echo "export const SITUM_API_KEY = '${{ parameters.XAPIKEY }}';" >> example/src/situm.tsx + echo "export const SITUM_API_KEY = '${{ parameters.XAPIKEY }}';" > example/src/situm.tsx echo "export const BUILDING_IDENTIFIER = '${{ parameters.BUILDINGID }}';" >> example/src/situm.tsx echo "export const SITUM_DASHBOARD_URL = '${{ parameters.DASHBOARD_URL }}';" >> example/src/situm.tsx From b5307825be654a063afc90a045a36f3d0b45efdf Mon Sep 17 00:00:00 2001 From: Emmanuel Torres Date: Mon, 13 May 2024 14:57:45 +0200 Subject: [PATCH 07/12] chore:fix6: add improvements documentation --- example/azure-pipelines.yml | 9 +++++++++ example/azure/common-steps.yaml | 3 +++ 2 files changed, 12 insertions(+) diff --git a/example/azure-pipelines.yml b/example/azure-pipelines.yml index f2c2fdf3..0c6ac97d 100644 --- a/example/azure-pipelines.yml +++ b/example/azure-pipelines.yml @@ -20,6 +20,9 @@ parameters: - name: BUILDINGID type: string default: "1" + - name: FLOORID + type: string + default: "1" - name: DASHBOARD_URL type: string default: "https://dashboard.situm.com" @@ -50,6 +53,7 @@ jobs: echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" + echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_ID_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -61,6 +65,7 @@ jobs: echo "##vso[task.setvariable variable=XAPIKEY]$(echo ${{parameters.XAPIKEY}})" echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})" echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})" + echo "##vso[task.setvariable variable=FLOORID]$(echo ${{ parameters.FLOORID}})" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo ${{ parameters.DASHBOARD_URL }})" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -72,6 +77,7 @@ jobs: XAPIKEY: $(XAPIKEY) XAPIEMAIL: $(XAPIEMAIL) BUILDINGID: $(BUILDINGID) + FLOORID: $(FLOORID) DASHBOARD_URL: $(DASHBOARD_URL) system: $(ubuntuVersion) @@ -104,6 +110,7 @@ jobs: echo "##vso[task.setvariable variable=XAPIKEY]$(echo $(XAPIKEY_EXAMPLES))" echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" + echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_ID_EXAMPLES))" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -115,6 +122,7 @@ jobs: echo "##vso[task.setvariable variable=XAPIKEY]$(echo ${{parameters.XAPIKEY}})" echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})" echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})" + echo "##vso[task.setvariable variable=FLOORID]$(echo ${{ parameters.FLOORID}})" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo ${{ parameters.DASHBOARD_URL }})" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -133,6 +141,7 @@ jobs: XAPIKEY: $(XAPIKEY) XAPIEMAIL: $(XAPIEMAIL) BUILDINGID: $(BUILDINGID) + FLOORID: $(FLOORID) DASHBOARD_URL: $(DASHBOARD_URL) system: $(macOSVersion) BUILDNUMBER: $(BUILDNUMBER) diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml index c1a7c195..521dfb9a 100644 --- a/example/azure/common-steps.yaml +++ b/example/azure/common-steps.yaml @@ -7,6 +7,8 @@ parameters: type: string - name: BUILDINGID type: string + - name: FLOORID + type: string - name: DASHBOARD_URL type: string - name: BUILDNUMBER @@ -48,6 +50,7 @@ steps: echo -e "\n[+] Variables to set:" echo -e "\t[+] X-API-EMAIL: ${{ parameters.XAPIEMAIL }}" echo -e "\t[+] BUILDINGID: ${{ parameters.BUILDINGID }}" + echo -e "\t[+] FLOORID: ${{ parameters.FLOORID }}" echo -e "\t[+] DASHBOARD_URL: ${{ parameters.DASHBOARD_URL }}" echo -e "\t[+] BUILDNUMBER: ${{ parameters.BUILDNUMBER }}" echo -e "\t[+] Plugin Version used: $pluginVersion" From 08d055c5a0dd121ed3666652644a1ff5eea7fb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20May=C3=A1n?= Date: Wed, 15 May 2024 13:49:27 +0200 Subject: [PATCH 08/12] fix: remove extra identation in .yml files --- example/azure-pipelines.yml | 2 +- example/azure/common-steps.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/azure-pipelines.yml b/example/azure-pipelines.yml index 0c6ac97d..d73bcaa6 100644 --- a/example/azure-pipelines.yml +++ b/example/azure-pipelines.yml @@ -22,7 +22,7 @@ parameters: default: "1" - name: FLOORID type: string - default: "1" + default: "1" - name: DASHBOARD_URL type: string default: "https://dashboard.situm.com" diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml index 521dfb9a..35bab4db 100644 --- a/example/azure/common-steps.yaml +++ b/example/azure/common-steps.yaml @@ -8,7 +8,7 @@ parameters: - name: BUILDINGID type: string - name: FLOORID - type: string + type: string - name: DASHBOARD_URL type: string - name: BUILDNUMBER From 553f16bfb5ce2f1904de57c33816569b36650bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20May=C3=A1n?= Date: Wed, 15 May 2024 13:54:07 +0200 Subject: [PATCH 09/12] chore: remove ugly change in PR --- yarn.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index f6e739c2..ed182853 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9531,4 +9531,5 @@ yn@3.1.1: yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== \ No newline at end of file + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + \ No newline at end of file From 827c6083cf20791f74314277e55bd7a5d8b9c37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20May=C3=A1n?= Date: Wed, 15 May 2024 13:55:37 +0200 Subject: [PATCH 10/12] chore: remove ugly change in PR 2 --- yarn.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index ed182853..0304b146 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9532,4 +9532,3 @@ yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - \ No newline at end of file From 59197f37fb9bbd2223f87c85aee5d506d89cce09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Iglesias?= Date: Wed, 29 May 2024 14:00:53 +0200 Subject: [PATCH 11/12] chore: add support for remote_identifier and languate to example app --- example/azure-pipelines.yml | 21 +++++++++++++++++++++ example/azure/build-examples.yaml | 9 ++++++++- example/azure/common-steps.yaml | 10 ++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/example/azure-pipelines.yml b/example/azure-pipelines.yml index d73bcaa6..f74a8dad 100644 --- a/example/azure-pipelines.yml +++ b/example/azure-pipelines.yml @@ -26,6 +26,12 @@ parameters: - name: DASHBOARD_URL type: string default: "https://dashboard.situm.com" + - name: REMOTEID + type: string + default: "demo" + - name: LANG + type: string + default: "en" variables: - group: Passwords @@ -54,6 +60,8 @@ jobs: echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_ID_EXAMPLES))" + echo "##vso[task.setvariable variable=REMOTEID]$(echo 'demo')" + echo "##vso[task.setvariable variable=LANG]$(echo 'en')" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -66,6 +74,8 @@ jobs: echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})" echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})" echo "##vso[task.setvariable variable=FLOORID]$(echo ${{ parameters.FLOORID}})" + echo "##vso[task.setvariable variable=REMOTEID]$(echo ${{ parameters.REMOTEID}})" + echo "##vso[task.setvariable variable=LANG]$(echo ${{ parameters.LANG}})" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo ${{ parameters.DASHBOARD_URL }})" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -79,6 +89,8 @@ jobs: BUILDINGID: $(BUILDINGID) FLOORID: $(FLOORID) DASHBOARD_URL: $(DASHBOARD_URL) + REMOTEID: $(REMOTEID) + LANG: $(LANG) system: $(ubuntuVersion) - template: azure/build-examples.yaml @@ -88,6 +100,7 @@ jobs: BUILDINGID: $(BUILDINGID) XAPIEMAIL: $(XAPIEMAIL) BUILDNUMBER: $(BUILDNUMBER) + - ${{ if ne(variables['Build.Reason'],'manual') }}: - template: azure-templates/teams-notifier.yml@sys_kubernetes_templates parameters: @@ -111,6 +124,8 @@ jobs: echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo $(XAPIEMAIL_EXAMPLES))" echo "##vso[task.setvariable variable=BUILDINGID]$(echo $(BUILDING_ID_EXAMPLES))" echo "##vso[task.setvariable variable=FLOORID]$(echo $(FLOOR_ID_EXAMPLES))" + echo "##vso[task.setvariable variable=REMOTEID]$(echo 'demo')" + echo "##vso[task.setvariable variable=LANG]$(echo 'en')" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo 'https://dashboard.situm.com')" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -123,6 +138,8 @@ jobs: echo "##vso[task.setvariable variable=XAPIEMAIL]$(echo ${{ parameters.XAPIEMAIL}})" echo "##vso[task.setvariable variable=BUILDINGID]$(echo ${{ parameters.BUILDINGID}})" echo "##vso[task.setvariable variable=FLOORID]$(echo ${{ parameters.FLOORID}})" + echo "##vso[task.setvariable variable=REMOTEID]$(echo ${{ parameters.REMOTEID}})" + echo "##vso[task.setvariable variable=LANG]$(echo ${{ parameters.LANG}})" echo "##vso[task.setvariable variable=DASHBOARD_URL]$(echo ${{ parameters.DASHBOARD_URL }})" echo "##vso[task.setvariable variable=BUILDNUMBER]$(echo $(Build.BuildNumber) | awk -F"." '{if ($2 < 10) print $1"0"$2; else print $1$2}')" @@ -143,6 +160,8 @@ jobs: BUILDINGID: $(BUILDINGID) FLOORID: $(FLOORID) DASHBOARD_URL: $(DASHBOARD_URL) + REMOTEID: $(REMOTEID) + LANG: $(LANG) system: $(macOSVersion) BUILDNUMBER: $(BUILDNUMBER) @@ -153,6 +172,8 @@ jobs: XAPIEMAIL: $(XAPIEMAIL) BUILDINGID: $(BUILDINGID) BUILDNUMBER: $(BUILDNUMBER) + REMOTEID: $(REMOTEID) + LANG: $(LANG) - ${{ if ne(variables['Build.Reason'],'manual') }}: - template: azure-templates/teams-notifier.yml@sys_kubernetes_templates diff --git a/example/azure/build-examples.yaml b/example/azure/build-examples.yaml index 7e0ef767..5d8217cf 100644 --- a/example/azure/build-examples.yaml +++ b/example/azure/build-examples.yaml @@ -10,6 +10,13 @@ parameters: - name: BUILDNUMBER type: string default: "202430015" + - name: REMOTEID + type: string + default: "demo" + - name: LANG + type: string + default: "en" + steps: - ${{ if contains(parameters.system, 'macOS') }}: @@ -54,7 +61,7 @@ steps: gem install fastlane dashboard=$(echo ${{ parameters.DASHBOARD_URL }} | awk -F"/" '{print $3}') - export WHATS_NEW="Plugin version: $(pluginVersion), USER: ${{parameters.XAPIEMAIL}}, BUILDINGID: ${{ parameters.BUILDINGID }}, DASHBOARD_URL: $dashboard" + export WHATS_NEW="Plugin version: $(pluginVersion), USER: ${{parameters.XAPIEMAIL}}, BUILDINGID: ${{ parameters.BUILDINGID }}, DASHBOARD_URL: $dashboard ,REMOTEID: ${{parameters.REMOTEID}}, LANG: ${{ parameters.LANG}} " export BUILDNUMBER=${{ parameters.BUILDNUMBER }} echo -e "\n[+] Setting variables to deploy:" echo -e "\t[+] Set WHATS_NEW: $WHATS_NEW" diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml index 35bab4db..a65ce776 100644 --- a/example/azure/common-steps.yaml +++ b/example/azure/common-steps.yaml @@ -14,6 +14,12 @@ parameters: - name: BUILDNUMBER type: string default: "Value only set in iOS" + - name: REMOTEID + type: string + default: "demo" + - name: LANG + type: string + default: "en" steps: - checkout: self fetchDepth: 1 @@ -53,10 +59,14 @@ steps: echo -e "\t[+] FLOORID: ${{ parameters.FLOORID }}" echo -e "\t[+] DASHBOARD_URL: ${{ parameters.DASHBOARD_URL }}" echo -e "\t[+] BUILDNUMBER: ${{ parameters.BUILDNUMBER }}" + echo -e "\t[+] REMOTEID: ${{ parameters.REMOTEID }}" + echo -e "\t[+] LANG: ${{ parameters.LANG }}" echo -e "\t[+] Plugin Version used: $pluginVersion" echo "export const SITUM_API_KEY = '${{ parameters.XAPIKEY }}';" > example/src/situm.tsx echo "export const BUILDING_IDENTIFIER = '${{ parameters.BUILDINGID }}';" >> example/src/situm.tsx echo "export const SITUM_DASHBOARD_URL = '${{ parameters.DASHBOARD_URL }}';" >> example/src/situm.tsx + echo "export const REMOTE_IDENTIFIER = '${{ parameters.REMOTEID }}';" >> example/src/situm.tsx + echo "export const LANGUAGE = '${{ parameters.LANG }}';" >> example/src/situm.tsx displayName: Configure credentials From 7b3ec326aca8420d69edd2dc658d30afe486c017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20May=C3=A1n?= Date: Wed, 29 May 2024 14:08:54 +0200 Subject: [PATCH 12/12] chore: update common-steps.yml with the new situm.tsx variables --- example/azure/common-steps.yaml | 2 +- example/src/App.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example/azure/common-steps.yaml b/example/azure/common-steps.yaml index a65ce776..b127aaa1 100644 --- a/example/azure/common-steps.yaml +++ b/example/azure/common-steps.yaml @@ -65,7 +65,7 @@ steps: echo "export const SITUM_API_KEY = '${{ parameters.XAPIKEY }}';" > example/src/situm.tsx echo "export const BUILDING_IDENTIFIER = '${{ parameters.BUILDINGID }}';" >> example/src/situm.tsx - echo "export const SITUM_DASHBOARD_URL = '${{ parameters.DASHBOARD_URL }}';" >> example/src/situm.tsx + echo "export const API_DOMAIN = '${{ parameters.DASHBOARD_URL }}';" >> example/src/situm.tsx echo "export const REMOTE_IDENTIFIER = '${{ parameters.REMOTEID }}';" >> example/src/situm.tsx echo "export const LANGUAGE = '${{ parameters.LANG }}';" >> example/src/situm.tsx diff --git a/example/src/App.tsx b/example/src/App.tsx index b89f2ba1..9e1a6c33 100644 --- a/example/src/App.tsx +++ b/example/src/App.tsx @@ -5,7 +5,7 @@ import {NavigationContainer} from '@react-navigation/native'; import {createNativeStackNavigator} from '@react-navigation/native-stack'; import SitumPlugin from '@situm/react-native'; -import {SITUM_API_KEY, SITUM_DASHBOARD_URL} from './situm'; +import {SITUM_API_KEY, API_DOMAIN} from './situm'; import Theme from './examples/styles/theme'; import PositioningScreen from './examples/sdk/Positioning'; @@ -46,7 +46,7 @@ const HomeScreen = ({navigation}) => { useEffect(() => { try { SitumPlugin.init(); - SitumPlugin.setDashboardURL(SITUM_DASHBOARD_URL); + SitumPlugin.setDashboardURL(API_DOMAIN); SitumPlugin.setApiKey(SITUM_API_KEY); } catch (e) { console.error(`Situm > example > Could not initialize SDK ${e}`);