Snapshot management small fixes (#208) (#209)

* Add notification Signed-off-by: bowenlan-amzn <[email protected]> * Default timestamp in snapshot name Signed-off-by: bowenlan-amzn <[email protected]> * Make custom configuration in create repo more prominent Signed-off-by: bowenlan-amzn <[email protected]> * Tune the snapshots table to have more space for showing snapshot name Signed-off-by: bowenlan-amzn <[email protected]> * Show notification channel name on policy detail page Signed-off-by: bowenlan-amzn <[email protected]> * Helptext word change Signed-off-by: bowenlan-amzn <[email protected]> * Add snapshot management to left side bar Signed-off-by: bowenlan-amzn <[email protected]> * max age unit sync with snapshot frequency type hourly Signed-off-by: bowenlan-amzn <[email protected]> * Notification link to detail in policy detail page Signed-off-by: bowenlan-amzn <[email protected]> (cherry picked from commit 2947db6) Co-authored-by: bowenlan-amzn <[email protected]>
opensearch-project · Jun 28, 2022 · b12299f · b12299f
1 parent f08cbe2
commit b12299f
Show file tree

Hide file tree

Showing 23 changed files with 392 additions and 108 deletions.
diff --git a/models/interfaces.ts b/models/interfaces.ts
@@ -144,7 +144,8 @@ export interface SMSnapshotConfig {
   ignore_unavailable?: boolean;
   include_global_state?: boolean;
   partial?: boolean;
-  date_expression?: string;
+  date_format?: string;
+  date_format_timezone?: string;
 }
 
 export interface SMCreation {

diff --git a/public/index_management_app.tsx b/public/index_management_app.tsx
@@ -22,7 +22,7 @@ import Main from "./pages/Main";
 import { CoreServicesContext } from "./components/core_services";
 import "./app.scss";
 
-export function renderApp(coreStart: CoreStart, params: AppMountParameters) {
+export function renderApp(coreStart: CoreStart, params: AppMountParameters, landingPage: string) {
   const http = coreStart.http;
 
   const indexService = new IndexService(http);
@@ -51,7 +51,7 @@ export function renderApp(coreStart: CoreStart, params: AppMountParameters) {
           <DarkModeContext.Provider value={isDarkMode}>
             <ServicesContext.Provider value={services}>
               <CoreServicesContext.Provider value={coreStart}>
-                <Main {...props} />
+                <Main {...props} landingPage={landingPage} />
               </CoreServicesContext.Provider>
             </ServicesContext.Provider>
           </DarkModeContext.Provider>

diff --git a/public/pages/CreateSnapshotPolicy/components/CronSchedule/CronSchedule.tsx b/public/pages/CreateSnapshotPolicy/components/CronSchedule/CronSchedule.tsx
@@ -34,6 +34,7 @@ interface CronScheduleProps {
   timezone?: string;
   onChangeTimezone?: (timezone: string) => void;
   timezoneError?: string;
+  frequencyTitle?: string;
 }
 
 const CronSchedule = ({
@@ -45,6 +46,7 @@ const CronSchedule = ({
   timezone,
   onChangeTimezone,
   timezoneError,
+  frequencyTitle = "Schedule frequency",
 }: CronScheduleProps) => {
   const { minute: initMin, hour: initHour, dayOfWeek: initWeek, dayOfMonth: initMonth } = parseCronExpression(cronExpression);
 
@@ -152,7 +154,7 @@ const CronSchedule = ({
 
   return (
     <>
-      <CustomLabel title="Schedule frequency" />
+      <CustomLabel title={frequencyTitle} />
       <EuiSelect id="creationCronScheduleType" options={CRON_SCHEDULE_FREQUENCY_TYPE} value={frequencyType} onChange={onTypeChange} />
 
       <EuiSpacer size="m" />
@@ -161,13 +163,15 @@ const CronSchedule = ({
         <EuiFlexItem style={{ maxWidth: 400 }}>
           {frequencyType === "custom" ? (
             <>
-              <CustomLabel title="Cron expression" helpText={cronExpressionHelpText} />
-              <EuiFieldText
-                value={cronExpression}
-                onChange={(e) => {
-                  onCronExpressionChange(e.target.value);
-                }}
-              />
+              <CustomLabel title="Cron expression" />
+              <EuiFormRow helpText={cronExpressionHelpText}>
+                <EuiFieldText
+                  value={cronExpression}
+                  onChange={(e) => {
+                    onCronExpressionChange(e.target.value);
+                  }}
+                />
+              </EuiFormRow>
             </>
           ) : (
             <>

diff --git a/public/pages/CreateSnapshotPolicy/components/Notification/Notification.tsx b/public/pages/CreateSnapshotPolicy/components/Notification/Notification.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React, { ChangeEvent } from "react";
+import { EuiFormRow, EuiSelect, EuiButton, EuiFlexGroup, EuiFlexItem } from "@elastic/eui";
+import "brace/theme/github";
+import "brace/mode/json";
+import { FeatureChannelList } from "../../../../../server/models/interfaces";
+import CustomLabel from "../../../../components/CustomLabel";
+
+interface NotificationProps {
+  channelId: string;
+  channels: FeatureChannelList[];
+  loadingChannels: boolean;
+  onChangeChannelId: (value: ChangeEvent<HTMLSelectElement>) => void;
+  getChannels: () => void;
+}
+
+const Notification = ({ channelId, channels, loadingChannels, onChangeChannelId, getChannels }: NotificationProps) => {
+  return (
+    <>
+      <CustomLabel title="Select notification channels" />
+      <EuiFlexGroup gutterSize="s" style={{ maxWidth: 600 }}>
+        <EuiFlexItem>
+          <EuiFormRow>
+            <EuiSelect
+              id="channel-id"
+              placeholder="Select channel ID"
+              hasNoInitialSelection
+              isLoading={loadingChannels}
+              options={channels.map((channel) => ({ value: channel.config_id, text: channel.name }))}
+              value={channelId}
+              onChange={onChangeChannelId}
+              data-test-subj="create-policy-notification-channel-id"
+            />
+          </EuiFormRow>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButton
+            iconType="refresh"
+            onClick={getChannels}
+            disabled={loadingChannels}
+            className="refresh-button"
+            data-test-subj="channel-notification-refresh"
+          />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButton iconType="popout" href="notifications-dashboards#/channels" target="_blank">
+            Manage channels
+          </EuiButton>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
+  );
+};
+
+export default Notification;
diff --git a/public/pages/CreateSnapshotPolicy/components/Notification/index.ts b/public/pages/CreateSnapshotPolicy/components/Notification/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import Notification from "./Notification";
+
+export default Notification;
diff --git a/public/pages/CreateSnapshotPolicy/constants.ts b/public/pages/CreateSnapshotPolicy/constants.ts
@@ -16,7 +16,7 @@ export const getDefaultSMPolicy = (): SMPolicy => ({
     schedule: {
       cron: {
         expression: "0 20 * * *",
-        timezone: "America/Los_Angeles",
+        timezone: "UTC",
       },
     },
   },
@@ -34,10 +34,13 @@ export const maxAgeUnitOptions = [
   { value: "h", text: "Hours" },
 ];
 
-export const DEFAULT_INDEX_OPTIONS = [{ label: "*" }, { label: "-.opendistro_security" }];
+export const DEFAULT_INDEX_OPTIONS = [{ label: "*" }];
 
 export const ERROR_PROMPT = {
   NAME: "Name must be provided.",
   REPO: "Repository must be provided.",
   TIMEZONE: "Time zone must be provided.",
 };
+
+export const DEFAULT_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
+export const DEFAULT_DATE_FORMAT_TIMEZONE = "UTC";