From 82b18a5d567ae65271ad61cdd27bbad239cf90e1 Mon Sep 17 00:00:00 2001
From: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
Date: Tue, 3 Sep 2024 18:15:49 -0700
Subject: [PATCH] Releas notes (#248)

* Persist dataSourceId across applications under new Nav change

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* release notes added

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* release notes added

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* release notes added

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* release notes added

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* release notes added

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit 774f9ab78eda7d83c8698d75f36578473ccafd4e)
---
 public/pages/Main/Main.tsx                    | 413 +++++++++---------
 ...ds-notifications.release-notes-2.17.0.0.md |  18 +
 2 files changed, 227 insertions(+), 204 deletions(-)
 create mode 100644 release-notes/opensearch-dashboards-notifications.release-notes-2.17.0.0.md

diff --git a/public/pages/Main/Main.tsx b/public/pages/Main/Main.tsx
index 768b86c2..3dd77d3e 100644
--- a/public/pages/Main/Main.tsx
+++ b/public/pages/Main/Main.tsx
@@ -90,7 +90,12 @@ export default class Main extends Component<MainProps, MainState> {
         dataSourceId: dataSourceId,
         dataSourceLabel: dataSourceLabel,
         dataSourceReadOnly: false,
-        dataSourceLoading: props.multiDataSourceEnabled,
+        /**
+        * undefined: need data source picker to help to determine which data source to use.
+        * empty string: using the local cluster.
+        * string: using the selected data source.
+        */
+        dataSourceLoading: dataSourceId === undefined ? props.multiDataSourceEnabled : false,
       };
     } else {
       this.state = initialState;
@@ -244,47 +249,80 @@ export default class Main extends Component<MainProps, MainState> {
                   services && (
                     <MainContext.Provider value={this.state}>
                       <ModalProvider>
-                          <DataSourceMenuContext.Provider
-                            value={{
-                              dataSourceId: this.state.dataSourceId,
-                              dataSourceLabel: this.state.dataSourceLabel,
-                              multiDataSourceEnabled: this.props.multiDataSourceEnabled
-                            }}
-                          >
-                            {this.props.multiDataSourceEnabled && DataSourceMenuView && DataSourceMenuSelectable && (
-                              <Switch>
-                                <Route
-                                  path={[
-                                    `${ROUTES.EDIT_CHANNEL}/:id`,
-                                    `${ROUTES.CHANNEL_DETAILS}/:id`,
-                                    `${ROUTES.EDIT_SENDER}/:id`,
-                                    `${ROUTES.EDIT_RECIPIENT_GROUP}/:id`,
-                                    `${ROUTES.EDIT_SES_SENDER}/:id`
-                                  ]}
-                                  render={() => (
+                        <DataSourceMenuContext.Provider
+                          value={{
+                            dataSourceId: this.state.dataSourceId,
+                            dataSourceLabel: this.state.dataSourceLabel,
+                            multiDataSourceEnabled: this.props.multiDataSourceEnabled
+                          }}
+                        >
+                          {this.props.multiDataSourceEnabled && DataSourceMenuView && DataSourceMenuSelectable && (
+                            <Switch>
+                              <Route
+                                path={[
+                                  `${ROUTES.EDIT_CHANNEL}/:id`,
+                                  `${ROUTES.CHANNEL_DETAILS}/:id`,
+                                  `${ROUTES.EDIT_SENDER}/:id`,
+                                  `${ROUTES.EDIT_RECIPIENT_GROUP}/:id`,
+                                  `${ROUTES.EDIT_SES_SENDER}/:id`
+                                ]}
+                                render={() => (
+                                  <DataSourceMenuView
+                                    setMenuMountPoint={this.props.setActionMenu}
+                                    componentType="DataSourceView"
+                                    componentConfig={{
+                                      activeOption: [{ label: this.state.dataSourceLabel, id: this.state.dataSourceId }],
+                                      dataSourceFilter: this.dataSourceFilterFn
+                                    }}
+                                  />
+                                )}
+                              />
+                              <Route
+                                path={[
+                                  "/",
+                                  ROUTES.CHANNELS,
+                                  ROUTES.CREATE_CHANNEL,
+                                  ROUTES.CREATE_SENDER,
+                                  ROUTES.CREATE_SES_SENDER,
+                                  ROUTES.CREATE_RECIPIENT_GROUP,
+                                  ROUTES.EMAIL_GROUPS,
+                                  ROUTES.EMAIL_SENDERS,
+                                  ROUTES.NOTIFICATIONS
+                                ]}
+                                render={() => (
+                                  <DataSourceMenuSelectable
+                                    setMenuMountPoint={this.props.setActionMenu}
+                                    componentType="DataSourceSelectable"
+                                    componentConfig={{
+                                      savedObjects: core?.savedObjects.client,
+                                      notifications: core?.notifications,
+                                      fullWidth: false,
+                                      activeOption,
+                                      onSelectedDataSources: this.onSelectedDataSources,
+                                      dataSourceFilter: this.dataSourceFilterFn
+                                    }}
+                                  />
+                                )}
+                              />
+                              <Route
+                                path={[
+                                  ROUTES.CREATE_SES_SENDER,
+                                  ROUTES.CREATE_CHANNEL,
+                                  ROUTES.CREATE_RECIPIENT_GROUP,
+                                  ROUTES.CREATE_SENDER
+                                ]}
+                                render={() =>
+                                  this.state.dataSourceReadOnly ? (
                                     <DataSourceMenuView
                                       setMenuMountPoint={this.props.setActionMenu}
                                       componentType="DataSourceView"
                                       componentConfig={{
                                         activeOption: [{ label: this.state.dataSourceLabel, id: this.state.dataSourceId }],
+                                        fullWidth: false,
                                         dataSourceFilter: this.dataSourceFilterFn
                                       }}
                                     />
-                                  )}
-                                />
-                                <Route
-                                  path={[
-                                    "/",
-                                    ROUTES.CHANNELS,
-                                    ROUTES.CREATE_CHANNEL,
-                                    ROUTES.CREATE_SENDER,
-                                    ROUTES.CREATE_SES_SENDER,
-                                    ROUTES.CREATE_RECIPIENT_GROUP,
-                                    ROUTES.EMAIL_GROUPS,
-                                    ROUTES.EMAIL_SENDERS,
-                                    ROUTES.NOTIFICATIONS
-                                  ]}
-                                  render={() => (
+                                  ) : (
                                     <DataSourceMenuSelectable
                                       setMenuMountPoint={this.props.setActionMenu}
                                       componentType="DataSourceSelectable"
@@ -297,177 +335,144 @@ export default class Main extends Component<MainProps, MainState> {
                                         dataSourceFilter: this.dataSourceFilterFn
                                       }}
                                     />
-                                  )}
-                                />
-                                <Route
-                                  path={[
-                                    ROUTES.CREATE_SES_SENDER,
-                                    ROUTES.CREATE_CHANNEL,
-                                    ROUTES.CREATE_RECIPIENT_GROUP,
-                                    ROUTES.CREATE_SENDER
-                                  ]}
-                                  render={() =>
-                                    this.state.dataSourceReadOnly ? (
-                                      <DataSourceMenuView
-                                        setMenuMountPoint={this.props.setActionMenu}
-                                        componentType="DataSourceView"
-                                        componentConfig={{
-                                          activeOption: [{ label: this.state.dataSourceLabel, id: this.state.dataSourceId }],
-                                          fullWidth: false,
-                                          dataSourceFilter: this.dataSourceFilterFn
-                                        }}
+                                  )
+                                }
+                              />
+                            </Switch>
+                          )}
+                          <EuiPage>
+                            {!this.state.dataSourceLoading && (
+                              <>
+                                <ModalRoot services={services} />
+                                {pathname !== ROUTES.CREATE_CHANNEL &&
+                                  !pathname.startsWith(ROUTES.EDIT_CHANNEL) &&
+                                  !pathname.startsWith(ROUTES.CHANNEL_DETAILS) &&
+                                  pathname !== ROUTES.CREATE_SENDER &&
+                                  !pathname.startsWith(ROUTES.EDIT_SENDER) &&
+                                  pathname !== ROUTES.CREATE_SES_SENDER &&
+                                  !pathname.startsWith(ROUTES.EDIT_SES_SENDER) &&
+                                  pathname !== ROUTES.CREATE_RECIPIENT_GROUP &&
+                                  !pathname.startsWith(ROUTES.EDIT_RECIPIENT_GROUP) &&
+                                  !core.chrome?.navGroup?.getNavGroupEnabled() && (
+                                    <EuiPageSideBar style={{ minWidth: 155 }}>
+                                      <EuiSideNav
+                                        style={{ width: 155 }}
+                                        items={sideNav}
                                       />
-                                    ) : (
-                                      <DataSourceMenuSelectable
-                                        setMenuMountPoint={this.props.setActionMenu}
-                                        componentType="DataSourceSelectable"
-                                        componentConfig={{
-                                          savedObjects: core?.savedObjects.client,
-                                          notifications: core?.notifications,
-                                          fullWidth: false,
-                                          activeOption,
-                                          onSelectedDataSources: this.onSelectedDataSources,
-                                          dataSourceFilter: this.dataSourceFilterFn
-                                        }}
-                                      />
-                                    )
-                                  }
-                                />
-                              </Switch>
-                            )}
-                            <EuiPage>
-                              {!this.state.dataSourceLoading && (
-                                <>
-                                  <ModalRoot services={services} />
-                                  {pathname !== ROUTES.CREATE_CHANNEL &&
-                                    !pathname.startsWith(ROUTES.EDIT_CHANNEL) &&
-                                    !pathname.startsWith(ROUTES.CHANNEL_DETAILS) &&
-                                    pathname !== ROUTES.CREATE_SENDER &&
-                                    !pathname.startsWith(ROUTES.EDIT_SENDER) &&
-                                    pathname !== ROUTES.CREATE_SES_SENDER &&
-                                    !pathname.startsWith(ROUTES.EDIT_SES_SENDER) &&
-                                    pathname !== ROUTES.CREATE_RECIPIENT_GROUP &&
-                                    !pathname.startsWith(ROUTES.EDIT_RECIPIENT_GROUP) &&
-                                    !core.chrome?.navGroup?.getNavGroupEnabled() && (
-                                      <EuiPageSideBar style={{ minWidth: 155 }}>
-                                        <EuiSideNav
-                                          style={{ width: 155 }}
-                                          items={sideNav}
+                                    </EuiPageSideBar>
+                                  )}
+                                <EuiPageBody>
+                                  <Switch>
+                                    <Route
+                                      path={ROUTES.CREATE_CHANNEL}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <CreateChannel
+                                          {...routeProps}
                                         />
-                                      </EuiPageSideBar>
-                                    )}
-                                  <EuiPageBody>
-                                    <Switch>
-                                      <Route
-                                        path={ROUTES.CREATE_CHANNEL}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <CreateChannel
-                                            {...routeProps}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={`${ROUTES.EDIT_CHANNEL}/:id`}
-                                        render={(routeProps: RouteComponentProps<{ id: string }>) => (
-                                          <CreateChannel
-                                            {...routeProps}
-                                            edit={true}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={`${ROUTES.CHANNEL_DETAILS}/:id`}
-                                        render={(routeProps: RouteComponentProps<{ id: string }>) => (
-                                          <ChannelDetails
-                                            {...routeProps}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={ROUTES.CHANNELS}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <Channels
-                                            {...routeProps}
-                                            notificationService={services?.notificationService as NotificationService}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={ROUTES.EMAIL_SENDERS}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <EmailSenders
-                                            {...routeProps}
-                                            notificationService={services?.notificationService as NotificationService}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={ROUTES.EMAIL_GROUPS}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <EmailGroups
-                                            {...routeProps}
-                                            notificationService={services?.notificationService as NotificationService}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={ROUTES.CREATE_SENDER}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <CreateSender
-                                            {...routeProps}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={`${ROUTES.EDIT_SENDER}/:id`}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <CreateSender
-                                            {...routeProps}
-                                            edit={true}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={ROUTES.CREATE_SES_SENDER}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <CreateSESSender
-                                            {...routeProps}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={`${ROUTES.EDIT_SES_SENDER}/:id`}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <CreateSESSender
-                                            {...routeProps}
-                                            edit={true}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={ROUTES.CREATE_RECIPIENT_GROUP}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <CreateRecipientGroup
-                                            {...routeProps}
-                                          />
-                                        )}
-                                      />
-                                      <Route
-                                        path={`${ROUTES.EDIT_RECIPIENT_GROUP}/:id`}
-                                        render={(routeProps: RouteComponentProps) => (
-                                          <CreateRecipientGroup
-                                            {...routeProps}
-                                            edit={true}
-                                          />
-                                        )}
-                                      />
-                                      <Redirect from="/" to={core.chrome?.navGroup?.getNavGroupEnabled() ? this.props.defaultRoute : ROUTES.CHANNELS} />
-                                    </Switch>
-                                  </EuiPageBody>
-                                </>
-                              )}
-                            </EuiPage>
-                          </DataSourceMenuContext.Provider>
+                                      )}
+                                    />
+                                    <Route
+                                      path={`${ROUTES.EDIT_CHANNEL}/:id`}
+                                      render={(routeProps: RouteComponentProps<{ id: string }>) => (
+                                        <CreateChannel
+                                          {...routeProps}
+                                          edit={true}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={`${ROUTES.CHANNEL_DETAILS}/:id`}
+                                      render={(routeProps: RouteComponentProps<{ id: string }>) => (
+                                        <ChannelDetails
+                                          {...routeProps}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={ROUTES.CHANNELS}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <Channels
+                                          {...routeProps}
+                                          notificationService={services?.notificationService as NotificationService}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={ROUTES.EMAIL_SENDERS}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <EmailSenders
+                                          {...routeProps}
+                                          notificationService={services?.notificationService as NotificationService}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={ROUTES.EMAIL_GROUPS}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <EmailGroups
+                                          {...routeProps}
+                                          notificationService={services?.notificationService as NotificationService}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={ROUTES.CREATE_SENDER}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <CreateSender
+                                          {...routeProps}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={`${ROUTES.EDIT_SENDER}/:id`}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <CreateSender
+                                          {...routeProps}
+                                          edit={true}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={ROUTES.CREATE_SES_SENDER}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <CreateSESSender
+                                          {...routeProps}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={`${ROUTES.EDIT_SES_SENDER}/:id`}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <CreateSESSender
+                                          {...routeProps}
+                                          edit={true}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={ROUTES.CREATE_RECIPIENT_GROUP}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <CreateRecipientGroup
+                                          {...routeProps}
+                                        />
+                                      )}
+                                    />
+                                    <Route
+                                      path={`${ROUTES.EDIT_RECIPIENT_GROUP}/:id`}
+                                      render={(routeProps: RouteComponentProps) => (
+                                        <CreateRecipientGroup
+                                          {...routeProps}
+                                          edit={true}
+                                        />
+                                      )}
+                                    />
+                                    <Redirect from="/" to={core.chrome?.navGroup?.getNavGroupEnabled() ? this.props.defaultRoute : ROUTES.CHANNELS} />
+                                  </Switch>
+                                </EuiPageBody>
+                              </>
+                            )}
+                          </EuiPage>
+                        </DataSourceMenuContext.Provider>
                       </ModalProvider>
                     </MainContext.Provider>
                   )
@@ -479,4 +484,4 @@ export default class Main extends Component<MainProps, MainState> {
       </CoreServicesConsumer>
     );
   };
-}
\ No newline at end of file
+}
diff --git a/release-notes/opensearch-dashboards-notifications.release-notes-2.17.0.0.md b/release-notes/opensearch-dashboards-notifications.release-notes-2.17.0.0.md
new file mode 100644
index 00000000..1e7162d3
--- /dev/null
+++ b/release-notes/opensearch-dashboards-notifications.release-notes-2.17.0.0.md
@@ -0,0 +1,18 @@
+## Version 2.17.0.0 2024-09-03
+Compatible with OpenSearch Dashboards 2.17.0
+
+### Maintenance
+* [Backport 2.x] add riysaxen as maintainer ([#241](https://github.com/opensearch-project/dashboards-notifications/pull/241))
+* Increment version to 2.17.0.0 ([#237](https://github.com/opensearch-project/dashboards-notifications/pull/241))
+
+
+### Features/Enhancements 
+* [navigation]feat: change parent item name ([#234](https://github.com/opensearch-project/dashboards-notifications/pull/234))
+* Use smaller and compressed varients of buttons and form components ([#231](https://github.com/opensearch-project/dashboards-notifications/pull/231))
+* Page header ([#236](https://github.com/opensearch-project/dashboards-notifications/pull/236))
+
+### Bug Fixes
+* Fix link checker ([#242](https://github.com/opensearch-project/dashboards-notifications/pull/242))
+
+### Documentation
+* 2.17 release notes. ([#243](https://github.com/opensearch-project/dashboards-notifications/pull/243))
\ No newline at end of file