From b3ec40ff286b5b2a187c5684714634be7b6d76ce Mon Sep 17 00:00:00 2001
From: Jimmy <jbyrne5094@gmail.com>
Date: Tue, 4 Jun 2024 16:41:15 -0700
Subject: [PATCH 1/6] Feature/demo uwg june2024 - bug fixes (#109)

* /version v1.0.0-rc.1

* /version v1.0.0-rc.2

* Pull in recent changes to 1.0.0

* /version v1.0.0-rc.3

* Fix umm-t record

* /version v1.0.0-rc.4

* Fix umm-t record

* /version v1.0.0-rc.5

* Fix umm-t record

* /version v1.0.0-rc.6

* /version v1.0.0-rc.7

* issue/manual-granule-input-hotfix: fixed how ranged of scenes are processed (#86)

Co-authored-by: jbyrne <jimmy.byrne@jpl.nasa.gov>

* Issues/swodlr UI 72 essential UI bug fixes (#87)

* issues/swodlr-ui-72: fix cps url params bug

* issues/swodlr-ui-72

* issues/swodlr-ui-75: fixed a couple bugs

* issues/swodlr-ui-72: fixed map movement, adjust options, data page limit, etc

* issues/swodlr-ui-72: changed spatial search beginning date in range

* issues/swodlr-ui-72-essential-fixes: cleaned up comments

---------

Co-authored-by: jbyrne <jimmy.byrne@jpl.nasa.gov>

* /version v1.0.0-rc.8

* feature/demo-uwg-june2024: fix tutorial popup

* feature/demo-uwg-june2024: fix my data page loading bug

* feature/demo-uwg-june2024: fix my data page no data navigation

---------

Co-authored-by: frankinspace <frankinspace@users.noreply.github.com>
Co-authored-by: Frank Greguska <Francis.Greguska@jpl.nasa.gov>
Co-authored-by: Jonathan M Smolenski <smolensk@jpl.nasa.gov>
Co-authored-by: jonathansmolenski <jonathansmolenski@users.noreply.github.com>
Co-authored-by: jbyrne <jimmy.byrne@jpl.nasa.gov>
---
 src/components/app/App.css                    | 12 +++++--
 .../history/GeneratedProductHistory.tsx       | 33 ++++++++++---------
 src/components/history/HistoryFilters.tsx     |  9 +++--
 .../GranuleSelectionAndConfigurationView.tsx  | 12 +++----
 .../sidebar/actions/productSlice.ts           |  8 ++++-
 5 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/components/app/App.css b/src/components/app/App.css
index a624a4c..51a5113 100644
--- a/src/components/app/App.css
+++ b/src/components/app/App.css
@@ -229,7 +229,8 @@ CUSTOMIZE PRODUCT CONTAINER
   left: 0;
   z-index: 1000;
   padding-top: 125px;
-  padding-bottom: 58px
+  padding-bottom: 58px;
+  /* overflow-y: auto; */
 }
 
 .sidebar-resize {
@@ -419,7 +420,14 @@ ABOUT PAGE
 
 .about-page {
   max-height: 82vh;
-  /* overflow-y: auto; */
+  background-color: #3d5d82;
+  overflow-y: scroll;
+}
+
+.my-data-page {
+  max-height: 82vh;
+  background-color: #3d5d82;
+  /* overflow-y: scroll; */
 }
 
 .about-card {
diff --git a/src/components/history/GeneratedProductHistory.tsx b/src/components/history/GeneratedProductHistory.tsx
index a6acd37..729617f 100644
--- a/src/components/history/GeneratedProductHistory.tsx
+++ b/src/components/history/GeneratedProductHistory.tsx
@@ -11,7 +11,7 @@ import HistoryFilters from "./HistoryFilters";
 import { Adjust, FilterParameters, OutputGranuleExtentFlagOptions, OutputSamplingGridType, RasterResolution } from "../../types/historyPageTypes";
 import { setShowReGenerateProductModalTrue } from "../sidebar/actions/modalSlice";
 import ReGenerateProductsModal from "./ReGenerateProductsModal";
-import { setAllUserProducts, setGranulesToReGenerate, setUserProducts, setWaitingForMyDataFiltering } from "../sidebar/actions/productSlice";
+import { setAllUserProducts, setGranulesToReGenerate, setUserProducts, setWaitingForMyDataFiltering, setWaitingForProductsToLoad } from "../sidebar/actions/productSlice";
 
 export const productPassesFilterCheck = (currentFilters: FilterParameters, cycle: number, pass: number, scene: number, outputGranuleExtentFlag: boolean, status: string, outputSamplingGridType: string, rasterResolution: number, dateGenerated: string, utmZoneAdjust?: number, mgrsBandAdjust?: number): boolean => {
     let productPassesFilter = true
@@ -58,6 +58,8 @@ const GeneratedProductHistory = () => {
     const colorModeClass = useAppSelector((state) => state.navbar.colorModeClass)
     const userProducts = useAppSelector((state) => state.product.userProducts)
     const currentFilters = useAppSelector((state) => state.product.currentFilters)
+    const waitingForProductsToLoad = useAppSelector((state) => state.product.waitingForProductsToLoad)
+    const waitingForMyDataFiltering = useAppSelector((state) => state.product.waitingForMyDataFiltering)
     const { search } = useLocation()
     const navigate = useNavigate()
     const [totalNumberOfProducts, setTotalNumberOfProducts] = useState<number>(0)
@@ -66,11 +68,12 @@ const GeneratedProductHistory = () => {
     const [allChecked, setAllChecked] = useState<boolean>(false)
     
     useEffect(() => {
-        dispatch(setWaitingForMyDataFiltering(true))
         // get the data for the first page
         // go through all the user product data to get the id of each one so that 
         const fetchData = async () => {
+            if(!waitingForMyDataFiltering) dispatch(setWaitingForProductsToLoad(true))
             await getUserProducts({limit: '1000000'}).then(response => {
+                dispatch(setWaitingForProductsToLoad(false))
                 // filter products for what is in the filter
                 const allProducts = response.products as Product[]
                 setTotalNumberOfProducts(allProducts.length)
@@ -161,16 +164,12 @@ const GeneratedProductHistory = () => {
         const downloadUrlList = checkedProducts.map(product => product.granules.map(granule => granule.uri)).flat()
         return (
             <Row>
-                {<Col xs={2} style={{height: '100%'}}><HistoryFilters /></Col>}
-
-                
+                {<Col xs={2} style={{height: '100%'}}><HistoryFilters /></Col>}                
                 <Col xs={10}>
                     <div style={{padding: '0px 20px 20px 20px'}} id='history-table'>
                     <div>
                     {
-                    totalNumberOfProducts === 0 ?
-                    <Row>{productHistoryAlert()}</Row>
-                    :<>
+                    <>
                     <Row>
                         <Col xs={1}>
                         <DropdownButton data-bs-theme='dark' style={{}} id="dropdown-basic-button" title={<><Badge bg="secondary">{checkedProducts.length}</Badge> Actions</>}>
@@ -226,21 +225,23 @@ const GeneratedProductHistory = () => {
                     }
                     </div>
                     {<DataPagination totalNumberOfProducts={totalNumberOfProducts} totalNumberOfFilteredProducts={totalNumberOfFilteredProducts} />}
+                    {!waitingForProductsToLoad && userProducts.length === 0 ? <Row>{productHistoryAlert()}</Row> : null}
+                    {waitingForProductsToLoad ? waitingForProductsToLoadSpinner() : null}
                 </div>
                 </Col>
             </Row>
         )
-    }
+    } 
     
     const productHistoryAlert = () => {
-        const alertMessage = 'No products have been generated. Go to the Product Customization page to generate products.'
-        return <Col style={{margin: '30px'}}><Alert variant='warning' onClick={() => navigate(`/generatedProductHistory${search}`)} style={{cursor: 'pointer'}}>{alertMessage}</Alert></Col>
+        const alertMessage = 'No products generated with these filters. Click here or go to the Product Customization page to generate products.'
+        return <Col style={{margin: '30px'}}><Alert variant='warning' onClick={() => navigate(`/customizeProduct/configureOptions${search}`)} style={{cursor: 'pointer'}}>{alertMessage}</Alert></Col>
     }
 
     const waitingForProductsToLoadSpinner = () => {
         return (
             <div>
-                <h5>Loading Data Table...</h5>
+                <h5>Loading Product Data...</h5>
                 <Spinner animation="border" role="status">
                     <span className="visually-hidden">Loading...</span>
                 </Spinner> 
@@ -258,10 +259,10 @@ const GeneratedProductHistory = () => {
 
     return (
         <>
-        <h4 style={{marginTop: '80px', paddingBottom: '0px', marginBottom: '0px'}}>Generated Products Data</h4>
-        <Col className='about-page' style={{marginRight: '20px', marginLeft: '20px'}}>
-            <Row className='normal-row'>{totalNumberOfProducts === 0 ? waitingForProductsToLoadSpinner() : renderProductHistoryViews()}</Row>
-        </Col>
+            <h4 style={{marginTop: '80px', paddingBottom: '0px', marginBottom: '0px'}}>Generated Products Data</h4>
+            <Col className='my-data-page' style={{marginRight: '20px', marginLeft: '20px'}}>
+                <Row className='normal-row'>{renderProductHistoryViews()}</Row>
+            </Col>
         </>
     );
 }
diff --git a/src/components/history/HistoryFilters.tsx b/src/components/history/HistoryFilters.tsx
index dbbf17c..bdb748f 100644
--- a/src/components/history/HistoryFilters.tsx
+++ b/src/components/history/HistoryFilters.tsx
@@ -1,7 +1,7 @@
 import { Accordion, Button, Col, Form, Row, Spinner } from "react-bootstrap";
 import { ProductState } from "../../types/graphqlTypes";
 import { useAppDispatch, useAppSelector } from "../../redux/hooks";
-import { setCurrentFilter } from "../sidebar/actions/productSlice";
+import { setCurrentFilter, setWaitingForMyDataFiltering } from "../sidebar/actions/productSlice";
 import { defaultFilterParameters, defaultSpatialSearchEndDate, defaultSpatialSearchStartDate, inputBounds, parameterOptionValues, rasterResolutionOptions } from "../../constants/rasterParameterConstants";
 import { useState } from "react";
 import { OutputGranuleExtentFlagOptions, OutputSamplingGridType, RasterResolution, Adjust, FilterParameters, FilterAction } from "../../types/historyPageTypes";
@@ -124,6 +124,11 @@ const HistoryFilters = () => {
         setCurrentFilters(currentFiltersToModify)
     }
 
+    const handleApplyFilters = () => {
+        dispatch(setCurrentFilter(currentFilters))
+        dispatch(setWaitingForMyDataFiltering(true))
+    }
+
     const statusOptions = ['NEW', 'UNAVAILABLE', 'GENERATING', 'ERROR', 'READY', 'AVAILABLE']
     const outputGranuleExtentFlagOptions = ['128 x 128', '256 x 128']
     const outputSamplingGridTypeOptions = parameterOptionValues.outputSamplingGridType.values.map(value => {
@@ -314,7 +319,7 @@ const HistoryFilters = () => {
                     </Accordion.Item>
                 </Accordion>
             </Row>
-                <Button style={{marginTop: '10px', marginBottom: '10px'}} disabled={!cycleIsValid || !passIsValid || !sceneIsValid} onClick={() => dispatch(setCurrentFilter(currentFilters))}>{waitingForMyDataFiltering ? 
+                <Button style={{marginTop: '10px', marginBottom: '10px'}} disabled={!cycleIsValid || !passIsValid || !sceneIsValid} onClick={() => handleApplyFilters()}>{waitingForMyDataFiltering ? 
                             <Spinner size="sm" animation="border" role="status">
                             <span className="visually-hidden">Loading...</span>
                         </Spinner> 
diff --git a/src/components/sidebar/GranuleSelectionAndConfigurationView.tsx b/src/components/sidebar/GranuleSelectionAndConfigurationView.tsx
index 17bac93..aad61dc 100644
--- a/src/components/sidebar/GranuleSelectionAndConfigurationView.tsx
+++ b/src/components/sidebar/GranuleSelectionAndConfigurationView.tsx
@@ -17,20 +17,16 @@ const GranuleSelectionAndConfigurationView = (props: GranuleSelectionAndConfigur
     const fetchData = async () => {
       const userHasCorrectEdlPermissions = await checkUseHasCorrectEdlPermissions()
       dispatch(setUserHasCorrectEdlPermissions(userHasCorrectEdlPermissions))
+      if (!skipTutorial && userAuthenticated) {
+        dispatch(setShowTutorialModalTrue())
+        dispatch(setSkipTutorialTrue())
+      }
     }
 
     // call the function
     fetchData()
   }, [])
 
-  useEffect(() => {
-    if (!skipTutorial && userAuthenticated) {
-      dispatch(setShowTutorialModalTrue())
-      dispatch(setSkipTutorialTrue())
-    }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [userAuthenticated])
-
   return (
     <>
       <CustomizeProductsSidebar mode={mode}/>
diff --git a/src/components/sidebar/actions/productSlice.ts b/src/components/sidebar/actions/productSlice.ts
index 8cde587..068b43a 100644
--- a/src/components/sidebar/actions/productSlice.ts
+++ b/src/components/sidebar/actions/productSlice.ts
@@ -30,6 +30,7 @@ interface GranuleState {
     currentFilters: FilterParameters,
     granulesToReGenerate: Product[],
     waitingForMyDataFiltering: boolean,
+    waitingForProductsToLoad: boolean
 }
 
 const {name, cycle, pass, scene, ...generateProductParametersFiltered } = parameterOptionDefaults
@@ -59,6 +60,7 @@ const initialState: GranuleState = {
     currentFilters: defaultFilterParameters,
     granulesToReGenerate: [],
     waitingForMyDataFiltering: false,
+    waitingForProductsToLoad: false
 }
 
 
@@ -178,6 +180,9 @@ export const productSlice = createSlice({
     },
     setWaitingForMyDataFiltering: (state, action: PayloadAction<boolean>) => {
       state.waitingForMyDataFiltering = action.payload
+    },
+    setWaitingForProductsToLoad: (state, action: PayloadAction<boolean>) => {
+      state.waitingForProductsToLoad = action.payload
     }
   },
 })
@@ -206,7 +211,8 @@ export const {
     setHistoryPageState,
     addPageToHistoryPageState,
     setCurrentFilter,
-    setWaitingForMyDataFiltering
+    setWaitingForMyDataFiltering,
+    setWaitingForProductsToLoad
 } = productSlice.actions
 
 export default productSlice.reducer
\ No newline at end of file

From d2cf76be5beaa9a2b75d0b7bc6ef61f164c7ca5b Mon Sep 17 00:00:00 2001
From: Curtis Banh <30607061+cqbanh@users.noreply.github.com>
Date: Wed, 5 Jun 2024 21:45:43 -0700
Subject: [PATCH 2/6] CICD - commit version bump, GH App token

---
 .github/workflows/build.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a72b8f2..ab75d2a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -167,6 +167,12 @@ jobs:
         with:
           name: build
           path: build/*
+      - name: Generate GitHub App Token
+        id: generate_token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.GH_APP_ID }}
+          private_key: ${{ secrets.GH_APP_PRIVATE_KEY }}
       - name: Commit Version Bump
         # If building an alpha, release candidate, or release then we commit the version bump back to the repo
         if: |
@@ -174,10 +180,13 @@ jobs:
           steps.rc.conclusion == 'success'      ||
           steps.release.conclusion == 'success'
         run: |
-          git config user.name "${GITHUB_ACTOR}"
+          git config user.name "PODAAC-CICD"
           git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+          echo "machine github.com login x-access-token password ${{ steps.generate_token.outputs.token }}" > ~/.netrc
           git commit -am "/version ${{ env.software_version }}"
           git push
+        env:
+          GH_APP_TOKEN: ${{ steps.generate_token.outputs.token }}
       - name: Push Tag
         if: |
           steps.alpha.conclusion == 'success'   ||

From 8554675f27cfd594cfc8be9e73a97e60f81a2694 Mon Sep 17 00:00:00 2001
From: Curtis Banh <30607061+cqbanh@users.noreply.github.com>
Date: Wed, 5 Jun 2024 23:28:46 -0700
Subject: [PATCH 3/6] CICD - Check token scope

---
 .github/workflows/build.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab75d2a..b1396b0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -173,6 +173,11 @@ jobs:
         with:
           app_id: ${{ secrets.GH_APP_ID }}
           private_key: ${{ secrets.GH_APP_PRIVATE_KEY }}
+      - name: Check Token Scopes
+        run: |
+          curl -H "Authorization: Bearer ${{ steps.generate_token.outputs.token }}" \
+               -H "Accept: application/vnd.github.v3+json" \
+               https://api.github.com/app
       - name: Commit Version Bump
         # If building an alpha, release candidate, or release then we commit the version bump back to the repo
         if: |

From 8b816689e6e5af275dd31033aea42d9c71357a34 Mon Sep 17 00:00:00 2001
From: PODAAC-CICD <cqbanh@users.noreply.github.com>
Date: Thu, 6 Jun 2024 07:14:58 +0000
Subject: [PATCH 4/6] /version v1.0.1-0

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 01c986d..c66a633 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "swodlr-ui",
-  "version": "1.0.0",
+  "version": "1.0.1-0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "swodlr-ui",
-      "version": "1.0.0",
+      "version": "1.0.1-0",
       "dependencies": {
         "@hexagon/base64": "^1.1.28",
         "@reduxjs/toolkit": "^1.9.5",
diff --git a/package.json b/package.json
index 933df60..ca8872e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swodlr-ui",
-  "version": "1.0.0",
+  "version": "1.0.1-0",
   "private": true,
   "engines": {
     "node": ">=18.0.0"

From a92948e2ccfee0a882a76dd06628eda978f6b0b8 Mon Sep 17 00:00:00 2001
From: Curtis Banh <30607061+cqbanh@users.noreply.github.com>
Date: Thu, 6 Jun 2024 00:26:19 -0700
Subject: [PATCH 5/6] CICD - update generate GH App token

---
 .github/workflows/build.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1396b0..76c717d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -169,15 +169,10 @@ jobs:
           path: build/*
       - name: Generate GitHub App Token
         id: generate_token
-        uses: tibdex/github-app-token@v1
+        uses: actions/create-github-app-token@v1
         with:
-          app_id: ${{ secrets.GH_APP_ID }}
-          private_key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-      - name: Check Token Scopes
-        run: |
-          curl -H "Authorization: Bearer ${{ steps.generate_token.outputs.token }}" \
-               -H "Accept: application/vnd.github.v3+json" \
-               https://api.github.com/app
+          app-id: ${{ secrets.GH_APP_ID }}
+          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
       - name: Commit Version Bump
         # If building an alpha, release candidate, or release then we commit the version bump back to the repo
         if: |

From 93ed70869994e2c5cb62fad282abb2d76fc526ec Mon Sep 17 00:00:00 2001
From: PODAAC-CICD <cqbanh@users.noreply.github.com>
Date: Thu, 6 Jun 2024 07:28:44 +0000
Subject: [PATCH 6/6] /version v1.0.1-1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c66a633..4121754 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "swodlr-ui",
-  "version": "1.0.1-0",
+  "version": "1.0.1-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "swodlr-ui",
-      "version": "1.0.1-0",
+      "version": "1.0.1-1",
       "dependencies": {
         "@hexagon/base64": "^1.1.28",
         "@reduxjs/toolkit": "^1.9.5",
diff --git a/package.json b/package.json
index ca8872e..5f31da9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swodlr-ui",
-  "version": "1.0.1-0",
+  "version": "1.0.1-1",
   "private": true,
   "engines": {
     "node": ">=18.0.0"