chore: lint

awslabs · Sep 19, 2024 · 3e5612d · 3e5612d
1 parent a6c7527
commit 3e5612d
Show file tree

Hide file tree

Showing 7 changed files with 102 additions and 75 deletions.
diff --git a/...itor/iotSiteWiseQueryEditor/assetModelDataStreamExplorer/assetModelDataStreamExplorer.tsx b/...itor/iotSiteWiseQueryEditor/assetModelDataStreamExplorer/assetModelDataStreamExplorer.tsx
@@ -26,7 +26,12 @@ import { getPlugin } from '@iot-app-kit/core';
 import { ResourceExplorerFooter } from '../footer/footer';
 import { createNonNullableList } from '~/helpers/lists/createNonNullableList';
 import { DashboardWidget } from '~/types';
-import { AlarmExplorer, AlarmExplorerProps, AssetResource, useGetConfigValue } from '@iot-app-kit/react-components';
+import {
+  AlarmExplorer,
+  AlarmExplorerProps,
+  AssetResource,
+  useGetConfigValue,
+} from '@iot-app-kit/react-components';
 import { useAssetsForAssetModel } from './assetsForAssetModelSelect/useAssetsForAssetModel/useAssetsForAssetModel';
 import { ExpandableSection } from '@cloudscape-design/components';
 import { ExpandableSectionHeading } from '../components/expandableSectionHeading';
@@ -71,7 +76,8 @@ export const AssetModelDataStreamExplorer = ({
     ({ id }) => id === assetIds?.at(0)
   );
 
-  const { assetModels, updateAssetModels, uppdateAssetAlarmModels } = useModelBasedQuerySelection();
+  const { assetModels, updateAssetModels, uppdateAssetAlarmModels } =
+    useModelBasedQuerySelection();
 
   const { propertyIds } = getAssetModelQueryInformation(assetModels);
 
@@ -150,9 +156,9 @@ export const AssetModelDataStreamExplorer = ({
         createAlarmModelQuery({
           assetModelId: selectedAssetModel[0].assetModelId,
           assetId: selectedAsset?.at(0)?.assetId,
-          alarms: selectedAlarms
+          alarms: selectedAlarms,
         })
-      )
+      );
     }
   };
 
@@ -183,50 +189,59 @@ export const AssetModelDataStreamExplorer = ({
             <HorizontalDivider />
           </Box>
 
-          {
-            alarmsFeatureOn ? 
-              (
-                <>
-                  <ExpandableSection
-                    headerText={<ExpandableSectionHeading headerText='Data Streams' />}
-                    defaultExpanded
-                  >
-                    <AssetModelPropertiesExplorer
-                        {...assetModelPropertiesExplorerProps}
-                      />
-                  </ExpandableSection>
-                  <ExpandableSection
-                    headerText={
-                      <ExpandableSectionHeading headerText='Alarm Data Streams' />
-                    }
-                  >
-                    <AlarmExplorer
-                      iotSiteWiseClient={iotSiteWiseClient}
-                      parameters={selectedAsset.length > 0 ? selectedAsset : selectedAssetModel}
-                      selectionMode={correctSelectionMode}
-                      onSelectAlarm={setSelectedAlarms}
-                      selectedAlarms={selectedAlarms}
-                      tableSettings={{
-                        isFilterEnabled: true,
-                        isUserSettingsEnabled: true,
-                      }}
-                      ariaLabels={{
-                        resizerRoleDescription: 'Resize button',
-                        itemSelectionLabel: ({ selectedItems }, modeledDataStream) =>
-                          alarmSelectionLabel([...selectedItems], modeledDataStream),
-                      }}
-                      description='Select an alarm to add to a selected widget'
-                      timeZone={timeZone}
-                      significantDigits={significantDigits}
-                    />
-                  </ExpandableSection>
-                </>
-              ) : (
+          {alarmsFeatureOn ? (
+            <>
+              <ExpandableSection
+                headerText={
+                  <ExpandableSectionHeading headerText='Data Streams' />
+                }
+                defaultExpanded
+              >
                 <AssetModelPropertiesExplorer
                   {...assetModelPropertiesExplorerProps}
                 />
-              )
-          }
+              </ExpandableSection>
+              <ExpandableSection
+                headerText={
+                  <ExpandableSectionHeading headerText='Alarm Data Streams' />
+                }
+              >
+                <AlarmExplorer
+                  iotSiteWiseClient={iotSiteWiseClient}
+                  parameters={
+                    selectedAsset.length > 0
+                      ? selectedAsset
+                      : selectedAssetModel
+                  }
+                  selectionMode={correctSelectionMode}
+                  onSelectAlarm={setSelectedAlarms}
+                  selectedAlarms={selectedAlarms}
+                  tableSettings={{
+                    isFilterEnabled: true,
+                    isUserSettingsEnabled: true,
+                  }}
+                  ariaLabels={{
+                    resizerRoleDescription: 'Resize button',
+                    itemSelectionLabel: (
+                      { selectedItems },
+                      modeledDataStream
+                    ) =>
+                      alarmSelectionLabel(
+                        [...selectedItems],
+                        modeledDataStream
+                      ),
+                  }}
+                  description='Select an alarm to add to a selected widget'
+                  timeZone={timeZone}
+                  significantDigits={significantDigits}
+                />
+              </ExpandableSection>
+            </>
+          ) : (
+            <AssetModelPropertiesExplorer
+              {...assetModelPropertiesExplorerProps}
+            />
+          )}
 
           <ResourceExplorerFooter
             addDisabled={addButtonDisabled}

diff --git a/.../queryEditor/iotSiteWiseQueryEditor/assetModelDataStreamExplorer/createAlarmModelQuery.ts b/.../queryEditor/iotSiteWiseQueryEditor/assetModelDataStreamExplorer/createAlarmModelQuery.ts
@@ -7,12 +7,14 @@ export const createAlarmModelQuery = ({
   alarms,
 }: {
   assetModelId: string;
-  alarms: NonNullable<AlarmExplorerProps['selectedAlarms']>
+  alarms: NonNullable<AlarmExplorerProps['selectedAlarms']>;
   assetId?: string;
 }): SiteWiseAlarmAssetModelQuery['alarmModels'] => [
   {
     assetModelId: assetModelId,
     assetIds: assetId ? [assetId] : [],
-    alarmComponents: alarms.map(({ assetCompositeModelId }) => ({ assetCompositeModelId })),
+    alarmComponents: alarms.map(({ assetCompositeModelId }) => ({
+      assetCompositeModelId,
+    })),
   },
 ];
diff --git a/...seQueryEditor/assetModelDataStreamExplorer/modelBasedQuery/useModelBasedQuerySelection.ts b/...seQueryEditor/assetModelDataStreamExplorer/modelBasedQuery/useModelBasedQuerySelection.ts
@@ -3,11 +3,13 @@ import { QueryConfigWidget, isQueryWidget } from './findModelBasedQueryWidgets';
 import { QueryProperties } from '~/customization/widgets/types';
 import { isJust, maybeWithDefault } from '~/util/maybe';
 import { noop } from 'lodash';
-import { AssetModelQuery } from '@iot-app-kit/source-iotsitewise';
+import {
+  AssetModelQuery,
+  AlarmAssetModelQuery,
+} from '@iot-app-kit/source-iotsitewise';
 import { styledQueryWidgetOnDrop } from '~/components/queryEditor/useQuery';
 import { assignDefaultStyles } from '~/customization/widgets/utils/assignDefaultStyleSettings';
 import { IoTSiteWiseDataStreamQuery } from '~/types';
-import { AlarmAssetModelQuery } from '@iot-app-kit/source-iotsitewise';
 
 const mergeAssetModelProperties = (
   currentQuery: QueryConfigWidget['properties']['queryConfig']['query'],
@@ -49,7 +51,8 @@ const mergeAlarmModelCompositeModelIds = (
         )
         ?.alarmComponents.find(
           (currentAlarmModelAlarm) =>
-            currentAlarmModelAlarm.assetCompositeModelId === alarm.assetCompositeModelId
+            currentAlarmModelAlarm.assetCompositeModelId ===
+            alarm.assetCompositeModelId
         );
       return {
         ...currentAlarm,
@@ -102,7 +105,7 @@ export const useModelBasedQuerySelection = () => {
           alarmModels: mergeAlarmModelCompositeModelIds(
             compositeWidgetForAggregationInformation.properties.queryConfig
               .query,
-              updatedAlarmModels
+            updatedAlarmModels
           ),
         },
         compositeWidgetForAggregationInformation
@@ -118,7 +121,6 @@ export const useModelBasedQuerySelection = () => {
           },
         },
       };
-
     } else {
       const styledProperties = assignDefaultStyles({
         ...compositeWidgetForAggregationInformation,
@@ -132,7 +134,7 @@ export const useModelBasedQuerySelection = () => {
               alarmModels: mergeAlarmModelCompositeModelIds(
                 compositeWidgetForAggregationInformation.properties.queryConfig
                   .query,
-                  updatedAlarmModels
+                updatedAlarmModels
               ),
             },
           },
@@ -145,7 +147,7 @@ export const useModelBasedQuerySelection = () => {
 
     setProperties(updatedProperties);
   };
-  
+
   const updateAssetModels = (
     updatedAssetModels: AssetModelQuery[] | undefined
   ) => {
@@ -183,7 +185,6 @@ export const useModelBasedQuerySelection = () => {
           },
         },
       };
-
     } else {
       const styledProperties = assignDefaultStyles({
         ...compositeWidgetForAggregationInformation,

diff --git a/...src/components/queryEditor/iotSiteWiseQueryEditor/components/expandableSectionHeading.tsx b/...src/components/queryEditor/iotSiteWiseQueryEditor/components/expandableSectionHeading.tsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import { fontSizeHeadingL } from '@cloudscape-design/design-tokens';
 
-export const ExpandableSectionHeading = ({ headerText }: { headerText: string }) => (
-  <h3 style={{ margin: 0, fontSize: fontSizeHeadingL }}>{headerText}</h3>
-);
+export const ExpandableSectionHeading = ({
+  headerText,
+}: {
+  headerText: string;
+}) => <h3 style={{ margin: 0, fontSize: fontSizeHeadingL }}>{headerText}</h3>;
diff --git a/...ard/src/components/queryEditor/iotSiteWiseQueryEditor/modeledExplorer/modeledExplorer.tsx b/...ard/src/components/queryEditor/iotSiteWiseQueryEditor/modeledExplorer/modeledExplorer.tsx
@@ -100,10 +100,7 @@ export const ModeledExplorer = ({
         isUserSettingsEnabled: true,
       }}
       isAssetPropertyDisabled={(item) =>
-        isModeledPropertyInvalid(
-          item.dataType,
-          selectedWidgets.at(0)?.type
-        )
+        isModeledPropertyInvalid(item.dataType, selectedWidgets.at(0)?.type)
       }
       ariaLabels={{
         resizerRoleDescription: 'Resize button',
@@ -141,14 +138,16 @@ export const ModeledExplorer = ({
               : `Deselect asset ${asset.name}`,
         }}
       />
-      {selectedAssets.length > 0 && (
-        alarmsFeatureOn ?
-          (<>
+      {selectedAssets.length > 0 &&
+        (alarmsFeatureOn ? (
+          <>
             <ExpandableSection
-              headerText={<ExpandableSectionHeading headerText='Data Streams' />}
+              headerText={
+                <ExpandableSectionHeading headerText='Data Streams' />
+              }
               defaultExpanded
             >
-              { AssetExplorerComponent }
+              {AssetExplorerComponent}
             </ExpandableSection>
             <ExpandableSection
               headerText={
@@ -175,9 +174,10 @@ export const ModeledExplorer = ({
                 significantDigits={significantDigits}
               />
             </ExpandableSection>
-          </>) :
+          </>
+        ) : (
           AssetExplorerComponent
-      )}
+        ))}
       <ResourceExplorerFooter
         addDisabled={addButtonDisabled}
         onReset={resetPropertiesAndAlarms}

diff --git a/packages/dashboard/src/customization/widgets/lineScatterChart/component.tsx b/packages/dashboard/src/customization/widgets/lineScatterChart/component.tsx
@@ -165,7 +165,7 @@ const LineScatterChartWidgetComponent: React.FC<LineScatterChartWidget> = (
   } = widget.properties;
 
   const query = queryConfig.query;
-  console.log(query)
+  console.log(query);
   const queries = useQueries(query);
 
   const mappedQuery = assetModelQueryToSiteWiseAssetQuery(query);

diff --git a/packages/dashboard/src/customization/widgets/utils/alarmModelQueryToAlarmQuery.ts b/packages/dashboard/src/customization/widgets/utils/alarmModelQueryToAlarmQuery.ts
@@ -1,7 +1,10 @@
-import { AlarmAssetModelQuery, SiteWiseAlarmQuery } from "@iot-app-kit/source-iotsitewise";
-import { SiteWiseQueryConfig } from "../types";
-import uniq from "lodash/uniq";
-import unionBy from "lodash/unionBy";
+import {
+  AlarmAssetModelQuery,
+  SiteWiseAlarmQuery,
+} from '@iot-app-kit/source-iotsitewise';
+import { SiteWiseQueryConfig } from '../types';
+import uniq from 'lodash/uniq';
+import unionBy from 'lodash/unionBy';
 
 type AlarmModelQueryWithAssetId = Required<AlarmAssetModelQuery>;
 const alarmModelWithAssetId = (
@@ -29,7 +32,11 @@ const combineAlarms = (
     if (foundA && foundB) {
       return {
         ...foundA,
-        alarmComponents: unionBy(foundA.alarmComponents, foundB.alarmComponents, 'assetCompositeModelId'),
+        alarmComponents: unionBy(
+          foundA.alarmComponents,
+          foundB.alarmComponents,
+          'assetCompositeModelId'
+        ),
       };
     }