Merge remote-tracking branch 'origin/master' into MM-52097

2025-02-25 18:55:24 -06:00 · 2023-04-18 17:50:03 +05:30
parent b6f77e8bdc 067e36c23c
commit 965bca421a
1869 changed files with 11898 additions and 9548 deletions
--- a/4
+++ b/4
@@ -1,9 +1,7 @@
-/plugin/ @mattermost/toolkit
-
 /.github/workflows/channels-ci.yml @mattermost/web-platform
 /webapp/package.json @mattermost/web-platform
 /webapp/channels/package.json @mattermost/web-platform
 /webapp/Makefile @mattermost/web-platform
 /webapp/package-lock.json @mattermost/web-platform
 /webapp/platform/*/package.json @mattermost/web-platform
-/webapp/scripts @mattermost/web-platform
+/webapp/scripts @mattermost/web-platform
--- a/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/channel/new_channel_with_board_spec.js
@@ -22,8 +22,6 @@ describe('New Channel modal with Boards enabled', () => {
            cy.apiLogin(sysadmin);
            cy.visit(`/${testTeam.name}/channels/town-square`);
        });
-
-        cy.shouldHaveFeatureFlag('BoardsProduct', true);
    });

    it('MM-T5141 New Channel is created with an associated Board', () => {
--- a/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/edit_message_spec.js
@@ -145,4 +145,42 @@ describe('Edit Message', () => {
            cy.get(postText).should('have.text', `${secondMessage} Another new message Edited`);
        });
    });
+
+    it('MM-T5416 should discard any changes made after cancelling the edit and opening the edit textbox again should display the original message', () => {
+        const message = 'World!';
+        cy.postMessage(message);
+
+        // * Verify message is sent and not pending
+        cy.getLastPostId().then((postId) => {
+            const postText = `#postMessageText_${postId}`;
+            cy.get(postText).should('have.text', message);
+
+            // # Open edit textbox
+            cy.uiGetPostTextBox().type('{uparrow}');
+
+            // * Edit Post Input should appear, and edit the post
+            cy.get('#edit_textbox').should('be.visible');
+
+            // * Press the escape key to cancel
+            cy.get('#edit_textbox').should('have.text', message).type(' Another new message{esc}');
+            cy.get('#edit_textbox').should('not.exist');
+
+            // * Check that the message wasn't edited
+            cy.get(postText).should('have.text', message);
+        });
+
+        cy.getLastPostId().then((postId) => {
+            const postText = `#postMessageText_${postId}`;
+            cy.get(postText).should('have.text', message);
+
+            // # Open edit textbox again
+            cy.uiGetPostTextBox().type('{uparrow}');
+
+            // * Edit Post Input should appear, and edit the post
+            cy.get('#edit_textbox').should('be.visible');
+
+            // * Opening the edit textbox again after previously cancelling the edit should contain the original message.
+            cy.get('#edit_textbox').should('have.text', message);
+        });
+    });
 });
--- a/e2e-tests/playwright/global_setup.ts
+++ b/e2e-tests/playwright/global_setup.ts
@@ -5,7 +5,6 @@ import {expect} from '@playwright/test';
 import {UserProfile} from '@mattermost/types/users';

 import {Client, createRandomTeam, getAdminClient, getDefaultAdminUser, makeClient} from './support/server';
-import {boardsPluginId, callsPluginId} from './support/constant';
 import {defaultTeam} from './support/util';
 import testConfig from './test.config';

@@ -97,26 +96,15 @@ async function printClientInfo(client: Client) {
  - BuildHashEnterprise         = ${config.BuildHashEnterprise}
  - BuildEnterpriseReady        = ${config.BuildEnterpriseReady}
  - FeatureFlagAppsEnabled      = ${config.FeatureFlagAppsEnabled}
-  - FeatureFlagBoardsProduct    = ${config.FeatureFlagBoardsProduct}
  - FeatureFlagCallsEnabled     = ${config.FeatureFlagCallsEnabled}
  - TelemetryId                 = ${config.TelemetryId}`);
 }

-function getProductsAsPlugin() {
-    const productsAsPlugin = [callsPluginId];
-
-    if (!testConfig.boardsProductEnabled) {
-        productsAsPlugin.push(boardsPluginId);
-    }
-
-    return productsAsPlugin;
-}
-
 async function ensurePluginsLoaded(client: Client) {
    const pluginStatus = await client.getPluginStatuses();
    const plugins = await client.getPlugins();

-    getProductsAsPlugin().forEach(async (pluginId) => {
+    testConfig.ensurePluginsInstalled.forEach(async (pluginId) => {
        const isInstalled = pluginStatus.some((plugin) => plugin.plugin_id === pluginId);
        if (!isInstalled) {
            // eslint-disable-next-line no-console
--- a/e2e-tests/playwright/package-lock.json
+++ b/e2e-tests/playwright/package-lock.json
@@ -8,7 +8,7 @@
            "dependencies": {
                "@percy/cli": "1.18.0",
                "@percy/playwright": "1.0.4",
-                "@playwright/test": "1.30.0",
+                "@playwright/test": "1.32.3",
                "async-wait-until": "2.0.12",
                "chalk": "4.1.2",
                "deepmerge": "4.3.0",
@@ -428,18 +428,21 @@
            }
        },
        "node_modules/@playwright/test": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.30.0.tgz",
-            "integrity": "sha512-SVxkQw1xvn/Wk/EvBnqWIq6NLo1AppwbYOjNLmyU0R1RoQ3rLEBtmjTnElcnz8VEtn11fptj1ECxK0tgURhajw==",
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz",
+            "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==",
            "dependencies": {
                "@types/node": "*",
-                "playwright-core": "1.30.0"
+                "playwright-core": "1.32.3"
            },
            "bin": {
                "playwright": "cli.js"
            },
            "engines": {
                "node": ">=14"
+            },
+            "optionalDependencies": {
+                "fsevents": "2.3.2"
            }
        },
        "node_modules/@types/json-schema": {
@@ -1396,6 +1399,19 @@
            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
        },
+        "node_modules/fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
        "node_modules/get-stream": {
            "version": "5.2.0",
            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -1927,9 +1943,9 @@
            }
        },
        "node_modules/playwright-core": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz",
-            "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g==",
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz",
+            "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg==",
            "bin": {
                "playwright": "cli.js"
            },
@@ -2677,12 +2693,13 @@
            "integrity": "sha512-4cSkWqpu7uK9zzeVwtMWrgGbP34GUlvZsWdEEt98ep6ZECQA+iGB75pOpIVwcsHKXtkDRE6fgugtxNXs5uHpMg=="
        },
        "@playwright/test": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.30.0.tgz",
-            "integrity": "sha512-SVxkQw1xvn/Wk/EvBnqWIq6NLo1AppwbYOjNLmyU0R1RoQ3rLEBtmjTnElcnz8VEtn11fptj1ECxK0tgURhajw==",
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.32.3.tgz",
+            "integrity": "sha512-BvWNvK0RfBriindxhLVabi8BRe3X0J9EVjKlcmhxjg4giWBD/xleLcg2dz7Tx0agu28rczjNIPQWznwzDwVsZQ==",
            "requires": {
                "@types/node": "*",
-                "playwright-core": "1.30.0"
+                "fsevents": "2.3.2",
+                "playwright-core": "1.32.3"
            }
        },
        "@types/json-schema": {
@@ -3366,6 +3383,12 @@
            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
            "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
        },
+        "fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "optional": true
+        },
        "get-stream": {
            "version": "5.2.0",
            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
@@ -3747,9 +3770,9 @@
            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
        },
        "playwright-core": {
-            "version": "1.30.0",
-            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.30.0.tgz",
-            "integrity": "sha512-7AnRmTCf+GVYhHbLJsGUtskWTE33SwMZkybJ0v6rqR1boxq2x36U7p1vDRV7HO2IwTZgmycracLxPEJI49wu4g=="
+            "version": "1.32.3",
+            "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.32.3.tgz",
+            "integrity": "sha512-SB+cdrnu74ZIn5Ogh/8278ngEh9NEEV0vR4sJFmK04h2iZpybfbqBY0bX6+BLYWVdV12JLLI+JEFtSnYgR+mWg=="
        },
        "prelude-ls": {
            "version": "1.2.1",
--- a/e2e-tests/playwright/package.json
+++ b/e2e-tests/playwright/package.json
@@ -13,7 +13,7 @@
    "dependencies": {
        "@percy/cli": "1.18.0",
        "@percy/playwright": "1.0.4",
-        "@playwright/test": "1.30.0",
+        "@playwright/test": "1.32.3",
        "async-wait-until": "2.0.12",
        "chalk": "4.1.2",
        "deepmerge": "4.3.0",
--- a/e2e-tests/playwright/playwright.config.ts
+++ b/e2e-tests/playwright/playwright.config.ts
@@ -6,7 +6,7 @@ import {defineConfig, devices} from '@playwright/test';
 import {duration} from '@e2e-support/util';
 import testConfig from '@e2e-test.config';

-const defaultOutputFolder = 'playwright-report';
+const defaultOutputFolder = './playwright-report';

 export default defineConfig({
    globalSetup: require.resolve('./global_setup'),
--- a/e2e-tests/playwright/support/constant.ts
+++ b/e2e-tests/playwright/support/constant.ts
@@ -1,6 +1,7 @@
 // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.

+export const appsPluginId = 'com.mattermost.apps';
 export const boardsPluginId = 'focalboard';
 export const boardsProductId = 'boards';
 export const callsPluginId = 'com.mattermost.calls';
--- a/e2e-tests/playwright/support/flag.ts
+++ b/e2e-tests/playwright/support/flag.ts
@@ -5,22 +5,10 @@ import os from 'node:os';

 import {expect, test} from '@playwright/test';

-import {boardsPluginId, callsPluginId} from './constant';
+import {callsPluginId} from './constant';
 import {getAdminClient} from './server/init';
 import {isSmallScreen} from './util';

-export async function shouldHaveBoardsEnabled(enabled = true) {
-    const {adminClient} = await getAdminClient();
-    const config = await adminClient.getConfig();
-
-    const boardsEnabled =
-        (typeof config.FeatureFlags.BoardsProduct === 'boolean' && config.FeatureFlags.BoardsProduct) ||
-        config.PluginSettings.PluginStates[boardsPluginId].Enable;
-
-    const matched = boardsEnabled === enabled;
-    expect(matched, matched ? '' : `Boards expect "${enabled}" but actual "${boardsEnabled}"`).toBeTruthy();
-}
-
 export async function shouldHaveCallsEnabled(enabled = true) {
    const {adminClient} = await getAdminClient();
    const config = await adminClient.getConfig();
--- a/e2e-tests/playwright/support/server/client.ts
+++ b/e2e-tests/playwright/support/server/client.ts
@@ -167,8 +167,9 @@ async function makeClient(userRequest?: UserRequest, useCache = true): Promise<C

        const userProfile = await client.login(userRequest.username, userRequest.password);
        const user = {...userProfile, password: userRequest.password};
-        const config = await client.getClientConfigOld();
-        client.setUseBoardsProduct(config.FeatureFlagBoardsProduct === 'true');
+
+        // Manually do until boards as product is consistent in all the codebase.
+        client.setUseBoardsProduct(true);

        if (useCache) {
            clients[cacheKey] = {client, user};
--- a/e2e-tests/playwright/support/server/default_config.ts
+++ b/e2e-tests/playwright/support/server/default_config.ts
@@ -6,7 +6,6 @@ import merge from 'deepmerge';
 import {
    AdminConfig,
    ExperimentalSettings,
-    FeatureFlags,
    PasswordSettings,
    ServiceSettings,
    TeamSettings,
@@ -23,7 +22,6 @@ export function getOnPremServerConfig(): AdminConfig {
 type TestAdminConfig = {
    ClusterSettings: Partial<ClusterSettings>;
    ExperimentalSettings: Partial<ExperimentalSettings>;
-    FeatureFlags: Partial<FeatureFlags>;
    PasswordSettings: Partial<PasswordSettings>;
    PluginSettings: Partial<PluginSettings>;
    ServiceSettings: Partial<ServiceSettings>;
@@ -40,9 +38,6 @@ const onPremServerConfig = (): Partial<TestAdminConfig> => {
        ExperimentalSettings: {
            EnableAppBar: true,
        },
-        FeatureFlags: {
-            BoardsProduct: testConfig.boardsProductEnabled,
-        },
        PasswordSettings: {
            MinimumLength: 5,
            Lowercase: false,
@@ -57,11 +52,6 @@ const onPremServerConfig = (): Partial<TestAdminConfig> => {
                    defaultenabled: true,
                },
            },
-            PluginStates: {
-                focalboard: {
-                    Enable: !testConfig.boardsProductEnabled,
-                },
-            },
        },
        ServiceSettings: {
            SiteURL: testConfig.baseURL,
@@ -686,7 +676,6 @@ const defaultServerConfig: AdminConfig = {
        GraphQL: false,
        InsightsEnabled: true,
        CommandPalette: false,
-        BoardsProduct: false,
        SendWelcomePost: true,
        WorkTemplate: false,
        PostPriority: true,
--- a/e2e-tests/playwright/support/test_fixture.ts
+++ b/e2e-tests/playwright/support/test_fixture.ts
@@ -1,13 +1,7 @@
 import {test as base, Browser} from '@playwright/test';

 import {TestBrowser} from './browser_context';
-import {
-    shouldHaveBoardsEnabled,
-    shouldHaveCallsEnabled,
-    shouldHaveFeatureFlag,
-    shouldSkipInSmallScreen,
-    shouldRunInLinux,
-} from './flag';
+import {shouldHaveCallsEnabled, shouldHaveFeatureFlag, shouldSkipInSmallScreen, shouldRunInLinux} from './flag';
 import {initSetup, getAdminClient} from './server';
 import {hideDynamicChannelsContent, waitForAnimationEnd, waitUntil} from './test_action';
 import {pages} from './ui/pages';
@@ -36,7 +30,6 @@ class PlaywrightExtended {
    readonly testBrowser: TestBrowser;

    // ./flag
-    readonly shouldHaveBoardsEnabled;
    readonly shouldHaveCallsEnabled;
    readonly shouldHaveFeatureFlag;
    readonly shouldSkipInSmallScreen;
@@ -62,7 +55,6 @@ class PlaywrightExtended {
        this.testBrowser = new TestBrowser(browser);

        // ./flag
-        this.shouldHaveBoardsEnabled = shouldHaveBoardsEnabled;
        this.shouldHaveCallsEnabled = shouldHaveCallsEnabled;
        this.shouldHaveFeatureFlag = shouldHaveFeatureFlag;
        this.shouldSkipInSmallScreen = shouldSkipInSmallScreen;
--- a/e2e-tests/playwright/support/ui/components/channels/post_create.ts
+++ b/e2e-tests/playwright/support/ui/components/channels/post_create.ts
@@ -9,6 +9,7 @@ export default class ChannelsPostCreate {
    readonly input;
    readonly attachmentButton;
    readonly emojiButton;
+    readonly sendButton: Locator;

    constructor(container: Locator) {
        this.container = container;
@@ -16,12 +17,17 @@ export default class ChannelsPostCreate {
        this.input = container.getByTestId('post_textbox');
        this.attachmentButton = container.getByLabel('attachment');
        this.emojiButton = container.getByLabel('select an emoji');
+        this.sendButton = container.getByTestId('SendMessageButton');
    }

    async postMessage(message: string) {
        await this.input.fill(message);
    }

+    async sendMessage() {
+        await this.sendButton.click();
+    }
+
    async toBeVisible() {
        await expect(this.container).toBeVisible();
        await expect(this.input).toBeVisible();
--- a/e2e-tests/playwright/support/ui/pages/channels.ts
+++ b/e2e-tests/playwright/support/ui/pages/channels.ts
@@ -49,6 +49,10 @@ export default class ChannelsPage {
        await this.postCreate.postMessage(message);
    }

+    async sendMessage() {
+        await this.postCreate.sendMessage();
+    }
+
    async getFirstPost() {
        await this.page.getByTestId('postView').first().waitFor();
        const post = await this.page.getByTestId('postView').first();
--- a/e2e-tests/playwright/test.config.ts
+++ b/e2e-tests/playwright/test.config.ts
@@ -3,6 +3,9 @@

 import {Page, ViewportSize} from '@playwright/test';
 import * as dotenv from 'dotenv';
+
+import {appsPluginId, callsPluginId} from '@e2e-support/constant';
+
 dotenv.config();

 export type TestArgs = {
@@ -17,7 +20,7 @@ export type TestConfig = {
    adminUsername: string;
    adminPassword: string;
    adminEmail: string;
-    boardsProductEnabled: boolean;
+    ensurePluginsInstalled: string[];
    resetBeforeTest: boolean;
    haClusterEnabled: boolean;
    haClusterNodeCount: number;
@@ -41,7 +44,10 @@ const config: TestConfig = {
    adminUsername: process.env.PW_ADMIN_USERNAME || 'sysadmin',
    adminPassword: process.env.PW_ADMIN_PASSWORD || 'Sys@dmin-sample1',
    adminEmail: process.env.PW_ADMIN_EMAIL || 'sysadmin@sample.mattermost.com',
-    boardsProductEnabled: parseBool(process.env.PW_BOARDS_PRODUCT_ENABLED, true),
+    ensurePluginsInstalled:
+        typeof process.env?.PW_ENSURE_PLUGINS_INSTALLED === 'string'
+            ? process.env.PW_ENSURE_PLUGINS_INSTALLED.split(',')
+            : [appsPluginId, callsPluginId],
    haClusterEnabled: parseBool(process.env.PW_HA_CLUSTER_ENABLED, false),
    haClusterNodeCount: parseNumber(process.env.PW_HA_CLUSTER_NODE_COUNT, 2),
    haClusterName: process.env.PW_HA_CLUSTER_NAME || 'mm_dev_cluster',
--- a/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts
+++ b/e2e-tests/playwright/tests/functional/boards/board-creation-and-set-up/create_empty_board.spec.ts
@@ -7,8 +7,6 @@ import {shouldSkipInSmallScreen} from '@e2e-support/flag';
 shouldSkipInSmallScreen();

 test('MM-T4274 Create an Empty Board', async ({pw, pages}) => {
-    await pw.shouldHaveBoardsEnabled();
-
    // Create and sign in a new user
    const {user} = await pw.initSetup();

--- a/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts
+++ b/e2e-tests/playwright/tests/visual/boards/board_template.spec.ts
@@ -7,8 +7,6 @@ import {shouldSkipInSmallScreen} from '@e2e-support/flag';
 shouldSkipInSmallScreen();

 test('Board template', async ({pw, pages, browserName, viewport}, testInfo) => {
-    await pw.shouldHaveBoardsEnabled();
-
    // Create and sign in a new user
    const {user} = await pw.initSetup();

--- a/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts
+++ b/e2e-tests/playwright/tests/visual/boards/view_untitled_board.spec.ts
@@ -7,8 +7,6 @@ import {shouldSkipInSmallScreen} from '@e2e-support/flag';
 shouldSkipInSmallScreen();

 test('View untitled board', async ({pw, pages, browserName, viewport}, testInfo) => {
-    await pw.shouldHaveBoardsEnabled();
-
    // Create and sign in a new user
    const {user} = await pw.initSetup();

--- a/server/Makefile
+++ b/server/Makefile
@@ -102,11 +102,11 @@ GOFLAGS ?= $(GOFLAGS:)
 export GOBIN ?= $(PWD)/bin
 GO=go
 DELVE=dlv
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)"

 GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
 GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
@@ -132,9 +132,7 @@ DIST_PATH_WIN=$(DIST_ROOT)/windows/mattermost
 TESTS=.

 # Packages lists
-TE_PACKAGES=$(shell $(GO) list ./... | grep -vE 'v6/server/playbooks|v6/server/boards')
-BOARDS_PACKAGES=$(shell $(GO) list ./... | grep -E 'v6/server/boards')
-PLAYBOOKS_PACKAGES=$(shell $(GO) list ./... | grep -E 'v6/server/playbooks')
+SUITE_PACKAGES=$(shell $(GO) list ./...)

 TEMPLATES_DIR=templates

@@ -142,7 +140,7 @@ TEMPLATES_DIR=templates
 PLUGIN_PACKAGES ?= mattermost-plugin-antivirus-v0.1.2
 PLUGIN_PACKAGES += mattermost-plugin-autolink-v1.2.2
 PLUGIN_PACKAGES += mattermost-plugin-aws-SNS-v1.2.0
-PLUGIN_PACKAGES += mattermost-plugin-calls-v0.14.0
+PLUGIN_PACKAGES += mattermost-plugin-calls-v0.15.1
 PLUGIN_PACKAGES += mattermost-plugin-channel-export-v1.0.0
 PLUGIN_PACKAGES += mattermost-plugin-confluence-v1.3.0
 PLUGIN_PACKAGES += mattermost-plugin-custom-attributes-v1.3.1
@@ -170,9 +168,9 @@ endif
 EE_PACKAGES=$(shell $(GO) list $(BUILD_ENTERPRISE_DIR)/...)

 ifeq ($(BUILD_ENTERPRISE_READY),true)
-  ALL_PACKAGES=$(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES) $(EE_PACKAGES)
+  ALL_PACKAGES=$(SUITE_PACKAGES) $(EE_PACKAGES)
 else
-  ALL_PACKAGES=$(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES)
+  ALL_PACKAGES=$(SUITE_PACKAGES)
 endif

 all: run ## Alias for 'run'.
@@ -189,7 +187,7 @@ endif
 include config.mk
 include build/*.mk

-LDFLAGS += -X "github.com/mattermost/mattermost-server/v6/model.MockCWS=$(MM_ENABLE_CWS_MOCK)"
+LDFLAGS += -X "github.com/mattermost/mattermost-server/server/v8/model.MockCWS=$(MM_ENABLE_CWS_MOCK)"

 RUN_IN_BACKGROUND ?=
 ifeq ($(RUN_SERVER_IN_BACKGROUND),true)
@@ -270,7 +268,7 @@ else
 endif

 plugin-checker:
-	$(GO) run $(GOFLAGS) ../plugin/checker
+	$(GO) run $(GOFLAGS) ./plugin/checker

 prepackaged-plugins: ## Populate the prepackaged-plugins directory
 	@echo Downloading prepackaged plugins
@@ -349,9 +347,9 @@ ldap-mocks: ## Creates mock files for ldap.

 plugin-mocks: ## Creates mock files for plugins.
 	$(GO) install github.com/vektra/mockery/v2/...@v2.23.2
-	$(GOBIN)/mockery --dir ../plugin --name API --output ../plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
-	$(GOBIN)/mockery --dir ../plugin --name Hooks --output ../plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
-	$(GOBIN)/mockery --dir ../plugin --name Driver --output ../plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
+	$(GOBIN)/mockery --dir ./plugin --name API --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
+	$(GOBIN)/mockery --dir ./plugin --name Hooks --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'
+	$(GOBIN)/mockery --dir ./plugin --name Driver --output ./plugin/plugintest --outpkg plugintest --case underscore --note 'Regenerate this file using `make plugin-mocks`.'

 einterfaces-mocks: ## Creates mock files for einterfaces.
 	$(GO) install github.com/vektra/mockery/v2/...@v2.23.2
@@ -380,7 +378,7 @@ platform-mocks: ## Creates mocks for platform interfaces.
 	$(GOBIN)/mockery --dir channels/app/platform --name SuiteIFace --output channels/app/platform/mocks --note 'Regenerate this file using `make platform-mocks`.'

 pluginapi: ## Generates api and hooks glue code for plugins
-	$(GO) generate $(GOFLAGS) ../plugin
+	$(GO) generate $(GOFLAGS) ./plugin

 mocks: store-mocks telemetry-mocks filestore-mocks ldap-mocks plugin-mocks einterfaces-mocks searchengine-mocks sharedchannel-mocks misc-mocks email-mocks platform-mocks

@@ -412,7 +410,7 @@ go-junit-report:
 test-compile: ## Compile tests.
 	@echo COMPILE TESTS

-	for package in $(TE_PACKAGES) $(BOARDS_PACKAGES) $(PLAYBOOKS_PACKAGES) $(EE_PACKAGES); do \
+	for package in $(SUITE_PACKAGES) $(EE_PACKAGES); do \
 		$(GO) test $(GOFLAGS) -c $$package; \
 	done

@@ -450,9 +448,7 @@ else
 endif

 test-server-race: test-server-pre
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(TE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic"
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(BOARDS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic"
-	MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(PLAYBOOKS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic"
+	./scripts/test.sh "$(GO)" "-race $(GOFLAGS)" "$(SUITE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "atomic"
 ifneq ($(IS_CI),true)
  ifneq ($(MM_NO_DOCKER),true)
    ifneq ($(TEMP_DOCKER_SERVICES),)
@@ -463,9 +459,7 @@ ifneq ($(IS_CI),true)
 endif

 test-server: test-server-pre
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(TE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "45m" "count"
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(BOARDS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "45m" "count"
-	MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(PLAYBOOKS_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "45m" "count"
+	./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(SUITE_PACKAGES) $(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "90m" "count"
 ifneq ($(IS_CI),true)
  ifneq ($(MM_NO_DOCKER),true)
    ifneq ($(TEMP_DOCKER_SERVICES),)
@@ -477,19 +471,15 @@ endif

 test-server-ee: check-prereqs-enterprise start-docker go-junit-report do-cover-file ## Runs EE tests.
 	@echo Running only EE tests
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true ./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "20m" "count"
+	./scripts/test.sh "$(GO)" "$(GOFLAGS)" "$(EE_PACKAGES)" "$(TESTS)" "$(TESTFLAGS)" "$(GOBIN)" "20m" "count"

 test-server-quick: check-prereqs-enterprise ## Runs only quick tests.
 ifeq ($(BUILD_ENTERPRISE_READY),true)
 	@echo Running all tests
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(TE_PACKAGES) $(EE_PACKAGES)
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false $(GO) test $(GOFLAGS) -short $(BOARDS_PACKAGES)
-	MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(PLAYBOOKS_PACKAGES)
+	$(GO) test $(GOFLAGS) -short $(SUITE_PACKAGES) $(EE_PACKAGES)
 else
 	@echo Running only TE tests
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(TE_PACKAGES)
-	MM_DISABLE_PLAYBOOKS=true MM_DISABLE_BOARDS=false $(GO) test $(GOFLAGS) -short $(BOARDS_PACKAGES)
-	MM_DISABLE_PLAYBOOKS=false MM_DISABLE_BOARDS=true $(GO) test $(GOFLAGS) -short $(PLAYBOOKS_PACKAGES)
+	$(GO) test $(GOFLAGS) -short $(SUITE_PACKAGES)
 endif

 internal-test-web-client: ## Runs web client tests.
@@ -552,20 +542,20 @@ run-server: setup-go-work prepackaged-binaries validate-go-version start-docker
 debug-server: start-docker ## Compile and start server using delve.
 	mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files
 	$(DELVE) debug $(PLATFORM_FILES) --build-flags="-ldflags '\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\
-		-X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)\
+		-X \"github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)\"\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"

 debug-server-headless: start-docker ## Debug server from within an IDE like VSCode or IntelliJ.
 	mkdir -p $(BUILD_WEBAPP_DIR)/channels/dist/files
 	$(DELVE) debug --headless --listen=:2345 --api-version=2 --accept-multiclient $(PLATFORM_FILES) --build-flags="-ldflags '\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildNumber=$(BUILD_NUMBER)\
-		-X \"github.com/mattermost/mattermost-server/v6/model.BuildDate=$(BUILD_DATE)\"\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildHash=$(BUILD_HASH)\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
-		-X github.com/mattermost/mattermost-server/v6/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildNumber=$(BUILD_NUMBER)\
+		-X \"github.com/mattermost/mattermost-server/server/v8/model.BuildDate=$(BUILD_DATE)\"\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHash=$(BUILD_HASH)\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildHashEnterprise=$(BUILD_HASH_ENTERPRISE)\
+		-X github.com/mattermost/mattermost-server/server/v8/model.BuildEnterpriseReady=$(BUILD_ENTERPRISE_READY)'"

 run-cli: start-docker ## Runs CLI.
 	@echo Running mattermost for development
@@ -733,18 +723,18 @@ gen-serialized: ## Generates serialization methods for hot structs
 	# would be to temporarily move all the structs to the same file,
 	# but that involves a lot of manual work.
 	$(GO) install github.com/tinylib/msgp@v1.1.6
-	$(GOBIN)/msgp -file=../model/session.go -tests=false -o=../model/session_serial_gen.go
+	$(GOBIN)/msgp -file=./model/session.go -tests=false -o=./model/session_serial_gen.go
 	@echo "$$LICENSE_HEADER" > tmp.go
-	@cat ../model/session_serial_gen.go >> tmp.go
-	@mv tmp.go ../model/session_serial_gen.go
-	$(GOBIN)/msgp -file=../model/user.go -tests=false -o=../model/user_serial_gen.go
+	@cat ./model/session_serial_gen.go >> tmp.go
+	@mv tmp.go ./model/session_serial_gen.go
+	$(GOBIN)/msgp -file=./model/user.go -tests=false -o=./model/user_serial_gen.go
 	@echo "$$LICENSE_HEADER" > tmp.go
-	@cat ../model/user_serial_gen.go >> tmp.go
-	@mv tmp.go ../model/user_serial_gen.go
-	$(GOBIN)/msgp -file=../model/team_member.go -tests=false -o=../model/team_member_serial_gen.go
+	@cat ./model/user_serial_gen.go >> tmp.go
+	@mv tmp.go ./model/user_serial_gen.go
+	$(GOBIN)/msgp -file=./model/team_member.go -tests=false -o=./model/team_member_serial_gen.go
 	@echo "$$LICENSE_HEADER" > tmp.go
-	@cat ../model/team_member_serial_gen.go >> tmp.go
-	@mv tmp.go ../model/team_member_serial_gen.go
+	@cat ./model/team_member_serial_gen.go >> tmp.go
+	@mv tmp.go ./model/team_member_serial_gen.go

 todo: ## Display TODO and FIXME items in the source code.
 	@! ag --ignore Makefile --ignore-dir runtime '(TODO|XXX|FIXME|"FIX ME")[: ]+'
--- a/server/boards/api/admin.go
+++ b/server/boards/api/admin.go
@@ -11,10 +11,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 type AdminSetPasswordData struct {
--- a/server/boards/api/api.go
+++ b/server/boards/api/api.go
@@ -12,12 +12,12 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/app"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/app"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 const (
--- a/server/boards/api/api_test.go
+++ b/server/boards/api/api_test.go
@@ -13,8 +13,8 @@ import (

 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func TestErrorResponse(t *testing.T) {
--- a/server/boards/api/archive.go
+++ b/server/boards/api/archive.go
@@ -10,11 +10,11 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 const (
--- a/server/boards/api/audit.go
+++ b/server/boards/api/audit.go
@@ -6,8 +6,8 @@ package api
 import (
 	"net/http"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 )

 // makeAuditRecord creates an audit record pre-populated with data from the request.
--- a/server/boards/api/auth.go
+++ b/server/boards/api/auth.go
@@ -13,12 +13,12 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *API) registerAuthRoutes(r *mux.Router) {
--- a/server/boards/api/blocks.go
+++ b/server/boards/api/blocks.go
@@ -12,10 +12,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *API) registerBlocksRoutes(r *mux.Router) {
@@ -72,7 +72,6 @@ func (a *API) handleGetBlocks(w http.ResponseWriter, r *http.Request) {
 	query := r.URL.Query()
 	parentID := query.Get("parent_id")
 	blockType := query.Get("type")
-	all := query.Get("all")
 	blockID := query.Get("block_id")
 	boardID := mux.Vars(r)["boardID"]

@@ -122,18 +121,11 @@ func (a *API) handleGetBlocks(w http.ResponseWriter, r *http.Request) {
 	auditRec.AddMeta("boardID", boardID)
 	auditRec.AddMeta("parentID", parentID)
 	auditRec.AddMeta("blockType", blockType)
-	auditRec.AddMeta("all", all)
 	auditRec.AddMeta("blockID", blockID)

 	var blocks []*model.Block
 	var block *model.Block
 	switch {
-	case all != "":
-		blocks, err = a.app.GetBlocksForBoard(boardID)
-		if err != nil {
-			a.errorResponse(w, r, err)
-			return
-		}
 	case blockID != "":
 		block, err = a.app.GetBlockByID(blockID)
 		if err != nil {
@@ -148,7 +140,12 @@ func (a *API) handleGetBlocks(w http.ResponseWriter, r *http.Request) {

 		blocks = append(blocks, block)
 	default:
-		blocks, err = a.app.GetBlocks(boardID, parentID, blockType)
+		opts := model.QueryBlocksOptions{
+			BoardID:   boardID,
+			ParentID:  parentID,
+			BlockType: model.BlockType(blockType),
+		}
+		blocks, err = a.app.GetBlocks(opts)
 		if err != nil {
 			a.errorResponse(w, r, err)
 			return
--- a/server/boards/api/boards.go
+++ b/server/boards/api/boards.go
@@ -10,10 +10,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *API) registerBoardsRoutes(r *mux.Router) {
--- a/server/boards/api/boards_and_blocks.go
+++ b/server/boards/api/boards_and_blocks.go
@@ -11,10 +11,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *API) registerBoardsAndBlocksRoutes(r *mux.Router) {
--- a/server/boards/api/cards.go
+++ b/server/boards/api/cards.go
@@ -12,10 +12,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 const (
--- a/server/boards/api/categories.go
+++ b/server/boards/api/categories.go
@@ -11,8 +11,8 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 )

 func (a *API) registerCategoriesRoutes(r *mux.Router) {
--- a/server/boards/api/channels.go
+++ b/server/boards/api/channels.go
@@ -10,11 +10,11 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *API) registerChannelsRoutes(r *mux.Router) {
--- a/server/boards/api/compliance.go
+++ b/server/boards/api/compliance.go
@@ -11,10 +11,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 const (
--- a/server/boards/api/content_blocks.go
+++ b/server/boards/api/content_blocks.go
@@ -8,8 +8,8 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
 )

 func (a *API) registerContentBlocksRoutes(r *mux.Router) {
--- a/server/boards/api/files.go
+++ b/server/boards/api/files.go
@@ -11,17 +11,17 @@ import (
 	"strings"
 	"time"

-	"github.com/mattermost/mattermost-server/v6/server/boards/app"
+	"github.com/mattermost/mattermost-server/server/v8/boards/app"

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/web"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/web"
 )

 // FileUploadResponse is the response to a file upload
--- a/server/boards/api/insights.go
+++ b/server/boards/api/insights.go
@@ -12,10 +12,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )

 func (a *API) registerInsightsRoutes(r *mux.Router) {
--- a/server/boards/api/limits.go
+++ b/server/boards/api/limits.go
@@ -9,7 +9,7 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 func (a *API) registerLimitsRoutes(r *mux.Router) {
--- a/server/boards/api/members.go
+++ b/server/boards/api/members.go
@@ -10,9 +10,9 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *API) registerMembersRoutes(r *mux.Router) {
--- a/server/boards/api/onboarding.go
+++ b/server/boards/api/onboarding.go
@@ -9,7 +9,7 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 func (a *API) registerOnboardingRoutes(r *mux.Router) {
--- a/server/boards/api/search.go
+++ b/server/boards/api/search.go
@@ -9,10 +9,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *API) registerSearchRoutes(r *mux.Router) {
--- a/server/boards/api/sharing.go
+++ b/server/boards/api/sharing.go
@@ -11,10 +11,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 var ErrTurningOnSharing = errors.New("turning on sharing for board failed, see log for details")
--- a/server/boards/api/statistics.go
+++ b/server/boards/api/statistics.go
@@ -9,8 +9,8 @@ import (

 	"github.com/gorilla/mux"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )

 func (a *API) registerStatisticsRoutes(r *mux.Router) {
--- a/server/boards/api/subscriptions.go
+++ b/server/boards/api/subscriptions.go
@@ -11,10 +11,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *API) registerSubscriptionsRoutes(r *mux.Router) {
--- a/server/boards/api/system_test.go
+++ b/server/boards/api/system_test.go
@@ -10,9 +10,9 @@ import (
 	"runtime"
 	"testing"

-	"github.com/mattermost/mattermost-server/v6/server/boards/app"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/app"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func TestHello(t *testing.T) {
--- a/server/boards/api/teams.go
+++ b/server/boards/api/teams.go
@@ -10,9 +10,9 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 func (a *API) registerTeamsRoutes(r *mux.Router) {
--- a/server/boards/api/templates.go
+++ b/server/boards/api/templates.go
@@ -9,10 +9,10 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *API) registerTemplatesRoutes(r *mux.Router) {
--- a/server/boards/api/users.go
+++ b/server/boards/api/users.go
@@ -10,9 +10,9 @@ import (

 	"github.com/gorilla/mux"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/audit"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/audit"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 func (a *API) registerUsersRoutes(r *mux.Router) {
--- a/server/boards/app/app.go
+++ b/server/boards/app/app.go
@@ -8,19 +8,19 @@ import (
 	"sync"
 	"time"

-	"github.com/mattermost/mattermost-server/v6/server/boards/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/metrics"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/webhook"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
-	"github.com/mattermost/mattermost-server/v6/server/boards/ws"
+	"github.com/mattermost/mattermost-server/server/v8/boards/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/metrics"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/webhook"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/ws"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 const (
--- a/server/boards/app/app_test.go
+++ b/server/boards/app/app_test.go
@@ -8,7 +8,7 @@ import (

 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
 )

 func TestSetConfig(t *testing.T) {
--- a/server/boards/app/auth.go
+++ b/server/boards/app/auth.go
@@ -4,11 +4,11 @@
 package app

 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"

 	"github.com/pkg/errors"
 )
--- a/server/boards/app/auth_test.go
+++ b/server/boards/app/auth_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 var mockUser = &model.User{
--- a/server/boards/app/blocks.go
+++ b/server/boards/app/blocks.go
@@ -9,29 +9,20 @@ import (
 	"path/filepath"
 	"strings"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 var ErrBlocksFromMultipleBoards = errors.New("the block set contain blocks from multiple boards")

-func (a *App) GetBlocks(boardID, parentID string, blockType string) ([]*model.Block, error) {
-	if boardID == "" {
+func (a *App) GetBlocks(opts model.QueryBlocksOptions) ([]*model.Block, error) {
+	if opts.BoardID == "" {
 		return []*model.Block{}, nil
 	}
-
-	if blockType != "" && parentID != "" {
-		return a.store.GetBlocksWithParentAndType(boardID, parentID, blockType)
-	}
-
-	if blockType != "" {
-		return a.store.GetBlocksWithType(boardID, blockType)
-	}
-
-	return a.store.GetBlocksWithParent(boardID, parentID)
+	return a.store.GetBlocks(opts)
 }

 func (a *App) DuplicateBlock(boardID string, blockID string, userID string, asTemplate bool) ([]*model.Block, error) {
@@ -514,10 +505,6 @@ func (a *App) GetBlockCountsByType() (map[string]int64, error) {
 	return a.store.GetBlockCountsByType()
 }

-func (a *App) GetBlocksForBoard(boardID string) ([]*model.Block, error) {
-	return a.store.GetBlocksForBoard(boardID)
-}
-
 func (a *App) notifyBlockChanged(action notify.Action, block *model.Block, oldBlock *model.Block, modifiedByID string) {
 	// don't notify if notifications service disabled, or block change is generated via system user.
 	if a.notifications == nil || modifiedByID == model.SystemUserID {
--- a/server/boards/app/blocks_test.go
+++ b/server/boards/app/blocks_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 type blockError struct {
@@ -207,10 +207,17 @@ func TestIsWithinViewsLimit(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "board_id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil)

 		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
 		assert.NoError(t, err)
@@ -225,10 +232,17 @@ func TestIsWithinViewsLimit(t *testing.T) {
 				Views: mm_model.NewInt(1),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "board_id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil)

 		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
 		assert.NoError(t, err)
@@ -243,10 +257,17 @@ func TestIsWithinViewsLimit(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "board_id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{{}, {}, {}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}, {}, {}}, nil)

 		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
 		assert.NoError(t, err)
@@ -261,10 +282,17 @@ func TestIsWithinViewsLimit(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "board_id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("board_id", "parent_id", "view").Return([]*model.Block{}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{}, nil)

 		withinLimits, err := th.App.isWithinViewsLimit("board_id", &model.Block{ParentID: "parent_id"})
 		assert.NoError(t, err)
@@ -333,10 +361,17 @@ func TestInsertBlocks(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "test-board-id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("test-board-id", "parent_id", "view").Return([]*model.Block{{}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil)

 		_, err := th.App.InsertBlocks([]*model.Block{block}, "user-id-1")
 		require.NoError(t, err)
@@ -365,10 +400,17 @@ func TestInsertBlocks(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "test-board-id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil)
-		th.Store.EXPECT().GetBlocksWithParentAndType("test-board-id", "parent_id", "view").Return([]*model.Block{{}, {}}, nil)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}, {}}, nil)

 		_, err := th.App.InsertBlocks([]*model.Block{block}, "user-id-1")
 		require.Error(t, err)
@@ -406,10 +448,17 @@ func TestInsertBlocks(t *testing.T) {
 				Views: mm_model.NewInt(2),
 			},
 		}
+
+		opts := model.QueryBlocksOptions{
+			BoardID:   "test-board-id",
+			ParentID:  "parent_id",
+			BlockType: model.BlockType("view"),
+		}
+
 		th.Store.EXPECT().GetCloudLimits().Return(cloudLimit, nil).Times(2)
 		th.Store.EXPECT().GetUsedCardsCount().Return(1, nil).Times(2)
 		th.Store.EXPECT().GetCardLimitTimestamp().Return(int64(1), nil).Times(2)
-		th.Store.EXPECT().GetBlocksWithParentAndType("test-board-id", "parent_id", "view").Return([]*model.Block{{}}, nil).Times(2)
+		th.Store.EXPECT().GetBlocks(opts).Return([]*model.Block{{}}, nil).Times(2)

 		_, err := th.App.InsertBlocks([]*model.Block{view1, view2}, "user-id-1")
 		require.Error(t, err)
--- a/server/boards/app/boards.go
+++ b/server/boards/app/boards.go
@@ -7,11 +7,11 @@ import (
 	"errors"
 	"fmt"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 var (
--- a/server/boards/app/boards_and_blocks.go
+++ b/server/boards/app/boards_and_blocks.go
@@ -4,10 +4,10 @@
 package app

 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/notify"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/notify"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *App) CreateBoardsAndBlocks(bab *model.BoardsAndBlocks, userID string, addMember bool) (*model.BoardsAndBlocks, error) {
--- a/server/boards/app/boards_test.go
+++ b/server/boards/app/boards_test.go
@@ -6,14 +6,14 @@ package app
 import (
 	"testing"

-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

 	"github.com/stretchr/testify/assert"

 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 func TestAddMemberToBoard(t *testing.T) {
--- a/server/boards/app/cards.go
+++ b/server/boards/app/cards.go
@@ -6,8 +6,8 @@ package app
 import (
 	"fmt"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 func (a *App) CreateCard(card *model.Card, boardID string, userID string, disableNotify bool) (*model.Card, error) {
--- a/server/boards/app/cards_test.go
+++ b/server/boards/app/cards_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 func TestCreateCard(t *testing.T) {
--- a/server/boards/app/category.go
+++ b/server/boards/app/category.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"fmt"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 var errCategoryNotFound = errors.New("category ID specified in input does not exist for user")
--- a/server/boards/app/category_boards.go
+++ b/server/boards/app/category_boards.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 const defaultCategoryBoards = "Boards"
--- a/server/boards/app/category_boards_test.go
+++ b/server/boards/app/category_boards_test.go
@@ -6,11 +6,11 @@ package app
 import (
 	"testing"

-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 func TestGetUserCategoryBoards(t *testing.T) {
--- a/server/boards/app/category_test.go
+++ b/server/boards/app/category_test.go
@@ -8,8 +8,8 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 func TestCreateCategory(t *testing.T) {
--- a/server/boards/app/clientConfig.go
+++ b/server/boards/app/clientConfig.go
@@ -4,7 +4,7 @@
 package app

 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 func (a *App) GetClientConfig() *model.ClientConfig {
--- a/server/boards/app/clientConfig_test.go
+++ b/server/boards/app/clientConfig_test.go
@@ -8,7 +8,7 @@ import (

 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
 )

 func TestGetClientConfig(t *testing.T) {
--- a/server/boards/app/cloud.go
+++ b/server/boards/app/cloud.go
@@ -7,12 +7,12 @@ import (
 	"errors"
 	"fmt"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 var ErrNilPluginAPI = errors.New("server not running in plugin mode")
--- a/server/boards/app/cloud_test.go
+++ b/server/boards/app/cloud_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	mockservicesapi "github.com/mattermost/mattermost-server/v6/server/boards/model/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mockservicesapi "github.com/mattermost/mattermost-server/server/v8/boards/model/mocks"
 )

 func TestIsCloud(t *testing.T) {
--- a/server/boards/app/compliance.go
+++ b/server/boards/app/compliance.go
@@ -3,7 +3,7 @@

 package app

-import "github.com/mattermost/mattermost-server/v6/server/boards/model"
+import "github.com/mattermost/mattermost-server/server/v8/boards/model"

 func (a *App) GetBoardsForCompliance(opts model.QueryBoardsForComplianceOptions) ([]*model.Board, bool, error) {
 	return a.store.GetBoardsForCompliance(opts)
--- a/server/boards/app/content_blocks.go
+++ b/server/boards/app/content_blocks.go
@@ -8,7 +8,7 @@ import (

 	"github.com/pkg/errors"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 func (a *App) MoveContentBlock(block *model.Block, dstBlock *model.Block, where string, userID string) error {
--- a/server/boards/app/content_blocks_test.go
+++ b/server/boards/app/content_blocks_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 type contentOrderMatcher struct {
--- a/server/boards/app/export.go
+++ b/server/boards/app/export.go
@@ -11,9 +11,9 @@ import (

 	"github.com/wiggin77/merror"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 var (
@@ -86,7 +86,7 @@ func (a *App) writeArchiveBoard(zw *zip.Writer, board model.Board, opt model.Exp
 	var files []string
 	// write the board's blocks
 	// TODO: paginate this
-	blocks, err := a.GetBlocksForBoard(board.ID)
+	blocks, err := a.GetBlocks(model.QueryBlocksOptions{BoardID: board.ID})
 	if err != nil {
 		return err
 	}
--- a/server/boards/app/files.go
+++ b/server/boards/app/files.go
@@ -10,12 +10,12 @@ import (
 	"path/filepath"
 	"strings"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 const emptyString = "empty"
--- a/server/boards/app/files_test.go
+++ b/server/boards/app/files_test.go
@@ -15,10 +15,10 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )

 const (
--- a/server/boards/app/helper_test.go
+++ b/server/boards/app/helper_test.go
@@ -7,18 +7,18 @@ import (

 	"github.com/golang/mock/gomock"

-	"github.com/mattermost/mattermost-server/v6/server/boards/auth"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/metrics"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions"
-	mmpermissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mmpermissions/mocks"
-	permissionsMocks "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/mockstore"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/webhook"
-	"github.com/mattermost/mattermost-server/v6/server/boards/ws"
+	"github.com/mattermost/mattermost-server/server/v8/boards/auth"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/metrics"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions"
+	mmpermissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mmpermissions/mocks"
+	permissionsMocks "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/webhook"
+	"github.com/mattermost/mattermost-server/server/v8/boards/ws"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/filestore/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/filestore/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 type TestHelper struct {
--- a/server/boards/app/import.go
+++ b/server/boards/app/import.go
@@ -16,10 +16,10 @@ import (

 	"github.com/krolaw/zipstream"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 const (
--- a/server/boards/app/import_test.go
+++ b/server/boards/app/import_test.go
@@ -7,12 +7,12 @@ import (
 	"bytes"
 	"testing"

-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 func TestApp_ImportArchive(t *testing.T) {
--- a/server/boards/app/initialize.go
+++ b/server/boards/app/initialize.go
@@ -6,7 +6,7 @@ package app
 import (
 	"context"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 // initialize is called when the App is first created.
--- a/server/boards/app/insights.go
+++ b/server/boards/app/insights.go
@@ -6,8 +6,8 @@ package app
 import (
 	"github.com/pkg/errors"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )

 func (a *App) GetTeamBoardsInsights(userID string, teamID string, opts *mm_model.InsightsOpts) (*model.BoardInsightsList, error) {
--- a/server/boards/app/insights_test.go
+++ b/server/boards/app/insights_test.go
@@ -8,8 +8,8 @@ import (

 	"github.com/stretchr/testify/require"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )

 var mockInsightsBoards = []*model.Board{
--- a/server/boards/app/onboarding.go
+++ b/server/boards/app/onboarding.go
@@ -6,7 +6,7 @@ package app
 import (
 	"errors"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 const (
--- a/server/boards/app/onboarding_test.go
+++ b/server/boards/app/onboarding_test.go
@@ -6,11 +6,11 @@ package app
 import (
 	"testing"

-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 const (
--- a/server/boards/app/permissions.go
+++ b/server/boards/app/permissions.go
@@ -4,7 +4,7 @@
 package app

 import (
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )

 func (a *App) HasPermissionToBoard(userID, boardID string, permission *mm_model.Permission) bool {
--- a/server/boards/app/server_metadata.go
+++ b/server/boards/app/server_metadata.go
@@ -6,7 +6,7 @@ package app
 import (
 	"runtime"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 type ServerMetadata struct {
--- a/server/boards/app/server_metadata_test.go
+++ b/server/boards/app/server_metadata_test.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"testing"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 func TestGetServerMetadata(t *testing.T) {
--- a/server/boards/app/sharing.go
+++ b/server/boards/app/sharing.go
@@ -4,7 +4,7 @@
 package app

 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 func (a *App) GetSharing(boardID string) (*model.Sharing, error) {
--- a/server/boards/app/sharing_test.go
+++ b/server/boards/app/sharing_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 func TestGetSharing(t *testing.T) {
--- a/server/boards/app/subscriptions.go
+++ b/server/boards/app/subscriptions.go
@@ -4,10 +4,10 @@
 package app

 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *App) CreateSubscription(sub *model.Subscription) (*model.Subscription, error) {
--- a/server/boards/app/teams.go
+++ b/server/boards/app/teams.go
@@ -4,10 +4,10 @@
 package app

 import (
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func (a *App) GetRootTeam() (*model.Team, error) {
--- a/server/boards/app/teams_test.go
+++ b/server/boards/app/teams_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 var errInvalidTeam = errors.New("invalid team id")
--- a/server/boards/app/templates.go
+++ b/server/boards/app/templates.go
@@ -8,10 +8,10 @@ import (
 	"fmt"
 	"strings"

-	"github.com/mattermost/mattermost-server/v6/server/boards/assets"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/assets"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 const (
--- a/server/boards/app/templates_test.go
+++ b/server/boards/app/templates_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

-	"github.com/mattermost/mattermost-server/v6/plugin/plugintest/mock"
+	"github.com/mattermost/mattermost-server/server/v8/plugin/plugintest/mock"
 )

 func TestApp_initializeTemplates(t *testing.T) {
--- a/server/boards/app/user.go
+++ b/server/boards/app/user.go
@@ -4,8 +4,8 @@
 package app

 import (
-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )

 func (a *App) GetTeamUsers(teamID string, asGuestID string) ([]*model.User, error) {
--- a/server/boards/app/user_test.go
+++ b/server/boards/app/user_test.go
@@ -8,8 +8,8 @@ import (

 	"github.com/stretchr/testify/assert"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )

 func TestSearchUsers(t *testing.T) {
--- a/server/boards/auth/auth.go
+++ b/server/boards/auth/auth.go
@@ -7,11 +7,11 @@ package auth
 import (
 	"github.com/pkg/errors"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 type AuthInterface interface {
@@ -58,6 +58,10 @@ func (a *Auth) IsValidReadToken(boardID string, readToken string) (bool, error)
 		return false, err
 	}

+	if !a.config.EnablePublicSharedBoards {
+		return false, errors.New("public shared boards disabled")
+	}
+
 	if sharing != nil && (sharing.ID == boardID && sharing.Enabled && sharing.Token == readToken) {
 		return true, nil
 	}
--- a/server/boards/auth/auth_test.go
+++ b/server/boards/auth/auth_test.go
@@ -10,14 +10,14 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/config"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/localpermissions"
-	mockpermissions "github.com/mattermost/mattermost-server/v6/server/boards/services/permissions/mocks"
-	"github.com/mattermost/mattermost-server/v6/server/boards/services/store/mockstore"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/config"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/localpermissions"
+	mockpermissions "github.com/mattermost/mattermost-server/server/v8/boards/services/permissions/mocks"
+	"github.com/mattermost/mattermost-server/server/v8/boards/services/store/mockstore"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 type TestHelper struct {
--- a/server/boards/auth/mocks/mockauth_interface.go
+++ b/server/boards/auth/mocks/mockauth_interface.go
@@ -2,7 +2,7 @@
 // See LICENSE.txt for license information.

 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/mattermost/mattermost-server/v6/server/boards/auth (interfaces: AuthInterface)
+// Source: github.com/mattermost/mattermost-server/server/v8/boards/auth (interfaces: AuthInterface)

 // Package mocks is a generated GoMock package.
 package mocks
@@ -11,7 +11,7 @@ import (
 	reflect "reflect"

 	gomock "github.com/golang/mock/gomock"
-	model "github.com/mattermost/mattermost-server/v6/server/boards/model"
+	model "github.com/mattermost/mattermost-server/server/v8/boards/model"
 )

 // MockAuthInterface is a mock of AuthInterface interface.
--- a/server/boards/client/client.go
+++ b/server/boards/client/client.go
@@ -12,10 +12,10 @@ import (
 	"net/http"
 	"strings"

-	"github.com/mattermost/mattermost-server/v6/server/boards/api"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/api"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"

-	mm_model "github.com/mattermost/mattermost-server/v6/model"
+	mm_model "github.com/mattermost/mattermost-server/server/v8/model"
 )

 const (
--- a/server/boards/integrationtests/blocks_test.go
+++ b/server/boards/integrationtests/blocks_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

 	"github.com/stretchr/testify/require"
 )
--- a/server/boards/integrationtests/board_test.go
+++ b/server/boards/integrationtests/board_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"

-	"github.com/mattermost/mattermost-server/v6/server/boards/client"
-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/client"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"

 	"github.com/stretchr/testify/require"
 )
--- a/server/boards/integrationtests/boards_and_blocks_test.go
+++ b/server/boards/integrationtests/boards_and_blocks_test.go
@@ -6,7 +6,7 @@ package integrationtests
 import (
 	"testing"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"

 	"github.com/stretchr/testify/require"
 )
@@ -133,7 +133,7 @@ func TestCreateBoardsAndBlocks(t *testing.T) {
 			require.Equal(t, "public board", board1.Title)
 			require.Equal(t, model.BoardTypeOpen, board1.Type)
 			require.NotEqual(t, "board-id-1", board1.ID)
-			blocks1, err := th.Server.App().GetBlocksForBoard(board1.ID)
+			blocks1, err := th.Server.App().GetBlocks(model.QueryBlocksOptions{BoardID: board1.ID})
 			require.NoError(t, err)
 			require.Len(t, blocks1, 1)
 			require.Equal(t, "block 1", blocks1[0].Title)
@@ -147,7 +147,7 @@ func TestCreateBoardsAndBlocks(t *testing.T) {
 			require.Equal(t, "private board", board2.Title)
 			require.Equal(t, model.BoardTypePrivate, board2.Type)
 			require.NotEqual(t, "board-id-2", board2.ID)
-			blocks2, err := th.Server.App().GetBlocksForBoard(board2.ID)
+			blocks2, err := th.Server.App().GetBlocks(model.QueryBlocksOptions{BoardID: board2.ID})
 			require.NoError(t, err)
 			require.Len(t, blocks2, 1)
 			require.Equal(t, "block 2", blocks2[0].Title)
--- a/server/boards/integrationtests/boardsapp_test.go
+++ b/server/boards/integrationtests/boardsapp_test.go
@@ -11,10 +11,10 @@ import (

 	"github.com/stretchr/testify/assert"

-	"github.com/mattermost/mattermost-server/v6/server/boards/server"
+	"github.com/mattermost/mattermost-server/server/v8/boards/server"

-	"github.com/mattermost/mattermost-server/v6/model"
-	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
+	"github.com/mattermost/mattermost-server/server/v8/model"
+	"github.com/mattermost/mattermost-server/server/v8/platform/shared/mlog"
 )

 func TestSetConfiguration(t *testing.T) {
--- a/server/boards/integrationtests/cards_test.go
+++ b/server/boards/integrationtests/cards_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/mattermost/mattermost-server/v6/server/boards/model"
-	"github.com/mattermost/mattermost-server/v6/server/boards/utils"
+	"github.com/mattermost/mattermost-server/server/v8/boards/model"
+	"github.com/mattermost/mattermost-server/server/v8/boards/utils"
 )

 func TestCreateCard(t *testing.T) {
--- a/Show More
+++ b/Show More