Remove boards product references (#23855)

Automatic Merge

webapp/channels/src/components/activity_and_insights/insights/insights.tsx

@@ -42,13 +42,11 @@ const Insights = () => {
     const dispatch = useDispatch();
     const products = useProducts();
 
-    let focalboardEnabled = false;
+    const focalboardEnabled = false;
     let playbooksEnabled = false;
     if (products) {
         products.forEach((product) => {
-            if (product.pluginId === suitePluginIds.boards) {
-                focalboardEnabled = true;
-            } else if (product.pluginId === suitePluginIds.playbooks) {
+            if (product.pluginId === suitePluginIds.playbooks) {
                 playbooksEnabled = true;
             }
         });

webapp/channels/src/components/app_bar/app_bar.tsx

@@ -43,7 +43,7 @@ export default function AppBar() {
         return null;
     }
 
-    const coreProductsPluginIds = [suitePluginIds.boards, suitePluginIds.focalboard, suitePluginIds.playbooks];
+    const coreProductsPluginIds = [suitePluginIds.focalboard, suitePluginIds.playbooks];
 
     const [coreProductComponents, pluginComponents] = partition(appBarPluginComponents, ({pluginId}) => {
         return coreProductsPluginIds.includes(pluginId);

webapp/channels/src/components/app_bar/app_bar_plugin_component.tsx

@@ -89,7 +89,7 @@ const AppBarPluginComponent = (props: PluginComponentProps) => {
         );
     }
 
-    const boardsEnabled = component.pluginId === suitePluginIds.focalboard || component.pluginId === suitePluginIds.boards;
+    const boardsEnabled = component.pluginId === suitePluginIds.focalboard;
 
     return (
         <OverlayTrigger

webapp/channels/src/components/channel_header/components/header_icon_wrapper.tsx

@@ -145,7 +145,7 @@ const HeaderIconWrapper = (props: Props) => {
         ariaLabelText = `${localizeMessage(toolTips[tooltipKey].messageID, toolTips[tooltipKey].message)}`;
     }
 
-    const boardsEnabled = pluginId === suitePluginIds.focalboard || pluginId === suitePluginIds.boards;
+    const boardsEnabled = pluginId === suitePluginIds.focalboard;
 
     if (tooltip) {
         return (

webapp/channels/src/components/global_header/left_controls/product_menu/product_menu.tsx

@@ -81,11 +81,9 @@ const ProductMenu = (): JSX.Element => {
     const triggerStep = useSelector((state: GlobalState) => getInt(state, OnboardingTaskCategory, OnboardingTasksName.EXPLORE_OTHER_TOOLS, FINISHED));
     const exploreToolsTourTriggered = triggerStep === GenericTaskSteps.STARTED;
 
-    const {boardsProductEnabled, boardsPlugin, playbooksPlugin} = useGetPluginsActivationState();
+    const {boardsPlugin, playbooksPlugin} = useGetPluginsActivationState();
 
-    const boardsEnabled = boardsPlugin || boardsProductEnabled;
-
-    const showBoardsTour = enableTutorial && tutorialStep === ExploreOtherToolsTourSteps.BOARDS_TOUR && exploreToolsTourTriggered && boardsEnabled;
+    const showBoardsTour = enableTutorial && tutorialStep === ExploreOtherToolsTourSteps.BOARDS_TOUR && exploreToolsTourTriggered && boardsPlugin;
     const showPlaybooksTour = enableTutorial && tutorialStep === ExploreOtherToolsTourSteps.PLAYBOOKS_TOUR && exploreToolsTourTriggered && playbooksPlugin;
 
     const handleClick = () => dispatch(setProductMenuSwitcherOpen(!switcherOpen));
@@ -110,14 +108,13 @@ const ProductMenu = (): JSX.Element => {
         let tourTip;
 
         // focalboard
-        const boardsEnabled = product.pluginId === suitePluginIds.focalboard || product.pluginId === suitePluginIds.boards;
-        if (boardsEnabled && showBoardsTour) {
+        if (boardsPlugin && showBoardsTour) {
             tourTip = (<BoardsTourTip singleTip={!playbooksPlugin}/>);
         }
 
         // playbooks
         if (product.pluginId === suitePluginIds.playbooks && showPlaybooksTour) {
-            tourTip = (<PlaybooksTourTip singleTip={!boardsEnabled}/>);
+            tourTip = (<PlaybooksTourTip singleTip={!boardsPlugin}/>);
         }
 
         return (

webapp/channels/src/components/tours/hooks.ts

@@ -34,7 +34,7 @@ export const useGetTourSteps = (tourCategory: string) => {
 
     let tourSteps: Record<string, number> = TTNameMapToTourSteps[tourCategory];
 
-    const {playbooksPlugin, playbooksProductEnabled, boardsPlugin, boardsProductEnabled} = useGetPluginsActivationState();
+    const {playbooksPlugin, playbooksProductEnabled, boardsPlugin} = useGetPluginsActivationState();
 
     if (tourCategory === TutorialTourName.EXPLORE_OTHER_TOOLS) {
         const steps: Record<string, number> = tourSteps as typeof ExploreOtherToolsTourSteps;
@@ -42,7 +42,7 @@ export const useGetTourSteps = (tourCategory: string) => {
             delete steps.PLAYBOOKS_TOUR;
         }
 
-        if (!boardsPlugin && !boardsProductEnabled) {
+        if (!boardsPlugin) {
             delete steps.BOARDS_TOUR;
         }
         tourSteps = steps;
@@ -52,6 +52,7 @@ export const useGetTourSteps = (tourCategory: string) => {
     }
     return tourSteps;
 };
+
 export const useHandleNavigationAndExtraActions = (tourCategory: string) => {
     const dispatch = useDispatch();
     const currentUserId = useSelector(getCurrentUserId);

webapp/channels/src/plugins/useGetPluginsActivationState.ts

@@ -12,14 +12,12 @@ export const useGetPluginsActivationState = () => {
     const pluginsList = useSelector((state: GlobalState) => state.plugins.plugins);
     const pluginProducts = useProducts();
 
-    let boardsProductEnabled = false;
     let playbooksProductEnabled = false;
     if (pluginProducts) {
-        boardsProductEnabled = pluginProducts.some((product) => (product.pluginId === suitePluginIds.focalboard) || (product.pluginId === suitePluginIds.boards));
         playbooksProductEnabled = pluginProducts.some((product) => product.pluginId === suitePluginIds.playbooks);
     }
     const boardsPlugin = pluginsList.focalboard;
     const playbooksPlugin = pluginsList.playbooks;
 
-    return {boardsPlugin: Boolean(boardsPlugin), playbooksPlugin: Boolean(playbooksPlugin), boardsProductEnabled, playbooksProductEnabled};
+    return {boardsPlugin: Boolean(boardsPlugin), playbooksPlugin: Boolean(playbooksPlugin), playbooksProductEnabled};
 };

webapp/channels/src/utils/constants.tsx

@@ -177,17 +177,6 @@ export const TrialPeriodDays = {
 
 export const suitePluginIds = {
     playbooks: 'playbooks',
-
-    /**
-     * @warning This only applies to the Boards product and will not work with the Boards plugin. Both cases need to
-     * be supported until we enable the Boards product permanently.
-     */
-    boards: 'boards',
-
-    /**
-     * @deprecated This only applies to the Boards plugin and will not work with the Boards product. Both cases need
-     * to be supported until we enable the Boards product permanently.
-     */
     focalboard: 'focalboard',
 
     apps: 'com.mattermost.apps',