[UPDATE] additional work

Author: Restop-4512

.bra.toml

@@ -1,23 +1,15 @@
 [run]
 init_cmds = [
-  ["make","GO_BUILD_DEV=1", "build-go"],
-  ["make", "gen-jsonnet"],
-  ["./bin/grafana", "server", "-profile", "-profile-addr=127.0.0.1", "-profile-port=6000", "-profile-block-rate=1", "-profile-mutex-rate=5", "-packaging=dev", "cfg:app_mode=development"]
+  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development","--log-level=none"]
 ]
 watch_all = true
 follow_symlinks = true
 watch_dirs = [
-  "$WORKDIR/apps",
-  "$WORKDIR/pkg",
-  "$WORKDIR/public/views",
-  "$WORKDIR/conf",
-  "$WORKDIR/devenv/dev-dashboards",
+
 ]
-watch_exts = [".go", ".ini", ".toml", ".template.html"]
+watch_exts = []
 ignore_files = [".*_gen.go"]
 build_delay = 1500
 cmds = [
-  ["make", "GO_BUILD_DEV=1", "build-go-fast"],
-  ["make", "gen-jsonnet"],
-  ["./bin/grafana", "server", "-profile", "-profile-addr=127.0.0.1", "-profile-port=6000", "-profile-block-rate=1", "-profile-mutex-rate=5", "-packaging=dev", "cfg:app_mode=development"]
+  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development","--log-level=none"]
 ]

Makefile

@@ -257,8 +257,8 @@ run: ## Build and run web server on filesystem changes. See /.bra.toml for confi
 
 .PHONY: run-go
 run-go: ## Build and run web server immediately.
-	$(GO) run -race $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS)) \
-		./pkg/cmd/grafana -- server -profile -profile-addr=127.0.0.1 -profile-port=6000 -packaging=dev cfg:app_mode=development
+	$(GO) run  $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS)) \
+		./pkg/cmd/grafana -- server -packaging=dev cfg:app_mode=development --log-level=none
 
 .PHONY: run-frontend
 run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild

package.json

@@ -47,7 +47,8 @@
     "start": "NODE_ENV=dev nx exec -- webpack --config scripts/webpack/webpack.dev.js --watch",
     "start:liveReload": "yarn start -- --env liveReload=1",
     "start:noTsCheck": "yarn start -- --env noTsCheck=1",
-    "start:noLint": "yarn start -- --env noTsCheck=1 --env noLint=1",
+    "start:noLint": "yarn start -- --env noLint=1",
+    "start2": "yarn start -- --env liveReload=1 --env noLint=1",
     "stats": "webpack --mode production --config scripts/webpack/webpack.prod.js --profile --json > compilation-stats.json",
     "storybook": "yarn workspace @grafana/ui storybook --ci",
     "storybook:build": "yarn workspace @grafana/ui storybook:build",
@@ -316,6 +317,7 @@
     "@visx/shape": "3.12.0",
     "@visx/tooltip": "3.12.0",
     "@welldone-software/why-did-you-render": "8.0.3",
+    "@windmillcode/grafana-ui": "workspace:*",
     "ansicolor": "2.0.3",
     "baron": "3.0.3",
     "brace": "0.11.1",

packages/grafana-ui/src/components/ClipboardButton/ClipboardButton.tsx

@@ -4,7 +4,7 @@ import * as React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { t } from '../../../src/utils/i18n';
+import { t } from '../../utils/i18n';
 import { useStyles2 } from '../../themes';
 import { Button, ButtonProps } from '../Button';
 import { Icon } from '../Icon/Icon';

packages/grafana-ui/src/components/ContextMenu/WithContextMenu.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import * as React from 'react';
 
-import { ContextMenu } from '../ContextMenu/ContextMenu';
+import { ContextMenu } from './ContextMenu';
 
 export interface WithContextMenuProps {
   /** Menu item trigger that accepts openMenu prop */

packages/grafana-ui/src/components/DataSourceSettings/AlertingSettings.tsx

@@ -1,6 +1,6 @@
 import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
 
-import { InlineSwitch } from '../../components/Switch/Switch';
+import { InlineSwitch } from '../Switch/Switch';
 import { t, Trans } from '../../utils/i18n';
 import { InlineField } from '../Forms/InlineField';
 

packages/grafana-ui/src/components/DataSourceSettings/BasicAuthSettings.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { InlineField } from '../../components/Forms/InlineField';
+import { InlineField } from '../Forms/InlineField';
 import { t } from '../../utils/i18n';
 import { FormField } from '../FormField/FormField';
 import { SecretFormField } from '../SecretFormField/SecretFormField';

packages/grafana-ui/src/components/DataSourceSettings/SecureSocksProxySettings.tsx

@@ -1,6 +1,6 @@
 import { DataSourceJsonData, DataSourcePluginOptionsEditorProps } from '@grafana/data';
 
-import { InlineSwitch } from '../../components/Switch/Switch';
+import { InlineSwitch } from '../Switch/Switch';
 import { t, Trans } from '../../utils/i18n';
 import { InlineField } from '../Forms/InlineField';
 

packages/grafana-ui/src/components/DateTimePickers/DateTimePicker/DateTimePicker.tsx

@@ -19,9 +19,8 @@ import {
   AppEvents,
 } from '@grafana/data';
 import { Components } from '@grafana/e2e-selectors';
-
+import { t, Trans } from '../../../utils/i18n';
 import { useStyles2, useTheme2 } from '../../../themes';
-import { t } from '../../../utils/i18n';
 import { Button } from '../../Button/Button';
 import { InlineField } from '../../Forms/InlineField';
 import { Icon } from '../../Icon/Icon';
@@ -101,7 +100,6 @@ export const DateTimePicker = ({
     minuteStep,
     manualInputIsEnabled,
   });
-  return <h1>Dummy</h1>
   const [isOpen, setOpen] = useState(false);
 
   const ref = useRef<HTMLDivElement>(null);
@@ -437,10 +435,10 @@ const DateTimeCalendar = React.forwardRef<HTMLDivElement, DateTimeCalendarProps>
         </div>
         <Stack>
           <Button type="button" onClick={handleApply}>
-            <p >Apply</p>
+            <Trans i18nKey="grafana-ui.date-time-picker.apply">Apply</Trans>
           </Button>
           <Button variant="secondary" type="button" onClick={onClose}>
-            <p >Cancel</p>
+            <Trans i18nKey="grafana-ui.date-time-picker.cancel">Cancel</Trans>
           </Button>
         </Stack>
       </div>

packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimeRangeLabel.tsx

@@ -3,7 +3,7 @@ import { memo } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 
-import { useStyles2 } from '../../../../src/themes';
+import { useStyles2 } from '../../../themes';
 import { TimePickerButtonLabel, TimeRangePickerProps } from '../TimeRangePicker';
 import { isValidTimeRange } from '../utils';