Release 1.2.5

.github/workflows/auto-release.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   check-version:
-    name: Check version increment
+    name: Tag and Create Changelog
     runs-on: ubuntu-latest
     steps:
       - name: Clean workspace

.github/workflows/build-installers.yaml

@@ -58,16 +58,17 @@ jobs:
           npm install -g notarize-cli
           notarize-cli \
             --file="$DMG_FILE" \
-            --bundle-id net.chia.cadt-ui \
+            --bundle-id net.chia.core-registry-cadt-ui \
             --username "${{ secrets.APPLE_NOTARIZE_USERNAME }}" \
             --password "${{ secrets.APPLE_NOTARIZE_PASSWORD }}"
 
       - name: Upload Mac Installer
         uses: actions/upload-artifact@v3
         with:
-          name: cadt-ui-mac-installer
+          name: core-registry-cadt-ui-mac-installer
           path: ${{ github.workspace }}/dist/*.dmg
 
+
   build_windows:
     name: Build Windows Installer
     runs-on: windows-2019
@@ -92,17 +93,31 @@ jobs:
           npm install
 
       - name: Build electron app
-        env:
-          CSC_LINK: ${{ secrets.WIN_CODE_SIGN_CERT }}
-          CSC_KEY_PASSWORD: ${{ secrets.WIN_CODE_SIGN_PASSWORD }}
         run: npm run electron:package:win
 
+      # Windows Code Signing
+      - name: Get installer name for signing
+        shell: bash
+        run: |
+          FILE=$(find dist -type f -maxdepth 1 -name '*.exe')
+          echo "Installer file is $FILE"
+          echo "INSTALLER_FILE=$FILE" >> "$GITHUB_ENV"
+
+      - name: Sign windows artifacts
+        uses: chia-network/actions/digicert/windows-sign@main
+        with:
+          sm_api_key: ${{ secrets.SM_API_KEY }}
+          sm_client_cert_file_b64: ${{ secrets.SM_CLIENT_CERT_FILE_B64 }}
+          sm_client_cert_password: ${{ secrets.SM_CLIENT_CERT_PASSWORD }}
+          sm_code_signing_cert_sha1_hash: ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}
+          file: "${{ github.workspace }}/${{ env.INSTALLER_FILE }}"
+
       - name: Upload Windows Installer
         uses: actions/upload-artifact@v3
         with:
-          name: cadt-ui-windows-installer
-          path: ${{ github.workspace }}/dist/*.exe
-
+          name: core-registry-cadt-ui-windows-installer
+          path: "${{ github.workspace }}/${{ env.INSTALLER_FILE }}"
+          
   build_linux:
     name: Build Linux Installer
     runs-on: ubuntu-latest
@@ -135,7 +150,7 @@ jobs:
       - name: Upload Linux Installer
         uses: actions/upload-artifact@v3
         with:
-          name: cadt-ui-linux-installer
+          name: core-registry-cadt-ui-linux-installer
           path: ${{ github.workspace }}/dist/*.deb
 
   build_web:
@@ -160,13 +175,13 @@ jobs:
           npm run build
 
       - name: Create .tar.gz of the web build
-        run: tar -cvzf cadt-ui-web-build.tar.gz build
+        run: tar -cvzf core-registry-cadt-ui-web-build.tar.gz build
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v3
         with:
-          name: cadt-ui-web-build
-          path: cadt-ui-web-build.tar.gz
+          name: core-registry-cadt-ui-web-build
+          path: core-registry-cadt-ui-web-build.tar.gz
 
   release:
     runs-on: ubuntu-latest
@@ -180,33 +195,33 @@ jobs:
       - name: Download Windows artifacts
         uses: actions/download-artifact@v3
         with:
-          name: cadt-ui-windows-installer
-          path: cadt-ui-windows-installer
+          name: core-registry-cadt-ui-windows-installer
+          path: core-registry-cadt-ui-windows-installer
 
       - name: Download MacOS artifacts
         uses: actions/download-artifact@v3
         with:
-          name: cadt-ui-mac-installer
-          path: cadt-ui-mac-installer
+          name: core-registry-cadt-ui-mac-installer
+          path: core-registry-cadt-ui-mac-installer
 
       - name: Download Linux artifacts
         uses: actions/download-artifact@v3
         with:
-          name: cadt-ui-linux-installer
-          path: cadt-ui-linux-installer
+          name: core-registry-cadt-ui-linux-installer
+          path: core-registry-cadt-ui-linux-installer
 
       - name: Download Web artifact
         uses: actions/download-artifact@v3
         with:
-          name: cadt-ui-web-build
-          path: cadt-ui-web-build
+          name: core-registry-cadt-ui-web-build
+          path: core-registry-cadt-ui-web-build
 
       - name: Get Filenames
         run: |
-          DMG_FILE=$(find ${{ github.workspace }}/cadt-ui-mac-installer/ -type f -name '*.dmg')
-          DEB_FILE=$(find ${{ github.workspace }}/cadt-ui-linux-installer/ -type f -name '*.deb')
-          EXE_FILE=$(find ${{ github.workspace }}/cadt-ui-windows-installer/ -type f -name '*.exe')
-          WEB_FILE=$(find ${{ github.workspace }}/cadt-ui-web-build/ -type f -name '*.tar.gz')
+          DMG_FILE=$(find ${{ github.workspace }}/core-registry-cadt-ui-mac-installer/ -type f -name '*.dmg')
+          DEB_FILE=$(find ${{ github.workspace }}/core-registry-cadt-ui-linux-installer/ -type f -name '*.deb')
+          EXE_FILE=$(find ${{ github.workspace }}/core-registry-cadt-ui-windows-installer/ -type f -name '*.exe')
+          WEB_FILE=$(find ${{ github.workspace }}/core-registry-cadt-ui-web-build/ -type f -name '*.tar.gz')
 
           echo "DMG_FILE=$DMG_FILE" >>$GITHUB_ENV
           echo "DEB_FILE=$DEB_FILE" >>$GITHUB_ENV
@@ -222,7 +237,18 @@ jobs:
             ${{ env.EXE_FILE }}
             ${{ env.WEB_FILE }}
 
+      - name: Get tag name
+        id: tag-name
+        run: |
+          echo "TAGNAME=$(echo $GITHUB_REF | cut -d / -f 3)" >>$GITHUB_OUTPUT
+
+      - name: Get repo name
+        id: repo-name
+        run: |
+          echo "REPO_NAME=$(echo "$GITHUB_REPOSITORY" | cut -d "/" -f 2)" >>$GITHUB_OUTPUT
+
       - name: Trigger apt repo update
         run: |
-          curl -s -XPOST -H "Authorization: Bearer ${{ secrets.GLUE_ACCESS_TOKEN }}" --data '{"cadt_repo":"cadt-ui","release_version":"${{ steps.tag-name.outputs.TAGNAME }}"}' ${{ secrets.GLUE_API_URL }}/api/v1/cadt/${{ github.sha }}/start
-          curl -s -XPOST -H "Authorization: Bearer ${{ secrets.GLUE_ACCESS_TOKEN }}" --data '{"cadt_repo":"cadt-ui","release_version":"${{ steps.tag-name.outputs.TAGNAME }}"}' ${{ secrets.GLUE_API_URL }}/api/v1/cadt/${{ github.sha }}/success/deploy
+          curl -s -XPOST -H "Authorization: Bearer ${{ secrets.GLUE_ACCESS_TOKEN }}" --data '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"core-registry-cadt-ui","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"true","arm64":"false"}' ${{ secrets.GLUE_API_URL }}/api/v1/climate-tokenization/${{ github.sha }}/start
+          curl -s -XPOST -H "Authorization: Bearer ${{ secrets.GLUE_ACCESS_TOKEN }}" --data '{"climate_tokenization_repo":"${{ steps.repo-name.outputs.REPO_NAME }}","application_name":"core-registry-cadt-ui","release_version":"${{ steps.tag-name.outputs.TAGNAME }}","add_debian_version":"true","arm64":"false"}' ${{ secrets.GLUE_API_URL }}/api/v1/climate-tokenization/${{ github.sha }}/success/deploy
+

README.md

@@ -1,6 +1,6 @@
-# Climate Action Data Trust User Interface
+# Core Registry Climate Action Data Trust User Interface
 
-This repository provides a graphical user interface (UI) for the [Climate Action Data Trust (CADT)](https://github.com/Chia-Network/cadt) application.  CADT interfaces with the Chia Blockchain software and provides and API for entering and retrieving carbon data.  This UI is a javascript application that connects to the CADT API for a convenient way to access the data. 
+This project is a fork of the [Climate Action Data Trust UI](https://github.com/Chia-Network/cadt-ui) and provides enhancements and compatability improvements for the Core Registry suite of tools. This repository provides a graphical user interface (UI) for the [Core Registry Climate Action Data Trust (CADT)](https://github.com/Chia-Network/core-registry-cadt) application.  CADT interfaces with the Chia Blockchain software and provides and API for entering and retrieving carbon data.  This UI is a javascript application that connects to the Core Registry CADT API for a convenient way to access the data. 
 
 *Note that this application was previously called the Climate Warehouse UI and that name may be used interchangeably in documentation and throughout this application.*
 
@@ -11,11 +11,11 @@ The UI application can be hosted as a web application and accessed via the brows
 
 ### Desktop Applications
 
-The [releases](https://github.com/Chia-Network/cadt-ui/releases) page provides desktop applications packaged for Windows, Mac, and Debian-based Linux distributions.  
+The [releases](https://github.com/Chia-Network/core-registry-cadt-ui/releases) page provides desktop applications packaged for Windows, Mac, and Debian-based Linux distributions.  
 
 #### Ubuntu Desktop via Apt
 
-For Ubuntu-based Linux desktops the CADT UI is available for install with `apt`.  
+For Ubuntu-based Linux desktops the Core Registry CADT UI is available for install with `apt`.  
 
 1. Start by updating apt and allowing repository download over HTTPS:
 
@@ -46,15 +46,15 @@ sudo apt-get install cadt-ui
 
 ### Web Application
 
-The Climate Warehouse UI can be hosted as a web application, either for internal use, or made available to the public.  When operating as a web application, the user's browser must be able to connect to the [CADT API](https://github.com/Chia-Network/cadt).  This means the API must be available on the public internet if the UI is public.  The `READ_ONLY` option on the API should be set when running a public observer node. 
+The Core Registry CADT UI can be hosted as a web application, either for internal use, or made available to the public.  When operating as a web application, the user's browser must be able to connect to the [Core Registry CADT API](https://github.com/Chia-Network/core-registry-cadt).  This means the API must be available on the public internet if the UI is public.  The `READ_ONLY` option on the API should be set when running a public observer node. 
 
-To host the UI on the web, use the [web-build.tar.gz file from the releases page](https://github.com/Chia-Network/cadt-ui/releases). One of the simplest solutions is to uncompress these files into a [public S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/WebsiteAccessPermissionsReqd.html). These files could also be served by any webserver, such as Nginx or Apache.  
+To host the UI on the web, use the [web-build.tar.gz file from the releases page](https://github.com/Chia-Network/core-registry-cadt-ui/releases). One of the simplest solutions is to uncompress these files into a [public S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/WebsiteAccessPermissionsReqd.html). These files could also be served by any webserver, such as Nginx or Apache.  
 
 ### From Source
 
 ```
 npm install -g react-scripts
-git clone [email protected]:Chia-Network/cadt-ui.git
+git clone [email protected]:Chia-Network/core-registry-cadt-ui.git
 cd climate-warehouse-ui
 nvm install 18.16.0
 nvm use 18.16.0

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "cadt-ui",
-  "version": "1.2.4",
+  "name": "core-registry-cadt-ui",
+  "version": "1.2.5",
   "private": true,
   "author": "Chia Network Inc. <[email protected]>",
   "homepage": "./",
@@ -102,7 +102,7 @@
   },
   "build": {
     "appId": "org.worldbank.climate-action-data-trust",
-    "productName": "cadt-ui",
+    "productName": "core-registry-cadt-ui",
     "files": [
       "build/**/*",
       "node_modules/**/*"
@@ -127,9 +127,9 @@
     },
     "linux": {
       "target": "deb",
-      "description": "Climate Action Data Trust user interface desktop application. Allows point-and-click interface for the CADT API application.",
+      "description": "Core Registry Climate Action Data Trust user interface desktop application. Allows point-and-click interface for the Core Registry CADT API application.",
       "maintainer": "Chia Network Inc <[email protected]>",
-      "vendor": "https://climateactiondata.org/",
+      "vendor": "https://www.chia.net/",
       "publish": null,
       "icon": "src/assets/img/CADT_Icon.png",
       "desktop": {

src/components/blocks/MyAccount.js

@@ -57,6 +57,39 @@ const MyAccount = ({ openModal = false, onClose, isHeader = true }) => {
     }
   }, []);
 
+  useEffect(() => {
+    // Function to handle the message event
+    const handleMessage = event => {
+      if (event.origin !== window.location.origin) {
+        return;
+      }
+      console.log('Received message:', event.data);
+      if (
+        event?.data?.serverAddress &&
+        validateUrl(event?.data?.serverAddress)
+      ) {
+        dispatch(
+          signIn({
+            apiKey: event?.data?.apiKey,
+            serverAddress: event?.data?.serverAddress,
+          }),
+        );
+        setServerAddress(null);
+        setApiKey(null);
+        setIsLogInModalOpen(false);
+      }
+    };
+
+    // Add the event listener
+    window.addEventListener('message', handleMessage, false);
+
+    // Return a function that will be called when the component unmounts
+    return () => {
+      // Remove the event listener
+      window.removeEventListener('message', handleMessage, false);
+    };
+  }, []);
+
   return (
     <StyledMyAccountContainer>
       {isHeader && (

src/components/layout/Dashboard.js

@@ -36,7 +36,7 @@ const InnerContainer = styled('div')`
 const Dashboard = withTheme(({ children }) => {
   return (
     <Main>
-      <Header />
+      {window.self === window.top && <Header />}
       <InnerContainer>
         <ErrorBoundary>
           <LeftNav />

src/components/layout/Header.js

@@ -57,7 +57,7 @@ const Header = () => {
             </Body>
           )}
         </HomeOrgUidContainer>
-        <MyAccount />
+        {window.self === window.top && <MyAccount />}
         <LocaleSwitcher />
       </StyledLocalContainer>
     </Headline>

src/navigation/AppNavigator.js

@@ -46,7 +46,7 @@ const AppNavigator = () => {
   return (
     <AppContainer>
       {showProgressOverlay && <IndeterminateProgressOverlay />}
-      {!connectionCheck ? (
+      {!connectionCheck && window.self === window.top ? (
         <MyAccount
           openModal={true}
           onClose={() => dispatch(getOrganizationData())}