Pull request update/240410

bf4c852 OS-7473. Extracting live_demo.json on pod start
d8d9b9b OS-7443. [TS] Cover Greeter component with types
493b160 OS-7450. [TS - KeyValueLabel] Typing improvements and error
fixes
2229069 OS-7472. Fixed layout cleaner

.github/workflows/test_layout_cleaner.yaml

@@ -22,4 +22,4 @@ jobs:
       - name: Build image
         run: bash -x build.sh layout_cleaner build
       - name: Build test image and run tests
-        run: bash -x docker_images/layout_cleaner/run_test.sh
+        run: bash -x docker_images/run_test.sh layout_cleaner

docker_images/layout_cleaner/worker.py

@@ -29,10 +29,10 @@ def rest_cl(self):
         return self._rest_cl
 
     @staticmethod
-    def is_outdated(layout, employees_ids, applications_ids):
+    def is_outdated(layout, employees_ids, tasks_ids):
         if (layout['owner_id'] not in employees_ids or (
                 layout['type'] == 'ml_run_charts_dashboard' and
-                layout['entity_id'] not in applications_ids)):
+                layout['entity_id'] not in tasks_ids)):
             return True
         return False
 
@@ -42,13 +42,13 @@ def clean_layouts(self):
         organizations_ids = [x['id'] for x in organizations['organizations']]
         for organization_id in organizations_ids:
             LOG.info('Start processing for organization %s', organization_id)
-            _, applications = self.rest_cl.application_list(organization_id)
-            applications_ids = [x['id'] for x in applications['applications']]
+            _, tasks = self.rest_cl.task_list(organization_id)
+            tasks_ids = [x['id'] for x in tasks['tasks']]
             _, employees = self.rest_cl.employee_list(organization_id)
             employees_ids = [x['id'] for x in employees['employees']]
             _, layouts = self.rest_cl.layouts_list(organization_id)
             for layout in layouts['layouts']:
-                if self.is_outdated(layout, employees_ids, applications_ids):
+                if self.is_outdated(layout, employees_ids, tasks_ids):
                     LOG.info('Deleting layout %s', layout['id'])
                     self.rest_cl.layout_delete(organization_id, layout['id'])
         LOG.info('Processing completed')

ngui/ui/src/components/BIExport/Components/DetailsSummaryList/DetailsSummaryList.tsx

@@ -98,7 +98,7 @@ const DetailsSummaryList = ({
           key="reason"
           keyMessageId="reason"
           value={lastStatusError}
-          style={{
+          sx={{
             maxWidth: "600px"
           }}
         />

ngui/ui/src/components/Greeter/Greeter.tsx

@@ -1,3 +1,4 @@
+import { ReactNode } from "react";
 import LanguageOutlinedIcon from "@mui/icons-material/LanguageOutlined";
 import Grid from "@mui/material/Grid";
 import Link from "@mui/material/Link";
@@ -21,8 +22,18 @@ import { useIsDownMediaQuery, useIsUpMediaQuery } from "hooks/useMediaQueries";
 import { HYSTAX, LIVE_DEMO } from "urls";
 import { tag as tagHotjar } from "utils/hotjar";
 import { SPACING_4, SPACING_2, SPACING_6 } from "utils/layouts";
+import { isEven } from "utils/math";
 import useStyles from "./Greeter.styles";
 
+type LiveDemoButtonProps = {
+  onClick: () => void;
+};
+
+type GreeterProps = {
+  form: ReactNode;
+  oAuthForm: ReactNode;
+};
+
 const OptScaleLink = () => {
   const { classes, cx } = useStyles();
   const intl = useIntl();
@@ -82,7 +93,7 @@ const ImagesWithCaptions = () => {
   );
 };
 
-const LiveDemoButton = ({ onClick }) => (
+const LiveDemoButton = ({ onClick }: LiveDemoButtonProps) => (
   <Button
     dataTestId="btn_live_demo"
     color="lightYellow"
@@ -93,17 +104,22 @@ const LiveDemoButton = ({ onClick }) => (
   />
 );
 
-const defaultOrder = [0, 1, 2, 3, 4, 5];
+const defaultOrder = [0, 1, 2, 3, 4, 5] as const;
 
 const getVerticalOrder = () => {
   const [evenNumbers, oddNumbers] = defaultOrder.reduce(
-    ([even, odd], curr) => (curr % 2 === 0 ? [[...even, curr], [...odd]] : [[...even], [...odd, curr]]),
+    ([even, odd]: [number[], number[]], curr) => {
+      if (isEven(curr)) {
+        return [[...even, curr], [...odd]];
+      }
+      return [[...even], [...odd, curr]];
+    },
     [[], []]
   );
   return [...evenNumbers, ...oddNumbers];
 };
 
-const Greeter = ({ form, oAuthForm }) => {
+const Greeter = ({ form, oAuthForm }: GreeterProps) => {
   const { classes, cx } = useStyles();
   const theme = useTheme();
   const navigate = useNavigate();

ngui/ui/src/components/KeyValueLabel/KeyValueLabel.tsx

@@ -3,11 +3,19 @@ import { Box } from "@mui/material";
 import Typography, { TypographyOwnProps } from "@mui/material/Typography";
 import { FormattedMessage } from "react-intl";
 
-type KeyValueLabelProps = {
+type KeyType =
+  | {
+      keyMessageId: string;
+      keyText?: never;
+    }
+  | {
+      keyMessageId?: never;
+      keyText: string;
+    };
+
+type KeyValueLabelProps = KeyType & {
   value: ReactNode;
-  variant: TypographyOwnProps["variant"];
-  keyMessageId?: string;
-  keyText?: string;
+  variant?: TypographyOwnProps["variant"];
   isBoldValue?: boolean;
   dataTestIds?: {
     typography?: string;

ngui/ui/src/components/RightsizingFlavorCell/RightsizingFlavorCell.tsx

@@ -4,7 +4,7 @@ import KeyValueLabel from "components/KeyValueLabel/KeyValueLabel";
 const RightsizingFlavorCell = ({ flavorName, flavorCpu }) => (
   <CaptionedCell
     caption={{
-      node: <KeyValueLabel keyMessageId="cpu" value={flavorCpu} isBoldValue={false} typographyProps={{ variant: "caption" }} />
+      node: <KeyValueLabel keyMessageId="cpu" value={flavorCpu} isBoldValue={false} variant="caption" />
     }}
   >
     {flavorName}

ngui/ui/src/components/UpcomingBooking/UpcomingBooking.tsx

@@ -43,8 +43,8 @@ const UpcomingBooking = ({ employeeName, acquiredSince, releasedAt }) => {
   return (
     <>
       <KeyValueLabel keyMessageId="user" value={employeeName} />
-      <KeyValueLabel keyMessageId="since" valueWhiteSpace="nowrap" value={bookedSince} />
-      <KeyValueLabel keyMessageId="until" valueWhiteSpace="nowrap" value={bookedUntil} />
+      <KeyValueLabel keyMessageId="since" value={bookedSince} />
+      <KeyValueLabel keyMessageId="until" value={bookedUntil} />
       <BookingTimeMeasure messageId="duration" measure={duration} />
     </>
   );

ngui/ui/src/stories/Components/KeyValueLabel.stories.tsx

@@ -3,20 +3,12 @@ import KeyValueLabel from "components/KeyValueLabel";
 export default {
   component: KeyValueLabel,
   argTypes: {
-    separator: {
-      name: "Separator",
-      control: "select",
-      options: ["colon", "hyphen"],
-      defaultValue: "colon"
-    },
-    messageId: { name: "Message ID", control: "text", defaultValue: "name" },
-    text: { name: "Text", control: "text", defaultValue: "" },
+    keyMessageId: { name: "Key message id", control: "text", defaultValue: "name" },
+    keyText: { name: "Key text", control: "text", defaultValue: "" },
     value: { name: "Value", control: "text", defaultValue: "value" }
   }
 };
 
-export const basic = () => <KeyValueLabel messageId="name" value="value" />;
+export const basic = () => <KeyValueLabel keyMessageId="name" value="value" />;
 
-export const withKnobs = (args) => (
-  <KeyValueLabel messageId={args.messageId} text={args.text} value={args.value} separator={args.separator} />
-);
+export const withKnobs = (args) => <KeyValueLabel keyMessageId={args.keyMessageId} keyText={args.keyText} value={args.value} />;

ngui/ui/src/utils/math.ts

@@ -51,3 +51,5 @@ export const denormalize = (normalizedValue, domain, range) => {
 
   return denormalized;
 };
+
+export const isEven = (value: number) => value % 2 === 0;

rest_api/rest_api_server/controllers/live_demo.py

@@ -4,7 +4,6 @@
 import logging
 import os
 import uuid
-import tarfile
 from collections import defaultdict
 from json.decoder import JSONDecodeError
 from kombu.pools import producers
@@ -45,7 +44,6 @@
 DEMO_USER_NAME = 'Demo User'
 EMAIL_TEMPLATE = '%[email protected]'
 PRESET_FILENAME = 'rest_api/live_demo.json'
-PRESET_TAR_XZ = 'rest_api/live_demo.tar.xz'
 DUPLICATION_MODULE_NAMES = {'abandoned_instances', 'rightsizing_instances'}
 DUPLICATION_COUNT = 3
 TOP_NO_DUPLICATE_RESOURCES = 10
@@ -361,21 +359,13 @@ def _get_basic_params():
         return org, name, email, passwd
 
     @staticmethod
-    def load_preset(path=None, tar_path=None):
-        if not os.path.exists(path) and not os.path.exists(tar_path):
-            raise InternalServerError(Err.OE0452, [])
+    def load_preset(path=None):
         if not os.path.exists(path):
-            try:
-                with tarfile.open(tar_path, 'r:xz') as f:
-                    f.extract(
-                        os.path.basename(PRESET_FILENAME),
-                        path=os.path.dirname(PRESET_FILENAME))
-            except FileNotFoundError:
-                raise InternalServerError(Err.OE0452, [])
+            raise InternalServerError(Err.OE0452, [])
         try:
             with open(path, 'r') as f:
                 return json.load(f)
-        except (JSONDecodeError, FileNotFoundError):
+        except JSONDecodeError:
             raise InternalServerError(Err.OE0450, [])
 
     def duplicate_resource(self, preset_object, duplication_resource_info_map):
@@ -1368,7 +1358,7 @@ def _create(self, pregenerate=False):
             self.session, self._config, self.token
         ).get_or_create_profiling_token(organization.id)
 
-        preset = self.load_preset(PRESET_FILENAME, PRESET_TAR_XZ)
+        preset = self.load_preset(PRESET_FILENAME)
         employee_id_to_replace = self.get_replacement_employee(preset)
         self.init_duplication_resources(preset)
         try:

rest_api/rest_api_server/server.py

@@ -1,6 +1,7 @@
 import os
 import logging
 import argparse
+import tarfile
 import tornado.ioloop
 import pydevd_pycharm
 from etcd import Lock as EtcdLock
@@ -29,6 +30,9 @@
 BASE_URL_PREFIX = "/restapi"
 URL_PREFIX_v2 = "/restapi/v2"
 
+PRESET_FILENAME = 'rest_api/live_demo.json'
+PRESET_TAR_XZ = 'rest_api/live_demo.tar.xz'
+
 
 def get_handlers(handler_kwargs, version=None):
     result = []
@@ -584,6 +588,13 @@ def main():
     args = parser.parse_args()
 
     app = make_app(DBType.MySQL, args.etcdhost, args.etcdport, wait=True)
+    try:
+        with tarfile.open(PRESET_TAR_XZ, 'r:xz') as f:
+            f.extract(
+                os.path.basename(PRESET_FILENAME),
+                path=os.path.dirname(PRESET_FILENAME))
+    except Exception as exc:
+        LOG.exception(exc)
     LOG.info("start listening on port %d", DEFAULT_PORT)
     app.listen(DEFAULT_PORT, decompress_request=True)
     tornado.ioloop.IOLoop.instance().start()