Merge branch 'main' into deps-update

konveyor · Jul 6, 2023 · 3253ff7 · 3253ff7
2 parents 5425e02 + 7130f44
commit 3253ff7
Show file tree

Hide file tree

Showing 15 changed files with 360 additions and 296 deletions.
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -76,7 +76,7 @@
     "error": "{{what}} error",
     "manage": "Manage {{what}}",
     "manageDependenciesFor": "Manage dependencies for {{what}}",
-    "noDataStateBody": "Create a new {{what}} to start seeing data here",
+    "noDataStateBody": "Create a new {{what}} to start seeing data here.",
     "noDataStateTitle": "No {{what}} available",
     "Nquestions": "{{n}} questions",
     "ofTotalApplications": "Of {{count}} application",

diff --git a/client/public/locales/es/translation.json b/client/public/locales/es/translation.json
@@ -64,7 +64,7 @@
     "businessCriticality": "Criticidad de negocio (1=bajo, 10=alto)",
     "editQuestion": "Editar {{what}}?",
     "manageDependenciesFor": "Administrar dependencias para {{what}}",
-    "noDataStateBody": "Cree un(a) nuevo(a) {{what}} para empezar a ver datos acá",
+    "noDataStateBody": "Cree un(a) nuevo(a) {{what}} para empezar a ver datos acá.",
     "noDataStateTitle": "No existen {{what}} disponibles",
     "Nquestions": "{{n}} preguntas",
     "ofTotalApplications": "De {{count}} aplicación",

diff --git a/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx b/client/src/app/pages/applications/applications-table-analyze/applications-table-analyze.tsx
@@ -619,11 +619,9 @@ export const ApplicationsTableAnalyze: React.FC = () => {
                 what: t("terms.applications").toLowerCase(),
               })}
               // t('terms.application')
-              description={
-                t("composed.noDataStateBody", {
-                  what: t("terms.application").toLowerCase(),
-                }) + "."
-              }
+              description={t("composed.noDataStateBody", {
+                what: t("terms.application").toLowerCase(),
+              })}
             />
           }
         />

diff --git a/...rc/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx b/...rc/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx
@@ -782,11 +782,9 @@ export const ApplicationsTable: React.FC = () => {
                 what: t("terms.applications").toLowerCase(),
               })}
               // t('terms.application')
-              description={
-                t("composed.noDataStateBody", {
-                  what: t("terms.application").toLowerCase(),
-                }) + "."
-              }
+              description={t("composed.noDataStateBody", {
+                what: t("terms.application").toLowerCase(),
+              })}
             />
           }
         />

diff --git a/client/src/app/pages/controls/business-services/business-services.tsx b/client/src/app/pages/controls/business-services/business-services.tsx
@@ -296,11 +296,9 @@ export const BusinessServices: React.FC = () => {
                 what: t("terms.businessServices").toLowerCase(),
               })}
               // t('terms.businessService')
-              description={
-                t("composed.noDataStateBody", {
-                  what: t("terms.businessService").toLowerCase(),
-                }) + "."
-              }
+              description={t("composed.noDataStateBody", {
+                what: t("terms.businessService").toLowerCase(),
+              })}
             />
           }
         />

diff --git a/client/src/app/pages/controls/job-functions/job-functions.tsx b/client/src/app/pages/controls/job-functions/job-functions.tsx
@@ -248,11 +248,9 @@ export const JobFunctions: React.FC = () => {
                 what: t("terms.jobFunctions").toLowerCase(),
               })}
               // t('terms.jobFunction')
-              description={
-                t("composed.noDataStateBody", {
-                  what: t("terms.jobFunction").toLowerCase(),
-                }) + "."
-              }
+              description={t("composed.noDataStateBody", {
+                what: t("terms.jobFunction").toLowerCase(),
+              })}
             />
           }
         />

diff --git a/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx b/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx
@@ -321,11 +321,9 @@ export const StakeholderGroups: React.FC = () => {
                 what: t("terms.stakeholderGroups").toLowerCase(),
               })}
               // t('terms.stakeholderGroup')
-              description={
-                t("composed.noDataStateBody", {
-                  what: t("terms.stakeholderGroup").toLowerCase(),
-                }) + "."
-              }
+              description={t("composed.noDataStateBody", {
+                what: t("terms.stakeholderGroup").toLowerCase(),
+              })}
             />
           }
         />

diff --git a/client/src/app/pages/controls/stakeholders/stakeholders.tsx b/client/src/app/pages/controls/stakeholders/stakeholders.tsx
@@ -8,8 +8,12 @@ import {
   DescriptionListDescription,
   DescriptionListGroup,
   DescriptionListTerm,
+  EmptyState,
+  EmptyStateBody,
+  EmptyStateIcon,
   Modal,
   ModalVariant,
+  Title,
   Toolbar,
   ToolbarContent,
   ToolbarGroup,
@@ -25,6 +29,7 @@ import {
   Tr,
 } from "@patternfly/react-table";
 import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
+import CubesIcon from "@patternfly/react-icons/dist/esm/icons/cubes-icon";
 
 import {
   AppPlaceholder,
@@ -247,7 +252,22 @@ export const Stakeholders: React.FC = () => {
             <ConditionalTableBody
               isLoading={isFetching}
               isError={!!fetchError}
-              isNoData={stakeholders.length === 0}
+              isNoData={currentPageItems.length === 0}
+              noDataEmptyState={
+                <EmptyState variant="small">
+                  <EmptyStateIcon icon={CubesIcon} />
+                  <Title headingLevel="h2" size="lg">
+                    {t("composed.noDataStateTitle", {
+                      what: t("terms.stakeholder").toLowerCase(),
+                    })}
+                  </Title>
+                  <EmptyStateBody>
+                    {t("composed.noDataStateBody", {
+                      what: t("terms.stakeholder").toLowerCase(),
+                    })}
+                  </EmptyStateBody>
+                </EmptyState>
+              }
               numRenderedColumns={numRenderedColumns}
             >
               {currentPageItems?.map((stakeholder, rowIndex) => {

diff --git a/client/src/app/pages/controls/tags/components/tag-category-form.tsx b/client/src/app/pages/controls/tags/components/tag-category-form.tsx
@@ -205,6 +205,9 @@ export const TagCategoryForm: React.FC<TagCategoryFormProps> = ({
           <SimpleSelect
             variant="single"
             maxHeight={DEFAULT_SELECT_MAX_HEIGHT}
+            placeholderText={t("composed.selectOne", {
+              what: t("terms.color").toLowerCase(),
+            })}
             id="type-select"
             toggleId="type-select-toggle"
             toggleAriaLabel="Type select dropdown toggle"

diff --git a/client/src/app/pages/controls/tags/components/tag-form.tsx b/client/src/app/pages/controls/tags/components/tag-form.tsx
@@ -166,6 +166,9 @@ export const TagForm: React.FC<TagFormProps> = ({ tag, onClose }) => {
           <SimpleSelect
             variant="single"
             maxHeight={DEFAULT_SELECT_MAX_HEIGHT}
+            placeholderText={t("composed.selectOne", {
+              what: t("terms.tagCategory").toLowerCase(),
+            })}
             id="tag-type-select"
             toggleId="tag-type-select-toggle"
             toggleAriaLabel="Tag Type select dropdown toggle"

diff --git a/client/src/app/pages/controls/tags/tags.tsx b/client/src/app/pages/controls/tags/tags.tsx
@@ -438,11 +438,9 @@ export const Tags: React.FC = () => {
                 what: t("terms.tagCategories").toLowerCase(),
               })}
               // t('terms.stakeholderGroup')
-              description={
-                t("composed.noDataStateBody", {
-                  what: t("terms.tagCategory").toLowerCase(),
-                }) + "."
-              }
+              description={t("composed.noDataStateBody", {
+                what: t("terms.tagCategory").toLowerCase(),
+              })}
             />
           }
         />

diff --git a/client/src/app/pages/external/jira/trackers.tsx b/client/src/app/pages/external/jira/trackers.tsx
@@ -2,11 +2,15 @@ import * as React from "react";
 import {
   Button,
   ButtonVariant,
+  EmptyState,
+  EmptyStateBody,
+  EmptyStateIcon,
   Modal,
   PageSection,
   PageSectionVariants,
   Text,
   TextContent,
+  Title,
   Toolbar,
   ToolbarContent,
   ToolbarGroup,
@@ -18,7 +22,6 @@ import {
   AppTableActionButtons,
   ConditionalRender,
   ConfirmDialog,
-  ToolbarBulkSelector,
 } from "@app/shared/components";
 import {
   FilterToolbar,
@@ -36,6 +39,7 @@ import {
   Th,
   TableComposable,
 } from "@patternfly/react-table";
+import CubesIcon from "@patternfly/react-icons/dist/esm/icons/cubes-icon";
 
 import { useLocalTableControls } from "@app/shared/hooks/table-controls";
 import { SimplePagination } from "@app/shared/components/simple-pagination";
@@ -108,7 +112,6 @@ export const JiraTrackers: React.FC = () => {
       kind: `${t("terms.instance")} type`,
       connection: "Connection",
     },
-    isSelectable: true,
     filterCategories: [
       {
         key: "name",
@@ -134,10 +137,8 @@ export const JiraTrackers: React.FC = () => {
   const {
     currentPageItems,
     numRenderedColumns,
-    selectionState: { selectedItems },
     propHelpers: {
       toolbarProps,
-      toolbarBulkSelectorProps,
       filterToolbarProps,
       paginationToolbarItemProps,
       paginationProps,
@@ -166,7 +167,6 @@ export const JiraTrackers: React.FC = () => {
           >
             <Toolbar {...toolbarProps}>
               <ToolbarContent>
-                <ToolbarBulkSelector {...toolbarBulkSelectorProps} />
                 <FilterToolbar {...filterToolbarProps} />
                 <ToolbarGroup variant="button-group">
                   {/* <RBAC
@@ -218,12 +218,27 @@ export const JiraTrackers: React.FC = () => {
               <ConditionalTableBody
                 isLoading={isFetching}
                 isError={!!fetchError}
-                isNoData={trackers.length === 0}
+                isNoData={currentPageItems.length === 0}
+                noDataEmptyState={
+                  <EmptyState variant="small">
+                    <EmptyStateIcon icon={CubesIcon} />
+                    <Title headingLevel="h2" size="lg">
+                      {t("composed.noDataStateTitle", {
+                        what: t("terms.jiraConfig").toLowerCase(),
+                      })}
+                    </Title>
+                    <EmptyStateBody>
+                      {t("composed.noDataStateBody", {
+                        what: t("terms.jiraConfig").toLowerCase(),
+                      })}
+                    </EmptyStateBody>
+                  </EmptyState>
+                }
                 numRenderedColumns={numRenderedColumns}
               >
-                <Tbody>
-                  {currentPageItems?.map((tracker, rowIndex) => (
-                    <Tr key={tracker.name}>
+                {currentPageItems?.map((tracker, rowIndex) => (
+                  <Tbody key={tracker.name}>
+                    <Tr>
                       <TableRowContentWithControls
                         {...tableControls}
                         item={tracker}
@@ -268,8 +283,8 @@ export const JiraTrackers: React.FC = () => {
                         </Td>
                       </TableRowContentWithControls>
                     </Tr>
-                  ))}
-                </Tbody>
+                  </Tbody>
+                ))}
               </ConditionalTableBody>
             </TableComposable>
           </div>

diff --git a/client/src/app/pages/identities/identities.tsx b/client/src/app/pages/identities/identities.tsx
@@ -103,8 +103,8 @@ export const Identities: React.FC = () => {
     { key: "source", value: "Source Control" },
     { key: "maven", value: "Maven Settings File" },
     { key: "proxy", value: "Proxy" },
-    { key: "basic-auth", value: "JIRA Basic Auth" },
-    { key: "bearer", value: "JIRA Bearer Token" },
+    { key: "basic-auth", value: "Basic Auth (Jira)" },
+    { key: "bearer", value: "Bearer Token (Jira)" },
   ];
   const filterCategories: FilterCategory<
     Identity,
@@ -280,11 +280,9 @@ export const Identities: React.FC = () => {
                 title={t("composed.noDataStateTitle", {
                   what: "credentials",
                 })}
-                description={
-                  t("composed.noDataStateBody", {
-                    what: "credential",
-                  }) + "."
-                }
+                description={t("composed.noDataStateBody", {
+                  what: "credential",
+                })}
               />
             }
             paginationProps={paginationProps}

diff --git a/client/src/app/pages/migration-waves/migration-waves.tsx b/client/src/app/pages/migration-waves/migration-waves.tsx
@@ -3,12 +3,16 @@ import {
   Button,
   ButtonVariant,
   DropdownItem,
+  EmptyState,
+  EmptyStateBody,
+  EmptyStateIcon,
   Modal,
   ModalVariant,
   PageSection,
   PageSectionVariants,
   Text,
   TextContent,
+  Title,
   Toolbar,
   ToolbarContent,
   ToolbarGroup,
@@ -17,6 +21,7 @@ import {
 import { useTranslation } from "react-i18next";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
+import CubesIcon from "@patternfly/react-icons/dist/esm/icons/cubes-icon";
 
 import {
   useDeleteAllMigrationWavesMutation,
@@ -325,7 +330,18 @@ export const MigrationWaves: React.FC = () => {
               <ConditionalTableBody
                 isLoading={isFetching}
                 isError={!!fetchError}
-                isNoData={migrationWaves.length === 0}
+                isNoData={currentPageItems.length === 0}
+                noDataEmptyState={
+                  <EmptyState variant="small">
+                    <EmptyStateIcon icon={CubesIcon} />
+                    <Title headingLevel="h2" size="lg">
+                      No migration waves available
+                    </Title>
+                    <EmptyStateBody>
+                      Use the filter menu above to select your migration wave.
+                    </EmptyStateBody>
+                  </EmptyState>
+                }
                 numRenderedColumns={numRenderedColumns}
               >
                 {currentPageItems?.map((migrationWave, rowIndex) => {