Revert commits planned for 1.1 from 1.0 branch

cypress/integration/managed_indices_spec.js

@@ -215,8 +215,8 @@ describe("Managed indices", () => {
       // Confirm we got the change policy toaster
       cy.contains("Changed policy on 1 indices");
 
-      // Click back to Managed Indices page by clicking "Managed indices" breadcrumb
-      cy.contains("Managed indices").click();
+      // Click back to Managed Indices page
+      cy.contains("Managed Indices").click();
 
       // Speed up execution of managed index
       cy.updateManagedIndexConfigStartTime(SAMPLE_INDEX);

cypress/integration/policies_spec.js

@@ -53,12 +53,6 @@ describe("Policies", () => {
       // Route us to create policy page
       cy.contains("Create policy").click({ force: true });
 
-      // Route us to create policy page
-      cy.contains("JSON editor").click({ force: true });
-
-      // Route us to create policy page
-      cy.contains("Continue").click({ force: true });
-
       // Wait for input to load and then type in the policy ID
       cy.get(`input[placeholder="hot_cold_workflow"]`).type(POLICY_ID, { force: true });
 
@@ -103,12 +97,6 @@ describe("Policies", () => {
       // Click Edit button
       cy.get(`[data-test-subj="EditButton"]`).click({ force: true });
 
-      // Route us to edit policy page
-      cy.contains("JSON editor").click({ force: true });
-
-      // Route us to edit policy page
-      cy.contains("Continue").click({ force: true });
-
       // Wait for initial policy JSON to load
       cy.contains("A simple description");
 
@@ -188,26 +176,4 @@ describe("Policies", () => {
       });
     });
   });
-
-  describe("can be viewed", () => {
-    before(() => {
-      cy.deleteAllIndices();
-      cy.createPolicy(POLICY_ID, samplePolicy);
-    });
-
-    it("successfully", () => {
-      cy.contains(POLICY_ID);
-
-      cy.get(`[data-test-subj="policyLink_${POLICY_ID}"]`).click({ force: true });
-
-      cy.contains(POLICY_ID);
-      cy.contains(samplePolicy.policy.description);
-      samplePolicy.policy.states.forEach((state, i) => {
-        cy.contains(state.name);
-      });
-
-      cy.get(`[data-test-subj="viewButton"]`).click({ force: true });
-      cy.contains(`View JSON of ${POLICY_ID}`);
-    });
-  })
 });

models/interfaces.ts

@@ -26,8 +26,6 @@
 
 // TODO: Backend has PR out to change this model, this needs to be updated once that goes through
 
-import { ActionType } from "../public/pages/VisualCreatePolicy/utils/constants";
-
 export interface ManagedIndexMetaData {
   index: string;
   indexUuid: string;
@@ -89,186 +87,19 @@ export interface DocumentTransform {
   metadata: any;
 }
 
+// TODO: Fill out when needed
+// TODO: separate a frontend Policy from backendPolicy
 export interface Policy {
   description: string;
   default_state: string;
-  error_notification?: ErrorNotification | null;
   states: State[];
-  ism_template?: ISMTemplate[] | ISMTemplate | null;
-  last_updated_time?: string;
-  schema_version?: number;
-}
-
-export interface ErrorNotification {
-  destination?: Destination;
-  channel?: Channel;
-  message_template: MessageTemplate;
-}
-
-export interface Channel {
-  id: string;
-}
-
-export interface Destination {
-  chime?: {
-    url: string;
-  };
-  slack?: {
-    url: string;
-  };
-  custom_webhook?: {
-    url: string;
-    [other: string]: any; // custom webhook also allows users to create by part including customizing headers/query params, port/host, etc.
-  };
-}
-
-export interface MessageTemplate {
-  source: string;
-  lang?: string;
-}
-
-export interface ISMTemplate {
-  index_patterns: string[];
-  priority: number;
+  ism_template: any;
 }
 
 export interface State {
   name: string;
-  actions?: Action[];
-  transitions?: Transition[];
-}
-
-export interface Action {
-  timeout?: string;
-  retry?: Retry;
-  [action: string]: any;
-}
-
-export interface Retry {
-  count?: number;
-  backoff?: string;
-  delay?: string;
-}
-
-export interface UIAction<Data> {
-  action: Data;
-  id: string;
-  type: ActionType | string;
-  render: (uiAction: UIAction<Data>, onChangeAction: (uiAction: UIAction<Data>) => void) => JSX.Element | null;
-  clone: (action: Data) => UIAction<Data>;
-  content: () => JSX.Element | string | null;
-  toAction: () => Action;
-}
-
-export interface ForceMergeAction extends Action {
-  force_merge: {
-    max_num_segments: number;
-  };
-}
-
-export interface ReadOnlyAction extends Action {
-  read_only: {};
-}
-
-export interface ReadWriteAction extends Action {
-  read_write: {};
-}
-
-export interface ReplicaCountAction extends Action {
-  replica_count: {
-    number_of_replicas: number;
-  };
-}
-
-export interface CloseAction extends Action {
-  close: {};
-}
-
-export interface OpenAction extends Action {
-  open: {};
-}
-
-export interface DeleteAction extends Action {
-  delete: {};
-}
-
-export interface RolloverAction extends Action {
-  rollover: {
-    min_size?: string;
-    min_doc_count?: number;
-    min_index_age?: string;
-  };
-}
-
-export interface UITransition {
-  transition: Transition;
-  id: string;
-}
-
-export interface Transition {
-  state_name: string;
-  conditions?: Condition;
-}
-
-export interface Condition {
-  min_index_age?: string;
-  min_doc_count?: number;
-  min_size?: string;
-  cron?: Cron;
-}
-
-export interface Cron {
-  cron: InnerCron;
-}
-
-export interface InnerCron {
-  expression: string;
-  timezone: string;
-}
-
-export interface NotificationAction extends Action {
-  notification: {
-    destination?: Destination;
-    channel?: {
-      id: string;
-    };
-    message_template: MessageTemplate;
-  };
-  notificationJsonString?: string;
-}
-
-export interface SnapshotAction extends Action {
-  snapshot: {
-    repository: string;
-    snapshot: string;
-  };
-}
-
-export interface IndexPriorityAction extends Action {
-  index_priority: {
-    priority: number;
-  };
-}
-
-export interface AllocationAction extends Action {
-  allocation: {
-    require: {
-      [key: string]: string;
-    };
-    include: {
-      [key: string]: string;
-    };
-    exclude: {
-      [key: string]: string;
-    };
-    wait_for: boolean;
-  };
-}
-
-export interface RollupAction extends Action {
-  rollup: {
-    jsonString: string;
-  };
+  actions: object[];
+  transitions: object[];
 }
 
 export interface Rollup {

public/app.scss

@@ -12,41 +12,3 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-
-// Copies over styling from eui library to be used in custom classes
-// Core
-$euiColorPrimary: #006BB4 !default;
-$euiColorDarkestShade: #343741 !default;
-$euiColorGhost: #FFF !default;
-$euiColorInk: #000 !default;
-$euiTextColor: $euiColorDarkestShade !default;
-
-.selected-radio-panel {
-  background-color: tintOrShade($euiColorPrimary, 90%, 70%);
-  border-color: $euiColorPrimary;
-}
-
-@function tintOrShade($color, $tint, $shade) {
-  @if (lightness($euiTextColor) > 50) {
-    @return shade($color, $shade);
-  } @else {
-    @return tint($color, $tint);
-  }
-}
-
-@function tint($color, $percent) {
-  @return mix($euiColorGhost, $color, $percent);
-}
-
-@function shade($color, $percent) {
-  @return mix($euiColorInk, $color, $percent);
-}
-
-.refresh-button {
-  min-width: 0;
-  .euiButtonContent {
-    .euiButton__text {
-      margin: 0;
-    }
-  }
-}

public/components/ConfirmationModal/ConfirmationModal.tsx

@@ -39,28 +39,18 @@ import {
 
 interface ConfirmationModalProps {
   title: string;
-  bodyMessage: string | JSX.Element;
+  bodyMessage: string;
   actionMessage: string;
-  actionProps?: object;
-  modalProps?: object;
   onClose: () => void;
   onAction: () => void;
 }
 
-const ConfirmationModal: React.SFC<ConfirmationModalProps> = ({
-  title,
-  bodyMessage,
-  actionMessage,
-  onClose,
-  onAction,
-  actionProps = {},
-  modalProps = {},
-}) => {
+const ConfirmationModal: React.SFC<ConfirmationModalProps> = ({ title, bodyMessage, actionMessage, onClose, onAction }) => {
   return (
     <EuiOverlayMask>
       {/*
       // @ts-ignore */}
-      <EuiModal onCancel={onClose} onClose={onClose} maxWidth={1000} {...modalProps}>
+      <EuiModal onCancel={onClose} onClose={onClose} maxWidth={1000}>
         <EuiModalHeader>
           <EuiModalHeaderTitle>{title}</EuiModalHeaderTitle>
         </EuiModalHeader>
@@ -78,7 +68,6 @@ const ConfirmationModal: React.SFC<ConfirmationModalProps> = ({
             }}
             fill
             data-test-subj="confirmationModalActionButton"
-            {...actionProps}
           >
             {actionMessage}
           </EuiButton>