[Feature/typescript] Moved Api,Domain,helpers,logic from flow to ts

.eslintrc.json

@@ -41,6 +41,7 @@
         "react/require-default-props": "off",
         "react/prop-types": "off",
         "react-hooks/rules-of-hooks": "error", // Checks rules of Hooks
-        "react-hooks/exhaustive-deps": "warn" // Checks effect dependencies
+        "react-hooks/exhaustive-deps": "warn", // Checks effect dependencies
+        "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_", "args": "all"}]
     }
 }

.prettierrc.json

@@ -1,7 +1,7 @@
 {
-    "parser": "babel-flow",
+    "parser": "typescript",
     "printWidth": 100,
     "tabWidth": 4,
     "trailingComma": "es5",
     "endOfLine": "lf"
-}
+}

package.json

@@ -22,7 +22,7 @@
     },
     "dependencies": {
         "@skbkontur/react-icons": "4.1.0",
-        "@skbkontur/react-stack-layout": "1.0.3",
+        "@skbkontur/react-stack-layout": "^1.0.3",
         "@skbkontur/react-ui": "2.4.0",
         "@skbkontur/react-ui-validations": "1.1.3",
         "bundle-loader": "0.5.6",
@@ -60,6 +60,7 @@
         "@storybook/addons": "^5.3.17",
         "@storybook/react": "^5.3.17",
         "@types/classnames": "^2.2.10",
+        "@types/jest": "^26.0.9",
         "@types/react": "^16.9.43",
         "@types/react-dom": "^16.9.8",
         "@types/react-router-dom": "^5.1.5",

src/Api/MoiraApi.js → src/Api/MoiraApi.ts

@@ -1,42 +1,41 @@
-// @flow
-import queryString from "query-string";
-import type { Config } from "../Domain/Config";
-import type { EventList } from "../Domain/Event";
-import type { Trigger, TriggerList, TriggerState } from "../Domain/Trigger";
-import type { Settings } from "../Domain/Settings";
-import type { TagStat } from "../Domain/Tag";
-import type { PatternList } from "../Domain/Pattern";
-import type { NotificationList } from "../Domain/Notification";
-import type { Contact, ContactList } from "../Domain/Contact";
-import type { ContactCreateInfo } from "../Domain/ContactCreateInfo";
-import type { Subscription } from "../Domain/Subscription";
-import type { Schedule } from "../Domain/Schedule";
-import type { NotifierState } from "../Domain/MoiraServiceStates";
-
-export type SubscriptionCreateInfo = {|
-    sched: Schedule,
-    tags: Array<string>,
-    throttling: boolean,
-    contacts: Array<string>,
-    enabled: boolean,
-    any_tags: boolean,
-    user: string,
-    id?: string,
-    ignore_recoverings: boolean,
-    ignore_warnings: boolean,
+import * as queryString from "query-string";
+import { Config } from "../Domain/Config";
+import { EventList } from "../Domain/Event";
+import { Trigger, TriggerList, TriggerState } from "../Domain/Trigger";
+import { Settings } from "../Domain/Settings";
+import { TagStat } from "../Domain/Tag";
+import { PatternList } from "../Domain/Pattern";
+import { NotificationList } from "../Domain/Notification";
+import { Contact, ContactList } from "../Domain/Contact";
+import { ContactCreateInfo } from "../Domain/ContactCreateInfo";
+import { Subscription } from "../Domain/Subscription";
+import { Schedule } from "../Domain/Schedule";
+import { NotifierState } from "../Domain/MoiraServiceStates";
+
+export type SubscriptionCreateInfo = {
+    sched: Schedule;
+    tags: Array<string>;
+    throttling: boolean;
+    contacts: Array<string>;
+    enabled: boolean;
+    any_tags: boolean;
+    user: string;
+    id?: string;
+    ignore_recoverings: boolean;
+    ignore_warnings: boolean;
     plotting?: {
-        enabled: boolean,
-        theme: "light" | "dark",
-    },
-|};
+        enabled: boolean;
+        theme: "light" | "dark";
+    };
+};
 
-export type TagList = {|
-    list: Array<string>,
-|};
+export type TagList = {
+    list: Array<string>;
+};
 
-export type TagStatList = {|
-    list: Array<TagStat>,
-|};
+export type TagStatList = {
+    list: Array<TagStat>;
+};
 
 export interface IMoiraApi {
     getSettings(): Promise<Settings>;
@@ -61,13 +60,27 @@ export interface IMoiraApi {
         tags: Array<string>,
         searchText: string
     ): Promise<TriggerList>;
-    getTrigger(id: string, params: Object): Promise<Trigger>;
-    addTrigger(data: $Shape<Trigger>): Promise<{ [key: string]: string }>;
-    setTrigger(id: string, data: $Shape<Trigger>): Promise<{ [key: string]: string }>;
+    getTrigger(id: string, params?: { populated: boolean }): Promise<Trigger>;
+    addTrigger(
+        data: Partial<Trigger>
+    ): Promise<{
+        [key: string]: string;
+    }>;
+    setTrigger(
+        id: string,
+        data: Partial<Trigger>
+    ): Promise<{
+        [key: string]: string;
+    }>;
     delTrigger(id: string): Promise<void>;
     setMaintenance(
         triggerId: string,
-        data: { trigger?: number, metrics?: { [metric: string]: number } }
+        data: {
+            trigger?: number;
+            metrics?: {
+                [metric: string]: number;
+            };
+        }
     ): Promise<void>;
     getTriggerState(id: string): Promise<TriggerState>;
     getTriggerEvents(id: string, page: number): Promise<EventList>;
@@ -85,7 +98,7 @@ export interface IMoiraApi {
 class ApiError extends Error {
     status: number;
 
-    constructor({ message, status }) {
+    constructor({ message, status }: { message: string; status: number }) {
         super(message);
         this.name = "ApiError";
         this.status = status;
@@ -101,19 +114,19 @@ export { statusCode };
 export default class MoiraApi implements IMoiraApi {
     apiUrl: string;
 
-    config: Config;
+    config?: Config;
 
-    triggerListPageSize: number = 20;
+    triggerListPageSize = 20;
 
-    eventHistoryPageSize: number = 100;
+    eventHistoryPageSize = 100;
 
     constructor(apiUrl: string) {
         this.apiUrl = apiUrl;
     }
 
-    static async checkStatus(response: Response) {
+    static async checkStatus(response: Response): Promise<void> {
         if (!(response.status >= 200 && response.status < 300)) {
-            let serverResponse: { status: string, error: string } | null = null;
+            let serverResponse: { status: string; error: string } | null = null;
             const errorText = await response.text();
             try {
                 serverResponse = JSON.parse(errorText);
@@ -174,7 +187,7 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async testContact(contactId: string) {
+    async testContact(contactId: string): Promise<void> {
         const url = `${this.apiUrl}/contact/${encodeURI(contactId)}/test`;
         const response = await fetch(url, {
             method: "POST",
@@ -219,7 +232,7 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async testSubscription(subscriptionId: string) {
+    async testSubscription(subscriptionId: string): Promise<void> {
         const url = `${this.apiUrl}/subscription/${encodeURI(subscriptionId)}/test`;
         const response = await fetch(url, {
             method: "PUT",
@@ -228,7 +241,7 @@ export default class MoiraApi implements IMoiraApi {
         await MoiraApi.checkStatus(response);
     }
 
-    async deleteContact(contactId: string) {
+    async deleteContact(contactId: string): Promise<void> {
         const url = `${this.apiUrl}/contact/${encodeURI(contactId)}`;
         const response = await fetch(url, {
             method: "DELETE",
@@ -247,7 +260,7 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async delPattern(pattern: string) {
+    async delPattern(pattern: string): Promise<void> {
         const url = `${this.apiUrl}/pattern/${encodeURI(pattern)}`;
         const response = await fetch(url, {
             method: "DELETE",
@@ -276,7 +289,7 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async delTag(tag: string) {
+    async delTag(tag: string): Promise<void> {
         const url = `${this.apiUrl}/tag/${encodeURI(tag)}`;
         const response = await fetch(url, {
             method: "DELETE",
@@ -295,6 +308,7 @@ export default class MoiraApi implements IMoiraApi {
             {
                 /* eslint-disable */
                 p: page,
+
                 /* eslint-enable */
                 size: this.triggerListPageSize,
                 tags,
@@ -311,7 +325,7 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async getTrigger(id: string, params: Object): Promise<Trigger> {
+    async getTrigger(id: string, params?: { populated: boolean }): Promise<Trigger> {
         const url = `${this.apiUrl}/trigger/${encodeURI(id)}${
             params ? `?${queryString.stringify(params)}` : ""
         }`;
@@ -324,7 +338,11 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async addTrigger(data: $Shape<Trigger>): Promise<{ [key: string]: string }> {
+    async addTrigger(
+        data: Partial<Trigger>
+    ): Promise<{
+        [key: string]: string;
+    }> {
         const url = `${this.apiUrl}/trigger`;
         const response = await fetch(url, {
             method: "PUT",
@@ -335,7 +353,12 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async setTrigger(id: string, data: $Shape<Trigger>): Promise<{ [key: string]: string }> {
+    async setTrigger(
+        id: string,
+        data: Partial<Trigger>
+    ): Promise<{
+        [key: string]: string;
+    }> {
         const url = `${this.apiUrl}/trigger/${encodeURI(id)}`;
         const response = await fetch(url, {
             method: "PUT",
@@ -346,7 +369,7 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async delTrigger(id: string) {
+    async delTrigger(id: string): Promise<void> {
         const url = `${this.apiUrl}/trigger/${encodeURI(id)}`;
         const response = await fetch(url, {
             method: "DELETE",
@@ -357,8 +380,13 @@ export default class MoiraApi implements IMoiraApi {
 
     async setMaintenance(
         triggerId: string,
-        data: { trigger?: number, metrics?: { [metric: string]: number } }
-    ) {
+        data: {
+            trigger?: number;
+            metrics?: {
+                [metric: string]: number;
+            };
+        }
+    ): Promise<void> {
         const url = `${this.apiUrl}/trigger/${encodeURI(triggerId)}/setMaintenance`;
         const response = await fetch(url, {
             method: "PUT",
@@ -390,7 +418,7 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async delThrottling(triggerId: string) {
+    async delThrottling(triggerId: string): Promise<void> {
         const url = `${this.apiUrl}/trigger/${encodeURI(triggerId)}/throttling`;
         const response = await fetch(url, {
             method: "DELETE",
@@ -399,7 +427,7 @@ export default class MoiraApi implements IMoiraApi {
         await MoiraApi.checkStatus(response);
     }
 
-    async delMetric(triggerId: string, metric: string) {
+    async delMetric(triggerId: string, metric: string): Promise<void> {
         const url = `${this.apiUrl}/trigger/${encodeURI(triggerId)}/metrics?name=${encodeURI(
             metric
         )}`;
@@ -410,7 +438,7 @@ export default class MoiraApi implements IMoiraApi {
         await MoiraApi.checkStatus(response);
     }
 
-    async delNoDataMetric(triggerId: string) {
+    async delNoDataMetric(triggerId: string): Promise<void> {
         const url = `${this.apiUrl}/trigger/${encodeURI(triggerId)}/metrics/nodata`;
         const response = await fetch(url, {
             method: "DELETE",
@@ -429,7 +457,7 @@ export default class MoiraApi implements IMoiraApi {
         return response.json();
     }
 
-    async delNotification(id: string) {
+    async delNotification(id: string): Promise<void> {
         const url = `${this.apiUrl}/notification?id=${encodeURI(id)}`;
         const response = await fetch(url, {
             method: "DELETE",
@@ -438,7 +466,7 @@ export default class MoiraApi implements IMoiraApi {
         await MoiraApi.checkStatus(response);
     }
 
-    async delAllNotifications() {
+    async delAllNotifications(): Promise<void> {
         const url = `${this.apiUrl}/notification/all`;
         const response = await fetch(url, {
             method: "DELETE",
@@ -447,7 +475,7 @@ export default class MoiraApi implements IMoiraApi {
         await MoiraApi.checkStatus(response);
     }
 
-    async delAllNotificationEvents() {
+    async delAllNotificationEvents(): Promise<void> {
         const url = `${this.apiUrl}/event/all`;
         const response = await fetch(url, {
             method: "DELETE",
@@ -456,7 +484,7 @@ export default class MoiraApi implements IMoiraApi {
         await MoiraApi.checkStatus(response);
     }
 
-    async delSubscription(subscriptionId: string) {
+    async delSubscription(subscriptionId: string): Promise<void> {
         const url = `${this.apiUrl}/subscription/${encodeURI(subscriptionId)}`;
         const response = await fetch(url, {
             method: "DELETE",