From 9d923ac7d01289f04380a06b8ba8c899bfc1e516 Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 16:23:32 +0100
Subject: [PATCH 01/10] NCL-8237 Fix Action Modal loading spinner logic

---
 src/components/ActionModal/ActionModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ActionModal/ActionModal.tsx b/src/components/ActionModal/ActionModal.tsx
index 15b4856a..45e7c2d0 100644
--- a/src/components/ActionModal/ActionModal.tsx
+++ b/src/components/ActionModal/ActionModal.tsx
@@ -95,7 +95,7 @@ export const ActionModal = ({
       actions={[
         // TODO: NCL-8010
         <Button variant="primary" onClick={onSubmit} isDisabled={isSubmitDisabled || serviceContainer?.loading}>
-          {serviceContainer && (!serviceContainer.error || serviceContainer.loading) && (
+          {serviceContainer && serviceContainer.loading && (
             <ServiceContainerLoading variant="icon" {...serviceContainer} title={actionTitle} />
           )}{' '}
           {wasLastActionSuccessful && !wereSubmitDataChanged && <CheckIcon />} {actionTitle}

From 5bcb127c75add6671df4079be89991bd05fa6bea Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 14:48:11 +0100
Subject: [PATCH 02/10] NCL-8237 Generalize Milestone Deliverables Analysis
 entity attributes

---
 ...> deliverablesAnalysisEntityAttributes.ts} |  2 +-
 ...oductMilestoneAnalyzeDeliverablesModal.tsx | 33 ++++++++-----------
 ...ilestoneDeliverablesAnalysisDetailPage.tsx | 20 +++++------
 ...oductMilestoneDeliverablesAnalysisList.tsx | 21 +++++-------
 4 files changed, 33 insertions(+), 43 deletions(-)
 rename src/common/{productMilestoneDeliverablesAnalysisEntityAttributes.ts => deliverablesAnalysisEntityAttributes.ts} (95%)

diff --git a/src/common/productMilestoneDeliverablesAnalysisEntityAttributes.ts b/src/common/deliverablesAnalysisEntityAttributes.ts
similarity index 95%
rename from src/common/productMilestoneDeliverablesAnalysisEntityAttributes.ts
rename to src/common/deliverablesAnalysisEntityAttributes.ts
index dff4c1bf..b26ba200 100644
--- a/src/common/productMilestoneDeliverablesAnalysisEntityAttributes.ts
+++ b/src/common/deliverablesAnalysisEntityAttributes.ts
@@ -19,7 +19,7 @@ interface IExtendedDeliverableAnalyzerOperation extends DeliverableAnalyzerOpera
   runAsScratchAnalysis: any;
 }
 
-export const productMilestoneDeliverablesAnalysisEntityAttributes = {
+export const deliverablesAnalysisEntityAttributes = {
   id: {
     id: 'id',
     title: 'ID',
diff --git a/src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal.tsx b/src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal.tsx
index a8d3f861..4172f7f5 100644
--- a/src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal.tsx
+++ b/src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal.tsx
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 
 import { ProductMilestone } from 'pnc-api-types-ts';
 
-import { productMilestoneDeliverablesAnalysisEntityAttributes } from 'common/productMilestoneDeliverablesAnalysisEntityAttributes';
+import { deliverablesAnalysisEntityAttributes } from 'common/deliverablesAnalysisEntityAttributes';
 
 import { IFieldConfigs, IFieldValues, useForm } from 'hooks/useForm';
 import { useServiceContainer } from 'hooks/useServiceContainer';
@@ -88,50 +88,45 @@ export const ProductMilestoneAnalyzeDeliverablesModal = ({
       >
         <FormGroup
           isRequired
-          label={productMilestoneDeliverablesAnalysisEntityAttributes.deliverablesUrls.title}
-          fieldId={productMilestoneDeliverablesAnalysisEntityAttributes.deliverablesUrls.id}
+          label={deliverablesAnalysisEntityAttributes.deliverablesUrls.title}
+          fieldId={deliverablesAnalysisEntityAttributes.deliverablesUrls.id}
           helperText={
             <FormHelperText
-              isHidden={getFieldState(productMilestoneDeliverablesAnalysisEntityAttributes.deliverablesUrls.id) !== 'error'}
+              isHidden={getFieldState(deliverablesAnalysisEntityAttributes.deliverablesUrls.id) !== 'error'}
               isError
             >
-              {getFieldErrors(productMilestoneDeliverablesAnalysisEntityAttributes.deliverablesUrls.id)}
+              {getFieldErrors(deliverablesAnalysisEntityAttributes.deliverablesUrls.id)}
             </FormHelperText>
           }
         >
           <TextArea
             isRequired
             type="text"
-            id={productMilestoneDeliverablesAnalysisEntityAttributes.deliverablesUrls.id}
-            name={productMilestoneDeliverablesAnalysisEntityAttributes.deliverablesUrls.id}
+            id={deliverablesAnalysisEntityAttributes.deliverablesUrls.id}
+            name={deliverablesAnalysisEntityAttributes.deliverablesUrls.id}
             resizeOrientation="vertical"
             autoResize
             autoComplete="off"
             placeholder={`https://url-path/to/file1.zip
 https://url-path/to/file2.zip
 https://url-path/to/file3.zip`}
-            {...register<string>(
-              productMilestoneDeliverablesAnalysisEntityAttributes.deliverablesUrls.id,
-              fieldConfigs.deliverablesUrls
-            )}
+            {...register<string>(deliverablesAnalysisEntityAttributes.deliverablesUrls.id, fieldConfigs.deliverablesUrls)}
           />
         </FormGroup>
         <FormGroup
-          label={productMilestoneDeliverablesAnalysisEntityAttributes.runAsScratchAnalysis.title}
-          fieldId={productMilestoneDeliverablesAnalysisEntityAttributes.runAsScratchAnalysis.id}
-          labelIcon={
-            <TooltipWrapper tooltip={productMilestoneDeliverablesAnalysisEntityAttributes.runAsScratchAnalysis.tooltip} />
-          }
+          label={deliverablesAnalysisEntityAttributes.runAsScratchAnalysis.title}
+          fieldId={deliverablesAnalysisEntityAttributes.runAsScratchAnalysis.id}
+          labelIcon={<TooltipWrapper tooltip={deliverablesAnalysisEntityAttributes.runAsScratchAnalysis.tooltip} />}
         >
           <FormInput<boolean>
             {...register<boolean>(
-              productMilestoneDeliverablesAnalysisEntityAttributes.runAsScratchAnalysis.id,
+              deliverablesAnalysisEntityAttributes.runAsScratchAnalysis.id,
               fieldConfigs.runAsScratchAnalysis
             )}
             render={({ value, onChange, onBlur }) => (
               <Switch
-                id={productMilestoneDeliverablesAnalysisEntityAttributes.runAsScratchAnalysis.id}
-                name={productMilestoneDeliverablesAnalysisEntityAttributes.runAsScratchAnalysis.id}
+                id={deliverablesAnalysisEntityAttributes.runAsScratchAnalysis.id}
+                name={deliverablesAnalysisEntityAttributes.runAsScratchAnalysis.id}
                 label="Scratch Option Enabled"
                 labelOff="Scratch Option Disabled"
                 isChecked={value}
diff --git a/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx b/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx
index d57956ef..2c28e0ec 100644
--- a/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx
+++ b/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx
@@ -3,7 +3,7 @@ import { useEffect } from 'react';
 import { DeliverableAnalyzerOperation } from 'pnc-api-types-ts';
 
 import { PageTitles } from 'common/constants';
-import { productMilestoneDeliverablesAnalysisEntityAttributes } from 'common/productMilestoneDeliverablesAnalysisEntityAttributes';
+import { deliverablesAnalysisEntityAttributes } from 'common/deliverablesAnalysisEntityAttributes';
 
 import { useParamsRequired } from 'hooks/useParamsRequired';
 import { useServiceContainer } from 'hooks/useServiceContainer';
@@ -54,30 +54,28 @@ export const ProductMilestoneDeliverablesAnalysisDetailPage = () => {
       <PageLayout title="Deliverables Analysis details">
         <ContentBox padding marginBottom isResponsive>
           <Attributes>
-            <AttributesItem title={productMilestoneDeliverablesAnalysisEntityAttributes.id.title}>
-              {deliverabledAnalysis?.id}
-            </AttributesItem>
-            <AttributesItem title={productMilestoneDeliverablesAnalysisEntityAttributes['user.username'].title}>
+            <AttributesItem title={deliverablesAnalysisEntityAttributes.id.title}>{deliverabledAnalysis?.id}</AttributesItem>
+            <AttributesItem title={deliverablesAnalysisEntityAttributes['user.username'].title}>
               {deliverabledAnalysis?.user?.username}
             </AttributesItem>
-            <AttributesItem title={productMilestoneDeliverablesAnalysisEntityAttributes.progressStatus.title}>
+            <AttributesItem title={deliverablesAnalysisEntityAttributes.progressStatus.title}>
               {deliverabledAnalysis?.progressStatus && (
                 <DeliverablesAnalysisProgressStatusLabelMapper progressStatus={deliverabledAnalysis.progressStatus} />
               )}
             </AttributesItem>
-            <AttributesItem title={productMilestoneDeliverablesAnalysisEntityAttributes.result.title}>
+            <AttributesItem title={deliverablesAnalysisEntityAttributes.result.title}>
               {deliverabledAnalysis?.result && <DeliverablesAnalysisResultLabelMapper result={deliverabledAnalysis.result} />}
             </AttributesItem>
-            <AttributesItem title={productMilestoneDeliverablesAnalysisEntityAttributes.submitTime.title}>
+            <AttributesItem title={deliverablesAnalysisEntityAttributes.submitTime.title}>
               {deliverabledAnalysis?.submitTime && <DateTime date={deliverabledAnalysis.submitTime} />}
             </AttributesItem>
-            <AttributesItem title={productMilestoneDeliverablesAnalysisEntityAttributes.startTime.title}>
+            <AttributesItem title={deliverablesAnalysisEntityAttributes.startTime.title}>
               {deliverabledAnalysis?.startTime && <DateTime date={deliverabledAnalysis.startTime} />}
             </AttributesItem>
-            <AttributesItem title={productMilestoneDeliverablesAnalysisEntityAttributes.endTime.title}>
+            <AttributesItem title={deliverablesAnalysisEntityAttributes.endTime.title}>
               {deliverabledAnalysis?.endTime && <DateTime date={deliverabledAnalysis.endTime} />}
             </AttributesItem>
-            <AttributesItem title={productMilestoneDeliverablesAnalysisEntityAttributes.parameters.title}>
+            <AttributesItem title={deliverablesAnalysisEntityAttributes.parameters.title}>
               {deliverabledAnalysis?.parameters &&
                 Object.values(deliverabledAnalysis.parameters).map((parameter, index) => <div key={index}>{parameter}</div>)}
             </AttributesItem>
diff --git a/src/components/ProductMilestoneDeliverablesAnalysisList/ProductMilestoneDeliverablesAnalysisList.tsx b/src/components/ProductMilestoneDeliverablesAnalysisList/ProductMilestoneDeliverablesAnalysisList.tsx
index 9916ccc9..47fcc2e9 100644
--- a/src/components/ProductMilestoneDeliverablesAnalysisList/ProductMilestoneDeliverablesAnalysisList.tsx
+++ b/src/components/ProductMilestoneDeliverablesAnalysisList/ProductMilestoneDeliverablesAnalysisList.tsx
@@ -4,8 +4,8 @@ import { Link } from 'react-router-dom';
 
 import { DeliverableAnalyzerOperationPage } from 'pnc-api-types-ts';
 
+import { deliverablesAnalysisEntityAttributes } from 'common/deliverablesAnalysisEntityAttributes';
 import { getFilterOptions, getSortOptions } from 'common/entityAttributes';
-import { productMilestoneDeliverablesAnalysisEntityAttributes } from 'common/productMilestoneDeliverablesAnalysisEntityAttributes';
 
 import { IServiceContainerState } from 'hooks/useServiceContainer';
 import { ISortOptions, useSorting } from 'hooks/useSorting';
@@ -39,9 +39,9 @@ export const ProductMilestoneDeliverablesAnalysisList = ({
   const sortOptions: ISortOptions = useMemo(
     () =>
       getSortOptions({
-        entityAttributes: productMilestoneDeliverablesAnalysisEntityAttributes,
+        entityAttributes: deliverablesAnalysisEntityAttributes,
         defaultSorting: {
-          attribute: productMilestoneDeliverablesAnalysisEntityAttributes.submitTime.id,
+          attribute: deliverablesAnalysisEntityAttributes.submitTime.id,
           direction: 'desc',
         },
       }),
@@ -55,10 +55,7 @@ export const ProductMilestoneDeliverablesAnalysisList = ({
       <Toolbar>
         <ToolbarItem>
           <Filtering
-            filterOptions={useMemo(
-              () => getFilterOptions({ entityAttributes: productMilestoneDeliverablesAnalysisEntityAttributes }),
-              []
-            )}
+            filterOptions={useMemo(() => getFilterOptions({ entityAttributes: deliverablesAnalysisEntityAttributes }), [])}
             componentId={componentId}
           />
         </ToolbarItem>
@@ -69,14 +66,14 @@ export const ProductMilestoneDeliverablesAnalysisList = ({
           <TableComposable isStriped variant="compact">
             <Thead>
               <Tr>
-                <Th width={20}>{productMilestoneDeliverablesAnalysisEntityAttributes.id.title}</Th>
-                <Th width={20}>{productMilestoneDeliverablesAnalysisEntityAttributes.progressStatus.title}</Th>
-                <Th width={20}>{productMilestoneDeliverablesAnalysisEntityAttributes.result.title}</Th>
+                <Th width={20}>{deliverablesAnalysisEntityAttributes.id.title}</Th>
+                <Th width={20}>{deliverablesAnalysisEntityAttributes.progressStatus.title}</Th>
+                <Th width={20}>{deliverablesAnalysisEntityAttributes.result.title}</Th>
                 <Th width={20} sort={getSortParams(sortOptions.sortAttributes['submitTime'].id)}>
-                  {productMilestoneDeliverablesAnalysisEntityAttributes.submitTime.title}
+                  {deliverablesAnalysisEntityAttributes.submitTime.title}
                 </Th>
                 <Th width={20} sort={getSortParams(sortOptions.sortAttributes['user.username'].id)}>
-                  {productMilestoneDeliverablesAnalysisEntityAttributes['user.username'].title}
+                  {deliverablesAnalysisEntityAttributes['user.username'].title}
                 </Th>
               </Tr>
             </Thead>

From 418d8fa94504b81d253a8310442d6aaf457c58f4 Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 14:52:45 +0100
Subject: [PATCH 03/10] NCL-8237 Generalize Milestone Deliverables Analyses
 list

---
 .../DeliverablesAnalysesList.tsx}             | 20 +++++++++----------
 ...oductMilestoneDeliverablesAnalysisPage.tsx | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename src/components/{ProductMilestoneDeliverablesAnalysisList/ProductMilestoneDeliverablesAnalysisList.tsx => DeliverablesAnalysesList/DeliverablesAnalysesList.tsx} (87%)

diff --git a/src/components/ProductMilestoneDeliverablesAnalysisList/ProductMilestoneDeliverablesAnalysisList.tsx b/src/components/DeliverablesAnalysesList/DeliverablesAnalysesList.tsx
similarity index 87%
rename from src/components/ProductMilestoneDeliverablesAnalysisList/ProductMilestoneDeliverablesAnalysisList.tsx
rename to src/components/DeliverablesAnalysesList/DeliverablesAnalysesList.tsx
index 47fcc2e9..d583c3e6 100644
--- a/src/components/ProductMilestoneDeliverablesAnalysisList/ProductMilestoneDeliverablesAnalysisList.tsx
+++ b/src/components/DeliverablesAnalysesList/DeliverablesAnalysesList.tsx
@@ -21,21 +21,21 @@ import { Toolbar } from 'components/Toolbar/Toolbar';
 import { ToolbarItem } from 'components/Toolbar/ToolbarItem';
 import { Username } from 'components/Username/Username';
 
-interface IProductMilestoneDeliverablesAnalysisListProps {
-  serviceContainerDeliverablesAnalysis: IServiceContainerState<DeliverableAnalyzerOperationPage>;
+interface IDeliverablesAnalysesListProps {
+  serviceContainerDeliverablesAnalyses: IServiceContainerState<DeliverableAnalyzerOperationPage>;
   componentId: string;
 }
 
 /**
- * Component displaying list of Deliverables Analysis.
+ * Component displaying list of Deliverables Analyses.
  *
- * @param serviceContainerDeliverablesAnalysis - Service Container for Deliverables Analysis
+ * @param serviceContainerDeliverablesAnalyses - Service Container for Deliverables Analyses
  * @param componentId - Component ID
  */
-export const ProductMilestoneDeliverablesAnalysisList = ({
-  serviceContainerDeliverablesAnalysis,
+export const DeliverablesAnalysesList = ({
+  serviceContainerDeliverablesAnalyses,
   componentId,
-}: IProductMilestoneDeliverablesAnalysisListProps) => {
+}: IDeliverablesAnalysesListProps) => {
   const sortOptions: ISortOptions = useMemo(
     () =>
       getSortOptions({
@@ -62,7 +62,7 @@ export const ProductMilestoneDeliverablesAnalysisList = ({
       </Toolbar>
 
       <ContentBox borderTop>
-        <ServiceContainerLoading {...serviceContainerDeliverablesAnalysis} title="Deliverables Analysis">
+        <ServiceContainerLoading {...serviceContainerDeliverablesAnalyses} title="Deliverables Analyses">
           <TableComposable isStriped variant="compact">
             <Thead>
               <Tr>
@@ -78,7 +78,7 @@ export const ProductMilestoneDeliverablesAnalysisList = ({
               </Tr>
             </Thead>
             <Tbody>
-              {serviceContainerDeliverablesAnalysis.data?.content?.map((operation, rowIndex) => (
+              {serviceContainerDeliverablesAnalyses.data?.content?.map((operation, rowIndex) => (
                 <Tr key={rowIndex}>
                   <Td>
                     {/* TODO: Make link absolute once Product data are available */}
@@ -99,7 +99,7 @@ export const ProductMilestoneDeliverablesAnalysisList = ({
         </ServiceContainerLoading>
       </ContentBox>
 
-      <Pagination componentId={componentId} count={serviceContainerDeliverablesAnalysis.data?.totalHits} />
+      <Pagination componentId={componentId} count={serviceContainerDeliverablesAnalyses.data?.totalHits} />
     </>
   );
 };
diff --git a/src/components/ProductMilestoneDeliverablesAnalysisPage/ProductMilestoneDeliverablesAnalysisPage.tsx b/src/components/ProductMilestoneDeliverablesAnalysisPage/ProductMilestoneDeliverablesAnalysisPage.tsx
index 7a34fed7..68204952 100644
--- a/src/components/ProductMilestoneDeliverablesAnalysisPage/ProductMilestoneDeliverablesAnalysisPage.tsx
+++ b/src/components/ProductMilestoneDeliverablesAnalysisPage/ProductMilestoneDeliverablesAnalysisPage.tsx
@@ -2,7 +2,7 @@ import { useParamsRequired } from 'hooks/useParamsRequired';
 import { useQueryParamsEffect } from 'hooks/useQueryParamsEffect';
 import { useServiceContainer } from 'hooks/useServiceContainer';
 
-import { ProductMilestoneDeliverablesAnalysisList } from 'components/ProductMilestoneDeliverablesAnalysisList/ProductMilestoneDeliverablesAnalysisList';
+import { DeliverablesAnalysesList } from 'components/DeliverablesAnalysesList/DeliverablesAnalysesList';
 
 import * as productMilestoneApi from 'services/productMilestoneApi';
 
@@ -13,14 +13,14 @@ interface IProductMilestoneDeliverablesAnalysisPage {
 export const ProductMilestoneDeliverablesAnalysisPage = ({ componentId = 'c1' }: IProductMilestoneDeliverablesAnalysisPage) => {
   const { productMilestoneId } = useParamsRequired();
 
-  const serviceContainerDeliverablesAnalysis = useServiceContainer(productMilestoneApi.getDeliverablesAnalysis);
-  const serviceContainerDeliverablesAnalysisRunner = serviceContainerDeliverablesAnalysis.run;
+  const serviceContainerDeliverablesAnalyses = useServiceContainer(productMilestoneApi.getDeliverablesAnalysis);
+  const serviceContainerDeliverablesAnalysesRunner = serviceContainerDeliverablesAnalyses.run;
 
   useQueryParamsEffect(
     ({ requestConfig } = {}) =>
-      serviceContainerDeliverablesAnalysisRunner({ serviceData: { id: productMilestoneId }, requestConfig }),
+      serviceContainerDeliverablesAnalysesRunner({ serviceData: { id: productMilestoneId }, requestConfig }),
     { componentId }
   );
 
-  return <ProductMilestoneDeliverablesAnalysisList {...{ serviceContainerDeliverablesAnalysis, componentId }} />;
+  return <DeliverablesAnalysesList {...{ serviceContainerDeliverablesAnalyses, componentId }} />;
 };

From 25a9878f4cbb9090f375bd5ab809863090f2c772 Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 14:54:21 +0100
Subject: [PATCH 04/10] NCL-8237 Rename Milestone Deliverables Analyses page

---
 src/AppRoutes.tsx                                             | 4 ++--
 .../ProductMilestoneDeliverablesAnalysesPage.tsx}             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/components/{ProductMilestoneDeliverablesAnalysisPage/ProductMilestoneDeliverablesAnalysisPage.tsx => ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage.tsx} (94%)

diff --git a/src/AppRoutes.tsx b/src/AppRoutes.tsx
index 0dde0fd5..d809edeb 100644
--- a/src/AppRoutes.tsx
+++ b/src/AppRoutes.tsx
@@ -36,8 +36,8 @@ import { ProductMilestoneCloseResultDetailPage } from 'components/ProductMilesto
 import { ProductMilestoneCloseResultsPage } from 'components/ProductMilestoneCloseResultsPage/ProductMilestoneCloseResultsPage';
 import { ProductMilestoneComparisonPage } from 'components/ProductMilestoneComparisonPage/ProductMilestoneComparisonPage';
 import { ProductMilestoneCreateEditPage } from 'components/ProductMilestoneCreateEditPage/ProductMilestoneCreateEditPage';
+import { ProductMilestoneDeliverablesAnalysesPage } from 'components/ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage';
 import { ProductMilestoneDeliverablesAnalysisDetailPage } from 'components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage';
-import { ProductMilestoneDeliverablesAnalysisPage } from 'components/ProductMilestoneDeliverablesAnalysisPage/ProductMilestoneDeliverablesAnalysisPage';
 import { ProductMilestoneDeliveredArtifactsPage } from 'components/ProductMilestoneDeliveredArtifactsPage/ProductMilestoneDeliveredArtifactsPage';
 import { ProductMilestoneDetailPage } from 'components/ProductMilestoneDetailPage/ProductMilestoneDetailPage';
 import { ProductMilestoneInterconnectionGraphPage } from 'components/ProductMilestoneInterconnectionGraphPage/ProductMilestoneInterconnectionGraphPage';
@@ -160,7 +160,7 @@ export const AppRoutes = (
                 <Route path="details" element={<ProductMilestoneDetailPage />} />
                 <Route path="builds-performed" element={<ProductMilestoneBuildsPerformedPage />} />
                 <Route path="close-results" element={<ProductMilestoneCloseResultsPage />} />
-                <Route path="deliverables-analysis" element={<ProductMilestoneDeliverablesAnalysisPage />} />
+                <Route path="deliverables-analysis" element={<ProductMilestoneDeliverablesAnalysesPage />} />
                 <Route path="delivered-artifacts" element={<ProductMilestoneDeliveredArtifactsPage />} />
                 <Route path="interconnection-graph" element={<ProductMilestoneInterconnectionGraphPage />} />
                 <Route index element={<Navigate to="details" replace />} />
diff --git a/src/components/ProductMilestoneDeliverablesAnalysisPage/ProductMilestoneDeliverablesAnalysisPage.tsx b/src/components/ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage.tsx
similarity index 94%
rename from src/components/ProductMilestoneDeliverablesAnalysisPage/ProductMilestoneDeliverablesAnalysisPage.tsx
rename to src/components/ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage.tsx
index 68204952..fd49979d 100644
--- a/src/components/ProductMilestoneDeliverablesAnalysisPage/ProductMilestoneDeliverablesAnalysisPage.tsx
+++ b/src/components/ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage.tsx
@@ -10,7 +10,7 @@ interface IProductMilestoneDeliverablesAnalysisPage {
   componentId?: string;
 }
 
-export const ProductMilestoneDeliverablesAnalysisPage = ({ componentId = 'c1' }: IProductMilestoneDeliverablesAnalysisPage) => {
+export const ProductMilestoneDeliverablesAnalysesPage = ({ componentId = 'c1' }: IProductMilestoneDeliverablesAnalysisPage) => {
   const { productMilestoneId } = useParamsRequired();
 
   const serviceContainerDeliverablesAnalyses = useServiceContainer(productMilestoneApi.getDeliverablesAnalysis);

From 99b7595c6684cf7edc4b40ad2b371a88813f42e2 Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 14:57:26 +0100
Subject: [PATCH 05/10] NCL-8237 Rename getDeliverablesAnalysis service
 function to getDeliverablesAnalyses

---
 .../ProductMilestoneDeliverablesAnalysesPage.tsx              | 2 +-
 src/services/productMilestoneApi.ts                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage.tsx b/src/components/ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage.tsx
index fd49979d..d7f1348e 100644
--- a/src/components/ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage.tsx
+++ b/src/components/ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage.tsx
@@ -13,7 +13,7 @@ interface IProductMilestoneDeliverablesAnalysisPage {
 export const ProductMilestoneDeliverablesAnalysesPage = ({ componentId = 'c1' }: IProductMilestoneDeliverablesAnalysisPage) => {
   const { productMilestoneId } = useParamsRequired();
 
-  const serviceContainerDeliverablesAnalyses = useServiceContainer(productMilestoneApi.getDeliverablesAnalysis);
+  const serviceContainerDeliverablesAnalyses = useServiceContainer(productMilestoneApi.getDeliverablesAnalyses);
   const serviceContainerDeliverablesAnalysesRunner = serviceContainerDeliverablesAnalyses.run;
 
   useQueryParamsEffect(
diff --git a/src/services/productMilestoneApi.ts b/src/services/productMilestoneApi.ts
index a9bdc675..e216066e 100644
--- a/src/services/productMilestoneApi.ts
+++ b/src/services/productMilestoneApi.ts
@@ -69,13 +69,13 @@ export const getDeliveredArtifacts = ({ id }: IProductMilestoneApiData, requestC
 };
 
 /**
- * Gets Product Milestone Deliverables Analysis.
+ * Gets Product Milestone Deliverables Analyses.
  *
  * @param serviceData - object containing:
  *  - id - Product Milestone ID
  * @param requestConfig - Axios based request config
  */
-export const getDeliverablesAnalysis = ({ id }: IProductMilestoneApiData, requestConfig: AxiosRequestConfig = {}) => {
+export const getDeliverablesAnalyses = ({ id }: IProductMilestoneApiData, requestConfig: AxiosRequestConfig = {}) => {
   return pncClient
     .getHttpClient()
     .get<DeliverableAnalyzerOperationPage>(`/product-milestones/${id}/deliverables-analyzer-operations`, requestConfig);

From 138702f691f2ec16573f31681b0d5a7f0b4872f8 Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 15:06:12 +0100
Subject: [PATCH 06/10] NCL-8237 Refactor Milestone Deliverables Analysis
 detail page

---
 ...ilestoneDeliverablesAnalysisDetailPage.tsx | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx b/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx
index 2c28e0ec..cf9cacc3 100644
--- a/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx
+++ b/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx
@@ -25,59 +25,59 @@ import { generatePageTitle } from 'utils/titleHelper';
 export const ProductMilestoneDeliverablesAnalysisDetailPage = () => {
   const { deliverablesAnalysisId } = useParamsRequired();
 
-  const serviceContainerProdutMilestoneDeliverablesAnalysis = useServiceContainer(operationsApi.getDeliverablesAnalysis);
-  const serviceContainerProdutMilestoneDeliverablesAnalysisRunner = serviceContainerProdutMilestoneDeliverablesAnalysis.run;
+  const serviceContainerProductMilestoneDeliverablesAnalysis = useServiceContainer(operationsApi.getDeliverablesAnalysis);
+  const serviceContainerProductMilestoneDeliverablesAnalysisRunner = serviceContainerProductMilestoneDeliverablesAnalysis.run;
 
-  const deliverabledAnalysis: DeliverableAnalyzerOperation | undefined =
-    serviceContainerProdutMilestoneDeliverablesAnalysis.data || undefined;
+  const deliverablesAnalysis: DeliverableAnalyzerOperation | undefined =
+    serviceContainerProductMilestoneDeliverablesAnalysis.data || undefined;
 
   useEffect(() => {
-    serviceContainerProdutMilestoneDeliverablesAnalysisRunner({
+    serviceContainerProductMilestoneDeliverablesAnalysisRunner({
       serviceData: { id: deliverablesAnalysisId },
     });
-  }, [serviceContainerProdutMilestoneDeliverablesAnalysisRunner, deliverablesAnalysisId]);
+  }, [serviceContainerProductMilestoneDeliverablesAnalysisRunner, deliverablesAnalysisId]);
 
   useTitle(
     generatePageTitle({
-      serviceContainer: serviceContainerProdutMilestoneDeliverablesAnalysis,
+      serviceContainer: serviceContainerProductMilestoneDeliverablesAnalysis,
       firstLevelEntity: 'Product',
       nestedEntity: 'Deliverables Analysis',
-      entityName: `Deliverables Analysis ${deliverabledAnalysis?.id} ${PageTitles.delimiterSymbol} ${deliverabledAnalysis?.productMilestone?.version} ${PageTitles.delimiterSymbol} <unknown>`,
+      entityName: `Deliverables Analysis ${deliverablesAnalysis?.id} ${PageTitles.delimiterSymbol} ${deliverablesAnalysis?.productMilestone?.version} ${PageTitles.delimiterSymbol} <unknown>`,
     })
   );
 
   return (
     <ServiceContainerLoading
-      {...serviceContainerProdutMilestoneDeliverablesAnalysis}
+      {...serviceContainerProductMilestoneDeliverablesAnalysis}
       title="Product Milestone Deliverables Analysis details"
     >
       <PageLayout title="Deliverables Analysis details">
         <ContentBox padding marginBottom isResponsive>
           <Attributes>
-            <AttributesItem title={deliverablesAnalysisEntityAttributes.id.title}>{deliverabledAnalysis?.id}</AttributesItem>
+            <AttributesItem title={deliverablesAnalysisEntityAttributes.id.title}>{deliverablesAnalysis?.id}</AttributesItem>
             <AttributesItem title={deliverablesAnalysisEntityAttributes['user.username'].title}>
-              {deliverabledAnalysis?.user?.username}
+              {deliverablesAnalysis?.user?.username}
             </AttributesItem>
             <AttributesItem title={deliverablesAnalysisEntityAttributes.progressStatus.title}>
-              {deliverabledAnalysis?.progressStatus && (
-                <DeliverablesAnalysisProgressStatusLabelMapper progressStatus={deliverabledAnalysis.progressStatus} />
+              {deliverablesAnalysis?.progressStatus && (
+                <DeliverablesAnalysisProgressStatusLabelMapper progressStatus={deliverablesAnalysis.progressStatus} />
               )}
             </AttributesItem>
             <AttributesItem title={deliverablesAnalysisEntityAttributes.result.title}>
-              {deliverabledAnalysis?.result && <DeliverablesAnalysisResultLabelMapper result={deliverabledAnalysis.result} />}
+              {deliverablesAnalysis?.result && <DeliverablesAnalysisResultLabelMapper result={deliverablesAnalysis.result} />}
             </AttributesItem>
             <AttributesItem title={deliverablesAnalysisEntityAttributes.submitTime.title}>
-              {deliverabledAnalysis?.submitTime && <DateTime date={deliverabledAnalysis.submitTime} />}
+              {deliverablesAnalysis?.submitTime && <DateTime date={deliverablesAnalysis.submitTime} />}
             </AttributesItem>
             <AttributesItem title={deliverablesAnalysisEntityAttributes.startTime.title}>
-              {deliverabledAnalysis?.startTime && <DateTime date={deliverabledAnalysis.startTime} />}
+              {deliverablesAnalysis?.startTime && <DateTime date={deliverablesAnalysis.startTime} />}
             </AttributesItem>
             <AttributesItem title={deliverablesAnalysisEntityAttributes.endTime.title}>
-              {deliverabledAnalysis?.endTime && <DateTime date={deliverabledAnalysis.endTime} />}
+              {deliverablesAnalysis?.endTime && <DateTime date={deliverablesAnalysis.endTime} />}
             </AttributesItem>
             <AttributesItem title={deliverablesAnalysisEntityAttributes.parameters.title}>
-              {deliverabledAnalysis?.parameters &&
-                Object.values(deliverabledAnalysis.parameters).map((parameter, index) => <div key={index}>{parameter}</div>)}
+              {deliverablesAnalysis?.parameters &&
+                Object.values(deliverablesAnalysis.parameters).map((parameter, index) => <div key={index}>{parameter}</div>)}
             </AttributesItem>
           </Attributes>
         </ContentBox>

From 412d11756f2a47ab0d0c588b5148ee774b54938a Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 15:25:28 +0100
Subject: [PATCH 07/10] NCL-8237 Implement new deliverables analysis service
 functions

---
 src/services/operationsApi.ts | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/services/operationsApi.ts b/src/services/operationsApi.ts
index 5294a526..152379ba 100644
--- a/src/services/operationsApi.ts
+++ b/src/services/operationsApi.ts
@@ -1,12 +1,20 @@
 import { AxiosRequestConfig } from 'axios';
 
-import { DeliverableAnalyzerOperation } from 'pnc-api-types-ts';
+import { DeliverableAnalyzerOperation, DeliverableAnalyzerOperationPage } from 'pnc-api-types-ts';
 
 import { pncClient } from './pncClient';
 
 interface IDeliverablesAnalysisApiData {
   id: string;
 }
+/**
+ * Gets all Deliverables Analyses.
+ *
+ * @param requestConfig - Axios based request config
+ */
+export const getDeliverablesAnalyses = (requestConfig: AxiosRequestConfig = {}) => {
+  return pncClient.getHttpClient().get<DeliverableAnalyzerOperationPage>('/operations/deliverable-analyzer', requestConfig);
+};
 
 /**
  * Gets a Deliverables Analysis.
@@ -18,3 +26,17 @@ interface IDeliverablesAnalysisApiData {
 export const getDeliverablesAnalysis = ({ id }: IDeliverablesAnalysisApiData, requestConfig: AxiosRequestConfig = {}) => {
   return pncClient.getHttpClient().get<DeliverableAnalyzerOperation>(`/operations/deliverable-analyzer/${id}`, requestConfig);
 };
+
+/**
+ * Analyzes Deliverables (Milestone-less variant).
+ *
+ * @param serviceData - object containing:
+ *  - data - list of Deliverables Analysis URLs
+ * @param requestConfig - Axios based request config
+ */
+export const analyzeDeliverables = (
+  { data }: { data: { deliverablesUrls: string[] } },
+  requestConfig: AxiosRequestConfig = {}
+) => {
+  return pncClient.getHttpClient().post<any>('/operations/deliverable-analyzer/start', data, requestConfig);
+};

From f055e2f148916c4652e1e021c211bd33b1710ee2 Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 16:01:57 +0100
Subject: [PATCH 08/10] NCL-8237 Generalize Milestone Deliverables Analysis
 modal

---
 .../AnalyzeDeliverablesModal.tsx}             | 55 +++++++++++--------
 .../AnalyzeDeliverablesModalButton.tsx}       |  7 +--
 .../ProductMilestonePages.tsx                 |  8 +--
 .../ProductVersionMilestonesList.tsx          |  8 +--
 4 files changed, 42 insertions(+), 36 deletions(-)
 rename src/components/{ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal.tsx => AnalyzeDeliverablesModal/AnalyzeDeliverablesModal.tsx} (74%)
 rename src/components/{ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModalButton.tsx => AnalyzeDeliverablesModal/AnalyzeDeliverablesModalButton.tsx} (71%)

diff --git a/src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal.tsx b/src/components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModal.tsx
similarity index 74%
rename from src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal.tsx
rename to src/components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModal.tsx
index 4172f7f5..d8edc442 100644
--- a/src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal.tsx
+++ b/src/components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModal.tsx
@@ -12,6 +12,7 @@ import { ActionModal } from 'components/ActionModal/ActionModal';
 import { FormInput } from 'components/FormInput/FormInput';
 import { TooltipWrapper } from 'components/TooltipWrapper/TooltipWrapper';
 
+import * as operationsApi from 'services/operationsApi';
 import * as productMilestoneApi from 'services/productMilestoneApi';
 
 import { validateUrls } from 'utils/formValidationHelpers';
@@ -26,56 +27,61 @@ const fieldConfigs = {
   },
 } satisfies IFieldConfigs;
 
-interface IProductMilestoneAnalyzeDeliverablesModalProps {
+interface IAnalyzeDeliverablesModalProps {
   isModalOpen: boolean;
   toggleModal: () => void;
-  productMilestone: ProductMilestone;
+  productMilestone?: ProductMilestone;
 }
 
-export const ProductMilestoneAnalyzeDeliverablesModal = ({
-  isModalOpen,
-  toggleModal,
-  productMilestone,
-}: IProductMilestoneAnalyzeDeliverablesModalProps) => {
-  const serviceContainerProductMilestoneAnalyzeDeliverables = useServiceContainer(productMilestoneApi.analyzeDeliverables, 0);
+export const AnalyzeDeliverablesModal = ({ isModalOpen, toggleModal, productMilestone }: IAnalyzeDeliverablesModalProps) => {
+  const serviceContainerAnalyzeDeliverables = useServiceContainer(
+    productMilestone ? productMilestoneApi.analyzeDeliverables : operationsApi.analyzeDeliverables,
+    0
+  );
 
   const { register, getFieldState, getFieldErrors, handleSubmit, isSubmitDisabled, hasFormChanged } = useForm();
 
   const confirmModal = (data: IFieldValues) => {
-    return serviceContainerProductMilestoneAnalyzeDeliverables
-      .run({
-        serviceData: {
+    const serviceData = productMilestone
+      ? {
           id: productMilestone.id,
           data: {
             deliverablesUrls: data.deliverablesUrls?.split(/\s+/),
             runAsScratchAnalysis: data.runAsScratchAnalysis,
           },
-        },
-      })
-      .catch((error) => {
-        console.error('Failed to analyze Deliverables.');
-        throw error;
-      });
+        }
+      : {
+          data: {
+            deliverablesUrls: data.deliverablesUrls?.split(/\s+/),
+          },
+        };
+
+    return serviceContainerAnalyzeDeliverables.run({ serviceData: serviceData as any }).catch((error) => {
+      console.error('Failed to analyze Deliverables.');
+      throw error;
+    });
   };
 
   return (
     <ActionModal
-      modalTitle={`Analyze Deliverables: ${productMilestone.version}?`}
+      modalTitle={'Analyze Deliverables' + (productMilestone ? `: ${productMilestone.version}?` : '?')}
       actionTitle="Analyze Deliverables"
       isOpen={isModalOpen}
       isSubmitDisabled={isSubmitDisabled}
       wereSubmitDataChanged={hasFormChanged}
       onToggle={toggleModal}
       onSubmit={handleSubmit(confirmModal)}
-      serviceContainer={serviceContainerProductMilestoneAnalyzeDeliverables}
+      serviceContainer={serviceContainerAnalyzeDeliverables}
       modalVariant="large"
       onSuccessActions={[
         <Button
           variant="secondary"
           // TODO: Make link absolute once Product data are available
-          component={(props: any) => (
-            <Link {...props} to={`deliverables-analysis/${serviceContainerProductMilestoneAnalyzeDeliverables.data?.id}`} />
-          )}
+          component={
+            productMilestone
+              ? (props: any) => <Link {...props} to={`deliverables-analysis/${serviceContainerAnalyzeDeliverables.data?.id}`} />
+              : undefined
+          }
         >
           Open Deliverables Analysis details
         </Button>,
@@ -129,12 +135,15 @@ https://url-path/to/file3.zip`}
                 name={deliverablesAnalysisEntityAttributes.runAsScratchAnalysis.id}
                 label="Scratch Option Enabled"
                 labelOff="Scratch Option Disabled"
-                isChecked={value}
+                isChecked={productMilestone ? value : true}
                 onChange={onChange}
                 onBlur={onBlur}
+                isDisabled={!productMilestone}
               />
             )}
           />
+
+          <FormHelperText isHidden={!!productMilestone}>Milestone-less analyses run as scratch.</FormHelperText>
         </FormGroup>
       </Form>
     </ActionModal>
diff --git a/src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModalButton.tsx b/src/components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModalButton.tsx
similarity index 71%
rename from src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModalButton.tsx
rename to src/components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModalButton.tsx
index 4fe686bc..c57a1dc6 100644
--- a/src/components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModalButton.tsx
+++ b/src/components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModalButton.tsx
@@ -3,15 +3,12 @@ import { css } from '@patternfly/react-styles';
 
 import { ProtectedComponent } from 'components/ProtectedContent/ProtectedComponent';
 
-interface IProductMilestoneAnalyzeDeliverablesModalButtonProps {
+interface IAnalyzeDeliverablesModalButtonProps {
   toggleModal: () => void;
   variant: 'detail' | 'list';
 }
 
-export const ProductMilestoneAnalyzeDeliverablesModalButton = ({
-  toggleModal,
-  variant,
-}: IProductMilestoneAnalyzeDeliverablesModalButtonProps) => (
+export const AnalyzeDeliverablesModalButton = ({ toggleModal, variant }: IAnalyzeDeliverablesModalButtonProps) => (
   <ProtectedComponent>
     <Button
       variant={variant === 'list' ? 'plain' : 'tertiary'}
diff --git a/src/components/ProductMilestonePages/ProductMilestonePages.tsx b/src/components/ProductMilestonePages/ProductMilestonePages.tsx
index 0cefde54..86fa9a9c 100644
--- a/src/components/ProductMilestonePages/ProductMilestonePages.tsx
+++ b/src/components/ProductMilestonePages/ProductMilestonePages.tsx
@@ -10,12 +10,12 @@ import { IServiceContainerState, useServiceContainer } from 'hooks/useServiceCon
 import { useTitle } from 'hooks/useTitle';
 
 import { ActionButton } from 'components/ActionButton/ActionButton';
+import { AnalyzeDeliverablesModal } from 'components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModal';
+import { AnalyzeDeliverablesModalButton } from 'components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModalButton';
 import { PageLayout } from 'components/PageLayout/PageLayout';
 import { PageTabs } from 'components/PageTabs/PageTabs';
 import { PageTabsItem } from 'components/PageTabs/PageTabsItem';
 import { PageTabsLabel } from 'components/PageTabs/PageTabsLabel';
-import { ProductMilestoneAnalyzeDeliverablesModal } from 'components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal';
-import { ProductMilestoneAnalyzeDeliverablesModalButton } from 'components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModalButton';
 import { ProductMilestoneCloseModal } from 'components/ProductMilestoneCloseModal/ProductMilestoneCloseModal';
 import { ProductMilestoneCloseModalButton } from 'components/ProductMilestoneCloseModal/ProductMilestoneCloseModalButton';
 import { ProductMilestoneMarkModal } from 'components/ProductMilestoneMarkModal/ProductMilestoneMarkModal';
@@ -127,7 +127,7 @@ export const ProductMilestonePages = ({ children }: PropsWithChildren<IProductMi
       variant="detail"
     />,
     <ProductMilestoneCloseModalButton toggleModal={toggleCloseModal} variant="detail" />,
-    <ProductMilestoneAnalyzeDeliverablesModalButton toggleModal={toggleAnalyzeDeliverablesModal} variant="detail" />,
+    <AnalyzeDeliverablesModalButton toggleModal={toggleAnalyzeDeliverablesModal} variant="detail" />,
     <ProtectedComponent>
       <ActionButton link="edit">Edit Milestone</ActionButton>
     </ProtectedComponent>,
@@ -155,7 +155,7 @@ export const ProductMilestonePages = ({ children }: PropsWithChildren<IProductMi
         />
       )}
       {isAnalyzeDeliverablesModalOpen && (
-        <ProductMilestoneAnalyzeDeliverablesModal
+        <AnalyzeDeliverablesModal
           isModalOpen={isAnalyzeDeliverablesModalOpen}
           toggleModal={toggleAnalyzeDeliverablesModal}
           productMilestone={serviceContainerProductMilestone.data!}
diff --git a/src/components/ProductVersionMilestonesList/ProductVersionMilestonesList.tsx b/src/components/ProductVersionMilestonesList/ProductVersionMilestonesList.tsx
index af8ec83f..28547b5b 100644
--- a/src/components/ProductVersionMilestonesList/ProductVersionMilestonesList.tsx
+++ b/src/components/ProductVersionMilestonesList/ProductVersionMilestonesList.tsx
@@ -9,12 +9,12 @@ import { productMilestoneEntityAttributes } from 'common/productMilestoneEntityA
 
 import { IServiceContainerState } from 'hooks/useServiceContainer';
 
+import { AnalyzeDeliverablesModal } from 'components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModal';
+import { AnalyzeDeliverablesModalButton } from 'components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModalButton';
 import { ContentBox } from 'components/ContentBox/ContentBox';
 import { DateTime } from 'components/DateTime/DateTime';
 import { Filtering } from 'components/Filtering/Filtering';
 import { Pagination } from 'components/Pagination/Pagination';
-import { ProductMilestoneAnalyzeDeliverablesModal } from 'components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModal';
-import { ProductMilestoneAnalyzeDeliverablesModalButton } from 'components/ProductMilestoneAnalyzeDeliverablesModal/ProductMilestoneAnalyzeDeliverablesModalButton';
 import { ProductMilestoneCloseModal } from 'components/ProductMilestoneCloseModal/ProductMilestoneCloseModal';
 import { ProductMilestoneCloseModalButton } from 'components/ProductMilestoneCloseModal/ProductMilestoneCloseModalButton';
 import { ProductMilestoneMarkModal } from 'components/ProductMilestoneMarkModal/ProductMilestoneMarkModal';
@@ -124,7 +124,7 @@ export const ProductVersionMilestonesList = ({
                         {
                           style: actionItemStyle,
                           title: (
-                            <ProductMilestoneAnalyzeDeliverablesModalButton
+                            <AnalyzeDeliverablesModalButton
                               toggleModal={toggleCurrentModalProductMilestoneId(productMilestone.id, 'analyze-deliverables')}
                               variant="list"
                             />
@@ -151,7 +151,7 @@ export const ProductVersionMilestonesList = ({
                       />
                     )}
                     {currentModalProductMilestoneId === productMilestone.id && currentModalType === 'analyze-deliverables' && (
-                      <ProductMilestoneAnalyzeDeliverablesModal
+                      <AnalyzeDeliverablesModal
                         isModalOpen={
                           currentModalProductMilestoneId === productMilestone.id && currentModalType === 'analyze-deliverables'
                         }

From 50c09a981c0221d954f7e892651c5985bf5f3bc9 Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 16:22:57 +0100
Subject: [PATCH 09/10] NCL-8237 Implement global Deliverables Analyses page

---
 src/AppLayout.tsx                             |  4 ++
 src/AppRoutes.tsx                             |  4 ++
 src/common/constants.ts                       |  1 +
 .../DeliverablesAnalysesPage.tsx              | 46 +++++++++++++++++++
 4 files changed, 55 insertions(+)
 create mode 100644 src/components/DeliverablesAnalysesPage/DeliverablesAnalysesPage.tsx

diff --git a/src/AppLayout.tsx b/src/AppLayout.tsx
index 745e32b4..7950fad6 100644
--- a/src/AppLayout.tsx
+++ b/src/AppLayout.tsx
@@ -237,6 +237,10 @@ export const AppLayout = () => {
             <Link to="/scm-repositories">SCM Repositories</Link>
           </NavItem>
 
+          <NavItem isActive={pathname.includes('/deliverables-analysis')}>
+            <Link to="/deliverables-analysis">Deliverables Analyses</Link>
+          </NavItem>
+
           <NavExpandable title="Insights" groupId="insights" isActive={pathname.includes('/product-milestone-comparison')}>
             <NavItem
               groupId="insights"
diff --git a/src/AppRoutes.tsx b/src/AppRoutes.tsx
index d809edeb..800e32bc 100644
--- a/src/AppRoutes.tsx
+++ b/src/AppRoutes.tsx
@@ -22,6 +22,7 @@ import { BuildMetricsPage } from 'components/BuildMetricsPage/BuildMetricsPage';
 import { BuildPages } from 'components/BuildPages/BuildPages';
 import { BuildsPage } from 'components/BuildsPage/BuildsPage';
 import { DashboardPage } from 'components/DashboardPage/DashboardPage';
+import { DeliverablesAnalysesPage } from 'components/DeliverablesAnalysesPage/DeliverablesAnalysesPage';
 import { DemoPage } from 'components/DemoPage/DemoPage';
 import { ErrorPage } from 'components/ErrorPage/ErrorPage';
 import { GroupBuildDetailPage } from 'components/GroupBuildDetailPage/GroupBuildDetailPage';
@@ -242,6 +243,9 @@ export const AppRoutes = (
       />
       <Route path=":scmRepositoryId" element={<ScmRepositoryDetailPage />} />
     </Route>
+    <Route path="deliverables-analysis">
+      <Route index element={<DeliverablesAnalysesPage />} />
+    </Route>
 
     {/* special pages */}
     <Route path="system">
diff --git a/src/common/constants.ts b/src/common/constants.ts
index 0570ec09..170bded4 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -26,6 +26,7 @@ export const PageTitles = {
   productMilestoneComparison: 'Product Milestone Comparison',
   scmRepositoryCreate: 'Create SCM Repository',
   scmRepositoryEdit: 'Update SCM Repository',
+  deliverablesAnalyses: 'Deliverables Analyses',
   administration: 'Administration',
   pageNotFound: 'Page Not Found',
   delimiterSymbol: '·',
diff --git a/src/components/DeliverablesAnalysesPage/DeliverablesAnalysesPage.tsx b/src/components/DeliverablesAnalysesPage/DeliverablesAnalysesPage.tsx
new file mode 100644
index 00000000..64ce231d
--- /dev/null
+++ b/src/components/DeliverablesAnalysesPage/DeliverablesAnalysesPage.tsx
@@ -0,0 +1,46 @@
+import { useState } from 'react';
+
+import { PageTitles } from 'common/constants';
+
+import { useQueryParamsEffect } from 'hooks/useQueryParamsEffect';
+import { useServiceContainer } from 'hooks/useServiceContainer';
+import { useTitle } from 'hooks/useTitle';
+
+import { AnalyzeDeliverablesModal } from 'components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModal';
+import { AnalyzeDeliverablesModalButton } from 'components/AnalyzeDeliverablesModal/AnalyzeDeliverablesModalButton';
+import { DeliverablesAnalysesList } from 'components/DeliverablesAnalysesList/DeliverablesAnalysesList';
+import { PageLayout } from 'components/PageLayout/PageLayout';
+
+import * as operationsApi from 'services/operationsApi';
+
+interface IDeliverablesAnalysesPageProps {
+  componentId?: string;
+}
+
+export const DeliverablesAnalysesPage = ({ componentId = 'd1' }: IDeliverablesAnalysesPageProps) => {
+  const serviceContainerDeliverablesAnalyses = useServiceContainer(operationsApi.getDeliverablesAnalyses);
+
+  const [isAnalyzeDeliverablesModalOpen, setIsAnalyzeDeliverablesModalOpen] = useState<boolean>(false);
+
+  const toggleAnalyzeDeliverablesModal = () =>
+    setIsAnalyzeDeliverablesModalOpen((isAnalyzeDeliverablesModalOpen) => !isAnalyzeDeliverablesModalOpen);
+
+  useQueryParamsEffect(serviceContainerDeliverablesAnalyses.run, { componentId });
+
+  useTitle(PageTitles.deliverablesAnalyses);
+
+  return (
+    <>
+      <PageLayout
+        title={PageTitles.deliverablesAnalyses}
+        description={<>This page contains list of all Deliverables Analysis operations.</>}
+        actions={<AnalyzeDeliverablesModalButton toggleModal={toggleAnalyzeDeliverablesModal} variant="detail" />}
+      >
+        <DeliverablesAnalysesList {...{ serviceContainerDeliverablesAnalyses, componentId }} />
+      </PageLayout>
+      {isAnalyzeDeliverablesModalOpen && (
+        <AnalyzeDeliverablesModal isModalOpen={isAnalyzeDeliverablesModalOpen} toggleModal={toggleAnalyzeDeliverablesModal} />
+      )}
+    </>
+  );
+};

From 29902b48d020aafb260c09028720a00797d39c9a Mon Sep 17 00:00:00 2001
From: Patrik Korytar <patrik.korytar@gmail.com>
Date: Mon, 13 Nov 2023 16:34:38 +0100
Subject: [PATCH 10/10] NCL-8237 Generalize Milestone Deliverables Analysis
 detail page

---
 src/AppRoutes.tsx                             |  9 +++----
 .../DeliverablesAnalysisDetailPage.tsx}       | 26 +++++++++----------
 2 files changed, 16 insertions(+), 19 deletions(-)
 rename src/components/{ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx => DeliverablesAnalysisDetailPage/DeliverablesAnalysisDetailPage.tsx} (78%)

diff --git a/src/AppRoutes.tsx b/src/AppRoutes.tsx
index 800e32bc..02c5b455 100644
--- a/src/AppRoutes.tsx
+++ b/src/AppRoutes.tsx
@@ -23,6 +23,7 @@ import { BuildPages } from 'components/BuildPages/BuildPages';
 import { BuildsPage } from 'components/BuildsPage/BuildsPage';
 import { DashboardPage } from 'components/DashboardPage/DashboardPage';
 import { DeliverablesAnalysesPage } from 'components/DeliverablesAnalysesPage/DeliverablesAnalysesPage';
+import { DeliverablesAnalysisDetailPage } from 'components/DeliverablesAnalysisDetailPage/DeliverablesAnalysisDetailPage';
 import { DemoPage } from 'components/DemoPage/DemoPage';
 import { ErrorPage } from 'components/ErrorPage/ErrorPage';
 import { GroupBuildDetailPage } from 'components/GroupBuildDetailPage/GroupBuildDetailPage';
@@ -38,7 +39,6 @@ import { ProductMilestoneCloseResultsPage } from 'components/ProductMilestoneClo
 import { ProductMilestoneComparisonPage } from 'components/ProductMilestoneComparisonPage/ProductMilestoneComparisonPage';
 import { ProductMilestoneCreateEditPage } from 'components/ProductMilestoneCreateEditPage/ProductMilestoneCreateEditPage';
 import { ProductMilestoneDeliverablesAnalysesPage } from 'components/ProductMilestoneDeliverablesAnalysesPage/ProductMilestoneDeliverablesAnalysesPage';
-import { ProductMilestoneDeliverablesAnalysisDetailPage } from 'components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage';
 import { ProductMilestoneDeliveredArtifactsPage } from 'components/ProductMilestoneDeliveredArtifactsPage/ProductMilestoneDeliveredArtifactsPage';
 import { ProductMilestoneDetailPage } from 'components/ProductMilestoneDetailPage/ProductMilestoneDetailPage';
 import { ProductMilestoneInterconnectionGraphPage } from 'components/ProductMilestoneInterconnectionGraphPage/ProductMilestoneInterconnectionGraphPage';
@@ -151,11 +151,7 @@ export const AppRoutes = (
                   }
                 />
                 <Route path="close-results/:closeResultId" index element={<ProductMilestoneCloseResultDetailPage />} />
-                <Route
-                  path="deliverables-analysis/:deliverablesAnalysisId"
-                  index
-                  element={<ProductMilestoneDeliverablesAnalysisDetailPage />}
-                />
+                <Route path="deliverables-analysis/:deliverablesAnalysisId" index element={<DeliverablesAnalysisDetailPage />} />
               </Route>
               <Route path=":productMilestoneId" element={<ProductMilestonePages />}>
                 <Route path="details" element={<ProductMilestoneDetailPage />} />
@@ -245,6 +241,7 @@ export const AppRoutes = (
     </Route>
     <Route path="deliverables-analysis">
       <Route index element={<DeliverablesAnalysesPage />} />
+      <Route path=":deliverablesAnalysisId" element={<DeliverablesAnalysisDetailPage />} />
     </Route>
 
     {/* special pages */}
diff --git a/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx b/src/components/DeliverablesAnalysisDetailPage/DeliverablesAnalysisDetailPage.tsx
similarity index 78%
rename from src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx
rename to src/components/DeliverablesAnalysisDetailPage/DeliverablesAnalysisDetailPage.tsx
index cf9cacc3..53cb8de9 100644
--- a/src/components/ProductMilestoneDeliverablesAnalysisDetailPage/ProductMilestoneDeliverablesAnalysisDetailPage.tsx
+++ b/src/components/DeliverablesAnalysisDetailPage/DeliverablesAnalysisDetailPage.tsx
@@ -22,35 +22,35 @@ import * as operationsApi from 'services/operationsApi';
 
 import { generatePageTitle } from 'utils/titleHelper';
 
-export const ProductMilestoneDeliverablesAnalysisDetailPage = () => {
+export const DeliverablesAnalysisDetailPage = () => {
   const { deliverablesAnalysisId } = useParamsRequired();
 
-  const serviceContainerProductMilestoneDeliverablesAnalysis = useServiceContainer(operationsApi.getDeliverablesAnalysis);
-  const serviceContainerProductMilestoneDeliverablesAnalysisRunner = serviceContainerProductMilestoneDeliverablesAnalysis.run;
+  const serviceContainerDeliverablesAnalysis = useServiceContainer(operationsApi.getDeliverablesAnalysis);
+  const serviceContainerDeliverablesAnalysisRunner = serviceContainerDeliverablesAnalysis.run;
 
-  const deliverablesAnalysis: DeliverableAnalyzerOperation | undefined =
-    serviceContainerProductMilestoneDeliverablesAnalysis.data || undefined;
+  const deliverablesAnalysis: DeliverableAnalyzerOperation | undefined = serviceContainerDeliverablesAnalysis.data || undefined;
 
   useEffect(() => {
-    serviceContainerProductMilestoneDeliverablesAnalysisRunner({
+    serviceContainerDeliverablesAnalysisRunner({
       serviceData: { id: deliverablesAnalysisId },
     });
-  }, [serviceContainerProductMilestoneDeliverablesAnalysisRunner, deliverablesAnalysisId]);
+  }, [serviceContainerDeliverablesAnalysisRunner, deliverablesAnalysisId]);
 
   useTitle(
     generatePageTitle({
-      serviceContainer: serviceContainerProductMilestoneDeliverablesAnalysis,
+      serviceContainer: serviceContainerDeliverablesAnalysis,
       firstLevelEntity: 'Product',
       nestedEntity: 'Deliverables Analysis',
-      entityName: `Deliverables Analysis ${deliverablesAnalysis?.id} ${PageTitles.delimiterSymbol} ${deliverablesAnalysis?.productMilestone?.version} ${PageTitles.delimiterSymbol} <unknown>`,
+      entityName:
+        `Deliverables Analysis ${deliverablesAnalysis?.id}` +
+        (deliverablesAnalysis?.productMilestone
+          ? ` ${PageTitles.delimiterSymbol} ${deliverablesAnalysis?.productMilestone.version} ${PageTitles.delimiterSymbol} <unknown>`
+          : ''),
     })
   );
 
   return (
-    <ServiceContainerLoading
-      {...serviceContainerProductMilestoneDeliverablesAnalysis}
-      title="Product Milestone Deliverables Analysis details"
-    >
+    <ServiceContainerLoading {...serviceContainerDeliverablesAnalysis} title="Deliverables Analysis details">
       <PageLayout title="Deliverables Analysis details">
         <ContentBox padding marginBottom isResponsive>
           <Attributes>