From 0daf03025d0b8ff0aac2470af7420460e47821ec Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Thu, 6 Jun 2024 12:46:34 +0100 Subject: [PATCH 1/6] chore: add localstorage undefined handling --- src/app/shared/services/local-storage/local-storage.service.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/shared/services/local-storage/local-storage.service.ts b/src/app/shared/services/local-storage/local-storage.service.ts index 23cc75d499..eff7e87647 100644 --- a/src/app/shared/services/local-storage/local-storage.service.ts +++ b/src/app/shared/services/local-storage/local-storage.service.ts @@ -13,6 +13,7 @@ export class LocalStorageService extends SyncServiceBase { } private get(key: string): string | null { + if (!key) return null; if (!key.startsWith(STORAGE_PREFIX)) { key = `${STORAGE_PREFIX}.${key}`; } @@ -20,6 +21,7 @@ export class LocalStorageService extends SyncServiceBase { } private set(key: string, value: string, allowProtected = false) { + if (!key) return; if (!allowProtected && this.isProtected(key)) { console.warn(`[DEPRECATED] - set local-storage with protected name: ${key}`); } @@ -30,6 +32,7 @@ export class LocalStorageService extends SyncServiceBase { } private remove(key: string) { + if (!key) return; if (!key.startsWith(STORAGE_PREFIX)) { key = `${STORAGE_PREFIX}.${key}`; } From db386a9474d72e0e90a9f67c6ba5e73da41437f1 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:30:56 +0100 Subject: [PATCH 2/6] updated online documentation to point to open-app-builder --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a8cb560cf9..40d532fcec 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/IDEMSInternational/parenting-app-ui.git) -# Parenting App UI +# Open App Builder -[Online Documentation](https://idemsinternational.github.io/parenting-app-ui/) +[Online Documentation](https://idemsinternational.github.io/open-app-builder/) # Quickstart From c8de1596a52aea32092170a6ada2055fd50127c9 Mon Sep 17 00:00:00 2001 From: Johnny McQuade Date: Thu, 6 Jun 2024 15:44:29 +0100 Subject: [PATCH 3/6] docs: update all references in docs to 'parenting-app-ui' -> 'open-app-builder' --- README.md | 12 ++++++------ documentation/docs/authors/advanced/overrides.md | 2 +- documentation/docs/authors/notifications.md | 2 +- documentation/docs/developers/deployments.md | 4 ++-- documentation/docs/developers/device-testing.md | 2 +- documentation/docs/developers/in-app-updates.md | 2 +- documentation/docs/developers/web-previews.md | 2 +- documentation/docs/index.md | 4 ++-- documentation/docs/questions/parameters_styles.md | 2 +- documentation/mkdocs.yml | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 40d532fcec..34ee84d21f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/IDEMSInternational/parenting-app-ui.git) +[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/IDEMSInternational/open-app-builder.git) # Open App Builder @@ -24,13 +24,13 @@ ### Download the repo with binary assets ``` -$ git lfs clone https://github.com/IDEMSInternational/parenting-app-ui.git +$ git lfs clone https://github.com/IDEMSInternational/open-app-builder.git ``` Note - if you do a regular git clone, you can always run `git lfs fetch --all` later to sync assets ### Install required dependencies ``` -$ cd parenting-app-ui +$ cd open-app-builder $ yarn install ``` Note - you may have to do this from time to time when content is updated) @@ -45,7 +45,7 @@ yarn workflow deployment set ``` This will present an interactive list of deployments to select from. -See [Deployment Documentation](https://idemsinternational.github.io/parenting-app-ui/developers/deployments/) for information about creating and configuring deployments. +See [Deployment Documentation](https://idemsinternational.github.io/open-app-builder/developers/deployments/) for information about creating and configuring deployments. ## Running locally @@ -57,8 +57,8 @@ This will start a local server and serve the app in your browser on http://local # For Content Coders -Please see [Quickstart Authors](https://idemsinternational.github.io/parenting-app-ui/authors/quickstart/) +Please see [Quickstart Authors](https://idemsinternational.github.io/open-app-builder/authors/quickstart/) # For Developers -Please see [Quickstart Developers](https://idemsinternational.github.io/parenting-app-ui/developers/quickstart/) +Please see [Quickstart Developers](https://idemsinternational.github.io/open-app-builder/developers/quickstart/) diff --git a/documentation/docs/authors/advanced/overrides.md b/documentation/docs/authors/advanced/overrides.md index 76b85acfb2..cefa9b9635 100644 --- a/documentation/docs/authors/advanced/overrides.md +++ b/documentation/docs/authors/advanced/overrides.md @@ -51,4 +51,4 @@ It is also possible to replace any other flow type during sync and build by spec This can be useful in cases where multiple apps share some of the same core content, and want to only apply a number of replacements/additions. !!! example "Experimental" -See open issue [2081](https://github.com/IDEMSInternational/parenting-app-ui/issues/2081) for proposals to add multiple data sources to make this type of override system more easy to implement \ No newline at end of file +See open issue [2081](https://github.com/IDEMSInternational/open-app-builder/issues/2081) for proposals to add multiple data sources to make this type of override system more easy to implement \ No newline at end of file diff --git a/documentation/docs/authors/notifications.md b/documentation/docs/authors/notifications.md index 9d44ceb02d..f1bbc51db3 100644 --- a/documentation/docs/authors/notifications.md +++ b/documentation/docs/authors/notifications.md @@ -63,4 +63,4 @@ Notifications are automatically evaluated and scheduled on app start !!! warning When the app is not in active use sync timers pause and so no new notifications will be evaluated. That means that if the user closes the app -There is currently no workaround for this unfortunately except for reducing the re-schedule sync timer, however if this is required than it is suggested to [create an issue](https://github.com/IDEMSInternational/parenting-app-ui/issues/new/choose) for the feature (likely best handled by a trigger that can be called from authoring). \ No newline at end of file +There is currently no workaround for this unfortunately except for reducing the re-schedule sync timer, however if this is required than it is suggested to [create an issue](https://github.com/IDEMSInternational/open-app-builder/issues/new/choose) for the feature (likely best handled by a trigger that can be called from authoring). \ No newline at end of file diff --git a/documentation/docs/developers/deployments.md b/documentation/docs/developers/deployments.md index 929665d9bd..9923fabad5 100644 --- a/documentation/docs/developers/deployments.md +++ b/documentation/docs/developers/deployments.md @@ -56,9 +56,9 @@ export default config; ``` This configuration provides a minimal set of options to override the default header and sidemenu text, as well as configuring a remote google_drive data source (more information below) -A full list of general configuration options can be found in [packages/data-models/deployment.model.ts](https://github.com/IDEMSInternational/parenting-app-ui/blob/master/packages/data-models/deployment.model.ts) +A full list of general configuration options can be found in [packages/data-models/deployment.model.ts](https://github.com/IDEMSInternational/open-app-builder/blob/master/packages/data-models/deployment.model.ts) -A full list of app_config and their default values can be found in [packages/data-models/appConfig.ts](https://github.com/IDEMSInternational/parenting-app-ui/blob/master/packages/data-models/appConfig.ts) +A full list of app_config and their default values can be found in [packages/data-models/appConfig.ts](https://github.com/IDEMSInternational/open-app-builder/blob/master/packages/data-models/appConfig.ts) Any configuration changes can be applied by setting the deployment ``` diff --git a/documentation/docs/developers/device-testing.md b/documentation/docs/developers/device-testing.md index 17bb697eee..679b7e7881 100644 --- a/documentation/docs/developers/device-testing.md +++ b/documentation/docs/developers/device-testing.md @@ -2,7 +2,7 @@ ## Generate apk A custom github action exists that can be used to trigger the building of android APKs from a given repo branch. Visit the action url and click Run workflow to initiate a build -https://github.com/IDEMSInternational/parenting-app-ui/actions/workflows/trigger-build.yml +https://github.com/IDEMSInternational/open-app-builder/actions/workflows/trigger-build.yml ![](./images/device-testing-1.png) diff --git a/documentation/docs/developers/in-app-updates.md b/documentation/docs/developers/in-app-updates.md index 99e3fdbe01..0474d7e764 100644 --- a/documentation/docs/developers/in-app-updates.md +++ b/documentation/docs/developers/in-app-updates.md @@ -60,7 +60,7 @@ npx cap open android 3. Create a debug build from android studio menu (assumes google.json populated locally) _Build -> Build Bundles / APKs -> Build Bundle_ - It should prompt a message on complete to locate the bundle, e.g. `...\parenting-app-ui\android\app\build\outputs\bundle\debug` + It should prompt a message on complete to locate the bundle, e.g. `...\open-app-builder\android\app\build\outputs\bundle\debug` 4. Upload to [internal app sharing](https://play.google.com/console/internal-app-sharing) (each user maintains their own list of uploaded apps, so you won't be able to see what others have uploaded) diff --git a/documentation/docs/developers/web-previews.md b/documentation/docs/developers/web-previews.md index ef14ef1464..6e4824ac1f 100644 --- a/documentation/docs/developers/web-previews.md +++ b/documentation/docs/developers/web-previews.md @@ -16,7 +16,7 @@ on: jobs: web_preview: - uses: IDEMSInternational/parenting-app-ui/.github/workflows/reusable-deploy-web-preview.yml@master + uses: IDEMSInternational/open-app-builder/.github/workflows/reusable-deploy-web-preview.yml@master secrets: inherit ``` diff --git a/documentation/docs/index.md b/documentation/docs/index.md index d9dece0264..4522d45905 100644 --- a/documentation/docs/index.md +++ b/documentation/docs/index.md @@ -18,13 +18,13 @@ ### Download the repo with binary assets ``` -$ git lfs clone https://github.com/IDEMSInternational/parenting-app-ui.git +$ git lfs clone https://github.com/IDEMSInternational/open-app-builder.git ``` Note - if you do a regular git clone, you can always run `git lfs fetch --all` later to sync assets ### Install required dependencies ``` -$ cd parenting-app-ui +$ cd open-app-builder $ yarn install ``` Note - you may have to do this from time to time when content is updated) diff --git a/documentation/docs/questions/parameters_styles.md b/documentation/docs/questions/parameters_styles.md index 14ef7143b4..5b45eff545 100644 --- a/documentation/docs/questions/parameters_styles.md +++ b/documentation/docs/questions/parameters_styles.md @@ -4,7 +4,7 @@ _Asked on 10 February 2022_ -The `parameter_list` takes only parameters that are specifically defined by us for every specific component. As such, these are going to be pretty impossible for you to guess without documentation. For what it's worth, [this file](https://github.com/IDEMSInternational/parenting-app-ui/blob/master/documentation/docs/authors/template-component-parameter-list.md) is the closest thing to documentation of those parameters that we have at the moment. +The `parameter_list` takes only parameters that are specifically defined by us for every specific component. As such, these are going to be pretty impossible for you to guess without documentation. For what it's worth, [this file](https://github.com/IDEMSInternational/open-app-builder/blob/master/documentation/docs/authors/template-component-parameter-list.md) is the closest thing to documentation of those parameters that we have at the moment. Instead, the `style_list` does indeed interpret CSS directly. My knowledge of CSS is limited as well so I can't be of much help here, but [this documentation website](https://www.w3schools.com/cssref/default.asp) has proven handy to me in the past. diff --git a/documentation/mkdocs.yml b/documentation/mkdocs.yml index 36d91712fe..6cfc061097 100644 --- a/documentation/mkdocs.yml +++ b/documentation/mkdocs.yml @@ -6,7 +6,7 @@ theme: accent: a mber font: text: "Open Sans" -repo_url: https://github.com/IDEMSInternational/parenting-app-ui +repo_url: https://github.com/IDEMSInternational/open-app-builder edit_uri: edit/master/documentation/docs/ nav: From dc77658a68215ad92c8a030d413a6be3f97777dc Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:46:36 +0100 Subject: [PATCH 4/6] updated actions to point to new repository name --- .github/workflows/reusable-android-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-android-build.yml b/.github/workflows/reusable-android-build.yml index c57e248d6b..8ef127275f 100644 --- a/.github/workflows/reusable-android-build.yml +++ b/.github/workflows/reusable-android-build.yml @@ -57,7 +57,7 @@ jobs: - name: Check out app code uses: actions/checkout@v3 with: - repository: "IDEMSInternational/parenting-app-ui.git" + repository: "IDEMSInternational/open-app-builder.git" ref: ${{env.APP_CODE_BRANCH}} lfs: true From 7a26be8d105cfb990abc24961f90df0805c0a64b Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:47:59 +0100 Subject: [PATCH 5/6] Update reusable-app-build.yml --- .github/workflows/reusable-app-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-app-build.yml b/.github/workflows/reusable-app-build.yml index 8bcab1fbfa..674de36f38 100644 --- a/.github/workflows/reusable-app-build.yml +++ b/.github/workflows/reusable-app-build.yml @@ -58,7 +58,7 @@ jobs: - name: Check out app code uses: actions/checkout@v3 with: - repository: "IDEMSInternational/parenting-app-ui.git" + repository: "IDEMSInternational/open-app-builder.git" ref: ${{env.APP_CODE_BRANCH}} - name: Checkout parent repo if needed From e431ee070e9c601efb40ffa65bc13344e0bb283e Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:48:52 +0100 Subject: [PATCH 6/6] updated actions to point to new repository name --- .github/workflows/reusable-content-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-content-sync.yml b/.github/workflows/reusable-content-sync.yml index c0f8c21f9a..531ddc9376 100644 --- a/.github/workflows/reusable-content-sync.yml +++ b/.github/workflows/reusable-content-sync.yml @@ -47,7 +47,7 @@ jobs: - name: Check out app code uses: actions/checkout@v3 with: - repository: "IDEMSInternational/parenting-app-ui.git" + repository: "IDEMSInternational/open-app-builder.git" ref: ${{env.APP_CODE_BRANCH}} - name: Remove .git from the repository in order to nest