PR suggestions

Signed-off-by: Ian Bolton <[email protected]>
konveyor · Mar 26, 2024 · 7d245ed · 7d245ed
1 parent 797d152
commit 7d245ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -132,6 +132,7 @@
       "import": "Import {{what}}",
       "leavePage": "Leave page",
       "leaveAssessment": "Leave assessment",
+      "manageColumns": "Manage columns",
       "new": "New {{what}}",
       "newArchetype": "Create new archetype",
       "newAssessment": "New assessment",
@@ -213,6 +214,7 @@
     "selectedBecauseArchetypeTags": "Selected because the archetype's tags include {{tags}}",
     "selectedBecauseAppOrArchetypeTags": "Selected because the application or archetype's tags include {{tags}}",
     "selectOwnerFromStakeholdersList": "Select owner from list of stakeholders",
+    "manageColumnsDescription": "Select the columns you want to display in the table view.",
     "suggestedAdoptionPlanHelpText": "The suggested approach to migration based on effort, priority, and dependencies.",
     "taskInProgressForTags": "A new analysis is in-progress.  Tags may be updated upon completion.",
     "toTagApplication": "Either no tags exist yet or you may not have permission to view any. If you have permission, try creating a new custom tag.",

diff --git a/client/src/app/pages/applications/applications-table/components/manage-columns-modal.tsx b/client/src/app/pages/applications/applications-table/components/manage-columns-modal.tsx
@@ -82,6 +82,8 @@ export const ManageColumnsModal = <TColumnKey extends string>({
                 <DataListCheck
                   aria-labelledby={`check-${id}`}
                   checked={isVisible}
+                  //TODO: Dynamic disable logic based on idProperty definition in useTableControlState.
+                  // Currently, any column whose name is 'name' will not be allowed to be hidden
                   isDisabled={id === "name"}
                   onChange={(e, checked) => onSelect(id, checked)}
                 />

diff --git a/client/src/app/pages/applications/applications-table/components/manage-columns-toolbar.tsx b/client/src/app/pages/applications/applications-table/components/manage-columns-toolbar.tsx
@@ -40,12 +40,12 @@ export const ManageColumnsToolbar = <TColumnKey extends string>({
       {isOpen && (
         <ManageColumnsModal
           onClose={() => setIsOpen(false)}
-          description={t("Selected columns will be displayed in the table.")}
+          description={t("message.manageColumnsDescription")}
           setColumns={setColumns}
           columns={columns}
-          saveLabel={t("Save")}
-          cancelLabel={t("Cancel")}
-          title={t("Manage Columns")}
+          saveLabel={t("actions.save")}
+          cancelLabel={t("actions.cancel")}
+          title={t("title.manageColumns")}
         />
       )}
     </>