= ({
1 ? 's' : ''
+ selectedWidgetIds.length > 1 ? 's' : ''
}?`}
cancelTitle='Cancel'
submitTitle='Delete'
@@ -530,7 +499,7 @@ const InternalDashboard: React.FC = ({
{`Do you want to delete the selected widget${
- selectedWidgets.length > 1 ? 's' : ''
+ selectedWidgetIds.length > 1 ? 's' : ''
}? All changes will be lost.`}
@@ -540,7 +509,7 @@ const InternalDashboard: React.FC = ({
}
handleDismiss={() => setVisible(false)}
handleCancel={() => setVisible(false)}
- handleSubmit={onDelete}
+ handleSubmit={handleDelete}
/>
);
diff --git a/packages/dashboard/src/components/internalDashboard/keyboardShortcuts.test.tsx b/packages/dashboard/src/components/internalDashboard/keyboardShortcuts.test.tsx
index 328979101..17d50516e 100644
--- a/packages/dashboard/src/components/internalDashboard/keyboardShortcuts.test.tsx
+++ b/packages/dashboard/src/components/internalDashboard/keyboardShortcuts.test.tsx
@@ -97,7 +97,7 @@ it.skip('can clear the selection', () => {
renderDashboardAndPressKey({ key: 'Escape', meta: false });
expect(onSelectWidgetsAction).toBeCalledWith({
- widgets: [],
+ widgetIds: [],
union: false,
});
});
diff --git a/packages/dashboard/src/components/internalDashboard/keyboardShortcuts.ts b/packages/dashboard/src/components/internalDashboard/keyboardShortcuts.ts
index b3c618238..3244393c3 100644
--- a/packages/dashboard/src/components/internalDashboard/keyboardShortcuts.ts
+++ b/packages/dashboard/src/components/internalDashboard/keyboardShortcuts.ts
@@ -1,44 +1,37 @@
-import isFunction from 'lodash-es/isFunction';
import { useCallback } from 'react';
import { useDispatch } from 'react-redux';
-import { useSelectedWidgets } from '~/hooks/useSelectedWidgets';
+import { useSelectedWidgetIds } from '~/hooks/useSelectedWidget';
import { useKeyPress } from '../../hooks/useKeyPress';
import {
onBringWidgetsToFrontAction,
onCopyWidgetsAction,
- onDeleteWidgetsAction,
onPasteWidgetsAction,
onSelectWidgetsAction,
onSendWidgetsToBackAction,
} from '../../store/actions';
import { DASHBOARD_CONTAINER_ID } from '../grid/getDashboardPosition';
-type useKeyboardShortcutsProps = {
- deleteWidgets?: () => void;
-};
+export interface UseKeyboardShortcutsOptions {
+ onPressDelete: VoidFunction;
+}
export const useKeyboardShortcuts = ({
- deleteWidgets: handleDeleteWidgetModal,
-}: useKeyboardShortcutsProps) => {
+ onPressDelete,
+}: UseKeyboardShortcutsOptions) => {
const dispatch = useDispatch();
- const selectedWidgets = useSelectedWidgets();
+ const widgetWidgetIds = useSelectedWidgetIds();
const onClearSelection = () => {
- dispatch(
- onSelectWidgetsAction({
- widgets: [],
- union: false,
- })
- );
+ dispatch(onSelectWidgetsAction({ widgetIds: [] }));
};
const copyWidgets = useCallback(() => {
dispatch(
onCopyWidgetsAction({
- widgets: selectedWidgets,
+ widgetIds: widgetWidgetIds,
})
);
- }, [dispatch, selectedWidgets]);
+ }, [dispatch, widgetWidgetIds]);
const pasteWidgets = () => {
dispatch(onPasteWidgetsAction({ position: undefined }));
@@ -52,25 +45,10 @@ export const useKeyboardShortcuts = ({
dispatch(onSendWidgetsToBackAction());
};
- const deleteWidgets = useCallback(() => {
- if (isFunction(handleDeleteWidgetModal)) {
- handleDeleteWidgetModal();
- } else {
- dispatch(
- onDeleteWidgetsAction({
- widgets: selectedWidgets,
- })
- );
- }
- }, [selectedWidgets, dispatch, handleDeleteWidgetModal]);
-
- /**
- * Keyboard hotkey / shortcut configuration
- * key press filter makes sure that the event is not coming from
- * other areas where we might use keyboard interactions such as
- * the settings pane or a text area in a widget
- */
-
+ // Keyboard hotkey / shortcut configuration
+ // key press filter makes sure that the event is not coming from
+ // other areas where we might use keyboard interactions such as
+ // the settings pane or a text area in a widget
const keyPressFilter = (e: KeyboardEvent | ClipboardEvent) =>
e.target !== null &&
e.target instanceof Element &&
@@ -79,7 +57,7 @@ export const useKeyboardShortcuts = ({
useKeyPress('esc', { filter: keyPressFilter, callback: onClearSelection });
useKeyPress('backspace, del', {
filter: keyPressFilter,
- callback: deleteWidgets,
+ callback: onPressDelete,
});
useKeyPress('mod+c', { filter: keyPressFilter, callback: copyWidgets });
useKeyPress('mod+v', { filter: keyPressFilter, callback: pasteWidgets });
diff --git a/packages/dashboard/src/components/queryEditor/queryEditor.tsx b/packages/dashboard/src/components/queryEditor/queryEditor.tsx
index e162b706a..96a68cfa0 100644
--- a/packages/dashboard/src/components/queryEditor/queryEditor.tsx
+++ b/packages/dashboard/src/components/queryEditor/queryEditor.tsx
@@ -2,19 +2,18 @@ import { IoTSiteWiseQueryEditor } from './iotSiteWiseQueryEditor';
import { QueryEditorErrorBoundary } from './queryEditorErrorBoundary';
import { useQuery } from './useQuery';
import { type IoTSiteWise } from '@aws-sdk/client-iotsitewise';
-import { type DashboardWidget } from '~/types';
import { useIsAddButtonDisabled } from './helpers/useIsAddButtonDisabled';
import { getCorrectSelectionMode } from './helpers/getCorrectSelectionMode';
import { useAssetsForAssetModel } from './iotSiteWiseQueryEditor/assetModelDataStreamExplorer/assetsForAssetModelSelect/useAssetsForAssetModel/useAssetsForAssetModel';
import { useModelBasedQuery } from './iotSiteWiseQueryEditor/assetModelDataStreamExplorer/modelBasedQuery/useModelBasedQuery';
+import { useSelectedWidgets } from '~/hooks/useSelectedWidget';
-export function QueryEditor({
- iotSiteWiseClient,
- selectedWidgets,
-}: {
+export interface QueryEditorProps {
iotSiteWiseClient: IoTSiteWise;
- selectedWidgets: DashboardWidget[];
-}) {
+}
+
+export function QueryEditor({ iotSiteWiseClient }: QueryEditorProps) {
+ const selectedWidgets = useSelectedWidgets();
const [_query, setQuery] = useQuery();
const addButtonDisabled = useIsAddButtonDisabled(selectedWidgets);
const correctSelectionMode = getCorrectSelectionMode(selectedWidgets);
diff --git a/packages/dashboard/src/components/queryEditor/useQuery.ts b/packages/dashboard/src/components/queryEditor/useQuery.ts
index e9338c0fc..52222c3a0 100644
--- a/packages/dashboard/src/components/queryEditor/useQuery.ts
+++ b/packages/dashboard/src/components/queryEditor/useQuery.ts
@@ -1,4 +1,4 @@
-import { useSelectedWidgets } from '~/hooks/useSelectedWidgets';
+import { useSelectedWidgets } from '~/hooks/useSelectedWidget';
import { useDispatch } from 'react-redux';
import { onUpdateWidgetsAction } from '~/store/actions';
import { type DashboardWidget, type IoTSiteWiseDataStreamQuery } from '~/types';
@@ -65,9 +65,7 @@ export function useQuery(): [
) => void
] {
const dispatch = useDispatch();
- const selectedWidgets = useSelectedWidgets<{
- queryConfig: { query: IoTSiteWiseDataStreamQuery };
- }>();
+ const selectedWidgets = useSelectedWidgets();
const selectedWidget = isOneWidgetSelected(selectedWidgets)
? getFirstWidget(selectedWidgets)
: undefined;
@@ -114,9 +112,9 @@ export function useQuery(): [
}
function isOneWidgetSelected(
- widgets: WidgetWithQuery[]
-): widgets is [WidgetWithQuery] {
- return widgets.length === 1;
+ widgetIds: DashboardWidget[] | WidgetWithQuery[]
+): widgetIds is [WidgetWithQuery] {
+ return widgetIds.length === 1;
}
function isWidget(
diff --git a/packages/dashboard/src/components/widgets/list.tsx b/packages/dashboard/src/components/widgets/list.tsx
index 7db569b17..9e348a4d9 100644
--- a/packages/dashboard/src/components/widgets/list.tsx
+++ b/packages/dashboard/src/components/widgets/list.tsx
@@ -1,39 +1,24 @@
-import type { SiteWiseQuery } from '@iot-app-kit/source-iotsitewise';
-import includes from 'lodash-es/includes';
-import map from 'lodash-es/map';
import type { DashboardMessages } from '~/messages';
import { type DashboardState } from '~/store/state';
-import type { DashboardWidget } from '~/types';
import './list.css';
import SelectionBox from './selectionBox';
import WidgetComponent from './widget';
-export type WidgetsProps = {
+export interface WidgetsProps {
readOnly: boolean;
- query?: SiteWiseQuery;
dashboardConfiguration: DashboardState['dashboardConfiguration'];
- selectedWidgets: DashboardWidget[];
cellSize: number;
dragEnabled: boolean;
messageOverrides: DashboardMessages;
-};
+}
-const Widgets: React.FC = ({
+export const Widgets = ({
dashboardConfiguration,
- selectedWidgets,
cellSize,
dragEnabled,
messageOverrides,
- query,
readOnly,
-}) => {
- const { widgets } = dashboardConfiguration;
- const isSelected = (id: string) =>
- includes(
- map(selectedWidgets, (sw) => sw.id),
- id
- );
-
+}: WidgetsProps) => {
return (
= ({
- selectedWidgets,
cellSize,
dragEnabled,
}) => {
+ const selectedWidgets = useSelectedWidgets();
const { selectionBoxLayer, selectionGestureLayer } = useLayers();
const rect = getSelectionBox(selectedWidgets);
diff --git a/packages/dashboard/src/components/widgets/widget.tsx b/packages/dashboard/src/components/widgets/widget.tsx
index 666f5294f..21a4ecd9a 100644
--- a/packages/dashboard/src/components/widgets/widget.tsx
+++ b/packages/dashboard/src/components/widgets/widget.tsx
@@ -5,43 +5,42 @@ import {
} from '../internalDashboard/gestures/determineTargetGestures';
import DynamicWidgetComponent from './dynamicWidget';
import WidgetActions from './widgetActions';
-
-import type { SiteWiseQuery } from '@iot-app-kit/source-iotsitewise';
import type { DashboardMessages } from '~/messages';
import type { DashboardWidget } from '~/types';
import './widget.css';
+import includes from 'lodash-es/includes';
+import map from 'lodash-es/map';
+import { useSelectedWidgetIds } from '~/hooks/useSelectedWidget';
-export type WidgetProps = {
+export interface WidgetProps {
readOnly: boolean;
- query?: SiteWiseQuery;
- isSelected: boolean;
- numSelected: number;
cellSize: number;
widget: DashboardWidget;
messageOverrides: DashboardMessages;
-};
+}
/**
- *
* Component used to position a widget on the dashboard and
* mark it with the handles required to capture gestures
- *
*/
const WidgetComponent: React.FC = ({
cellSize,
widget,
messageOverrides,
- isSelected,
- numSelected,
readOnly,
}) => {
- const { x, y, z, width, height } = widget;
+ const selectedWidgetIds = useSelectedWidgetIds();
+ const isSelected = (id: string) =>
+ includes(
+ map(selectedWidgetIds, (widgetId) => widgetId),
+ id
+ );
const [showActionButtons, setShowActionButtons] = useState(false);
const widgetActions = () => {
- if (numSelected > 1) {
+ if (selectedWidgetIds.length > 1) {
return null;
- } else if (isSelected) {
+ } else if (isSelected(widget.id)) {
return = ({
{...idable(widget.id)}
className={`widget ${readOnly ? 'widget-readonly' : 'widget-editable'}`}
style={{
- ...(!z ? {} : { zIndex: z.toString() }),
- top: `${cellSize * y}px`,
- left: `${cellSize * x}px`,
- width: `${cellSize * width}px`,
- height: `${cellSize * height}px`,
+ ...(!widget.z ? {} : { zIndex: widget.z.toString() }),
+ top: `${cellSize * widget.y}px`,
+ left: `${cellSize * widget.x}px`,
+ width: `${cellSize * widget.width}px`,
+ height: `${cellSize * widget.height}px`,
}}
onMouseEnter={() => setShowActionButtons(true)}
onMouseLeave={() => setShowActionButtons(false)}
diff --git a/packages/dashboard/src/components/widgets/widgetActions.tsx b/packages/dashboard/src/components/widgets/widgetActions.tsx
index 172f3341b..cc92f97e7 100644
--- a/packages/dashboard/src/components/widgets/widgetActions.tsx
+++ b/packages/dashboard/src/components/widgets/widgetActions.tsx
@@ -15,8 +15,8 @@ import { useDeleteWidgets } from '~/hooks/useDeleteWidgets';
import { type DashboardWidget } from '~/types';
import ConfirmDeleteModal from '../confirmDeleteModal';
import {
- CSVDownloadButton,
canOnlyDownloadLiveMode,
+ CSVDownloadButton,
isQueryEmpty,
} from '../csvDownloadButton';
import { useClients } from '../dashboard/clientContext';
@@ -60,7 +60,7 @@ const WidgetActions = ({ widget }: { widget: DashboardWidget }) => {
(state: DashboardState) => state.isEdgeModeEnabled
);
const { iotSiteWiseClient } = useClients();
- const { onDelete } = useDeleteWidgets();
+ const deleteWidgets = useDeleteWidgets();
const metricsRecorder = getPlugin('metricsRecorder');
const readOnly = useSelector((state: DashboardState) => state.readOnly);
@@ -69,7 +69,9 @@ const WidgetActions = ({ widget }: { widget: DashboardWidget }) => {
const handleDelete: NonNullable = (e) => {
e.stopPropagation();
dispatch(onChangeDashboardGridEnabledAction({ enabled: false }));
- dispatch(onSelectWidgetsAction({ widgets: [widget], union: false }));
+ dispatch(
+ onSelectWidgetsAction({ widgetIds: [widget.id], shouldAppend: false })
+ );
setVisible(true);
};
@@ -80,7 +82,7 @@ const WidgetActions = ({ widget }: { widget: DashboardWidget }) => {
const handleSubmit = () => {
const widgetType = widget.type;
- onDelete(widget);
+ deleteWidgets([widget.id]);
dispatch(onChangeDashboardGridEnabledAction({ enabled: true }));
setVisible(false);
diff --git a/packages/dashboard/src/customization/hooks/useIsSelected.ts b/packages/dashboard/src/customization/hooks/useIsSelected.ts
index 79bd9d6ef..85d42d4f0 100644
--- a/packages/dashboard/src/customization/hooks/useIsSelected.ts
+++ b/packages/dashboard/src/customization/hooks/useIsSelected.ts
@@ -1,7 +1,7 @@
import includes from 'lodash-es/includes';
import map from 'lodash-es/map';
import { useCallback } from 'react';
-import { useSelectedWidgets } from '~/hooks/useSelectedWidgets';
+import { useSelectedWidgetIds } from '~/hooks/useSelectedWidget';
import type { DashboardWidget } from '~/types';
/**
@@ -11,12 +11,12 @@ import type { DashboardWidget } from '~/types';
*
*/
export const useIsSelected = (widget: T) => {
- const selectedWidgets = useSelectedWidgets();
+ const selectedWidgets = useSelectedWidgetIds();
const isSelected = useCallback(
() =>
includes(
- map(selectedWidgets, (sw) => sw.id),
+ map(selectedWidgets, (widgetId) => widgetId),
widget.id
),
[selectedWidgets, widget]
diff --git a/packages/dashboard/src/customization/propertiesSection.ts b/packages/dashboard/src/customization/propertiesSection.ts
index 3bbba5721..88e5ac936 100644
--- a/packages/dashboard/src/customization/propertiesSection.ts
+++ b/packages/dashboard/src/customization/propertiesSection.ts
@@ -1,7 +1,7 @@
import isEqual from 'lodash-es/isEqual';
import type * as React from 'react';
import { useDispatch } from 'react-redux';
-import { useSelectedWidgets } from '~/hooks/useSelectedWidgets';
+import { useSelectedWidgets } from '~/hooks/useSelectedWidget';
import {
onMoveWidgetsAction,
onResizeWidgetsAction,
@@ -58,7 +58,6 @@ const NO_SIZE = { height: 0, width: 0 };
const NO_POSITION = { x: 0, y: 0 };
/**
- *
* Helper to convert a list of values of 1 type into a Maybe type
* that represents those a singular value of that list
*
@@ -78,7 +77,6 @@ const compositeValue = (values: T[]): Maybe =>
values.every((v) => isEqual(v, values[0])) ? Just(values[0]) : Nothing();
/**
- *
* the most generic predicate function for a dashboard widget list
* Is always true. To be used as the default predicate function in useSelection
*/
@@ -87,7 +85,6 @@ export const isDashboardWidget = (
): widget is DashboardWidget => !!widget;
/**
- *
* hook that represents the widget selection
*
* returns other hooks to be used in react components
@@ -96,7 +93,6 @@ export const isDashboardWidget = (
* useProperty: hook that allows you to get and set a value on the selection
* useSize: hook that allows you to get and set the size of the selection
* usePosition: hook that allows you to get and set the position of the selection
- *
*/
export const useSelection = (
{ filter }: { filter?: FilterPredicate } = { filter: undefined }
@@ -105,10 +101,7 @@ export const useSelection = (
const selectedWidgets = useSelectedWidgets();
const filteredSelection = selectedWidgets.filter(filter ?? isDashboardWidget);
- /**
- * selection filter does not apply to entire selection
- * this means we cannot correctly narrow the selection type
- */
+ // selection filter does not apply to entire selection this means we cannot correctly narrow the selection type
if (
selectedWidgets.length === 0 ||
!isEqual(selectedWidgets, filteredSelection)
@@ -117,9 +110,7 @@ export const useSelection = (
const selection = filteredSelection;
- /**
- * TECH DEBT: getSelectionBox should never be null given the above check
- */
+ // TECH DEBT: getSelectionBox should never be null given the above check
const { x, y, height, width } = trimRectPosition(
getSelectionBox(selection) ?? { ...NO_SIZE, ...NO_POSITION }
);
@@ -133,7 +124,7 @@ export const useSelection = (
dispatch(
onResizeWidgetsAction({
anchor: 'bottom-right',
- widgets: selection,
+ widgetIds: selection.map(({ id }) => id),
vector,
})
),
@@ -146,7 +137,7 @@ export const useSelection = (
(vector) =>
dispatch(
onMoveWidgetsAction({
- widgets: selection,
+ widgetIds: selection.map(({ id }) => id),
vector,
complete: true,
})
diff --git a/packages/dashboard/src/customization/propertiesSections/axisSettings/section.spec.tsx b/packages/dashboard/src/customization/propertiesSections/axisSettings/section.spec.tsx
index 2d240e3b7..a52a1490f 100644
--- a/packages/dashboard/src/customization/propertiesSections/axisSettings/section.spec.tsx
+++ b/packages/dashboard/src/customization/propertiesSections/axisSettings/section.spec.tsx
@@ -10,7 +10,7 @@ const state: Partial = {
dashboardConfiguration: {
widgets: [MOCK_LINE_CHART_WIDGET],
},
- selectedWidgets: [MOCK_LINE_CHART_WIDGET],
+ selectedWidgetIds: [MOCK_LINE_CHART_WIDGET.id],
};
const TestComponent = () => (
diff --git a/packages/dashboard/src/customization/propertiesSections/formatDataSettings/section.tsx b/packages/dashboard/src/customization/propertiesSections/formatDataSettings/section.tsx
index d6cdb61cb..21bbc9623 100644
--- a/packages/dashboard/src/customization/propertiesSections/formatDataSettings/section.tsx
+++ b/packages/dashboard/src/customization/propertiesSections/formatDataSettings/section.tsx
@@ -5,7 +5,7 @@ import './section.css';
import { spaceScaledS } from '@cloudscape-design/design-tokens';
import { isNumeric } from '@iot-app-kit/core';
import DecimalPlaces from '~/components/decimalPlaces';
-import { useSelectedWidgets } from '~/hooks/useSelectedWidgets';
+import { useSelectedWidgetIds } from '~/hooks/useSelectedWidget';
import {
FormLabel,
StyledExpandableSection,
@@ -18,8 +18,8 @@ export const DecimalPlacesSection = ({
significantDigits: number | undefined;
updateSignificantDigits: (newValue: number | undefined) => void;
}) => {
- const selectedWidgets = useSelectedWidgets();
- const selectedWidgetId = selectedWidgets[0]?.id;
+ const selectedWidgets = useSelectedWidgetIds();
+ const selectedWidgetId = selectedWidgets.at(0);
const onSignificantDigitsChange = (value: string) => {
const newValue = isNumeric(value) ? parseInt(value) || 0 : undefined;
@@ -46,7 +46,7 @@ export const DecimalPlacesSection = ({
diff --git a/packages/dashboard/src/customization/propertiesSections/propertiesPanel/panel.spec.tsx b/packages/dashboard/src/customization/propertiesSections/propertiesPanel/panel.spec.tsx
index 036c7eeb7..765ce1d0a 100644
--- a/packages/dashboard/src/customization/propertiesSections/propertiesPanel/panel.spec.tsx
+++ b/packages/dashboard/src/customization/propertiesSections/propertiesPanel/panel.spec.tsx
@@ -1,82 +1,32 @@
-import { QueryClient } from '@tanstack/react-query';
-
-vi.mock('../../data/query-client', () => ({
- queryClient: new QueryClient({
- defaultOptions: {
- queries: {
- retry: false,
- },
- },
- }),
-}));
-
import {
IoTSiteWise,
type IoTSiteWiseClient,
} from '@aws-sdk/client-iotsitewise';
import { type IoTTwinMakerClient } from '@aws-sdk/client-iottwinmaker';
-import {
- type RenderResult,
- act,
- waitFor,
- cleanup,
- fireEvent,
- render,
- screen,
-} from '@testing-library/react';
-import createWrapper from '@cloudscape-design/components/test-utils/dom';
+import { render, screen } from '@testing-library/react';
import { Provider } from 'react-redux';
-
import { PropertiesPanel } from './panel';
import { configureDashboardStore } from '~/store';
import { type DashboardState } from '~/store/state';
import {
MOCK_KPI_WIDGET,
MOCK_LINE_CHART_WIDGET,
+ MOCK_TEXT_WIDGET,
} from '../../../../testing/mocks';
import { mockAssetDescription } from '../../../../testing/mocks/siteWiseSDK';
-import { type SiteWiseAssetQuery } from '@iot-app-kit/source-iotsitewise';
-import { type QueryWidget } from '~/customization/widgets/types';
import { type DashboardIotSiteWiseClients } from '~/types';
import {
createMockIoTEventsSDK,
createMockSiteWiseSDK,
} from '@iot-app-kit/testing-util';
import { ClientContext } from '~/components/dashboard/clientContext';
+import { userEvent } from '@testing-library/user-event';
-const MockAssetQuery: SiteWiseAssetQuery['assets'][number] = {
- assetId: 'mock-id',
- properties: [
- { propertyId: 'property-1', refId: 'p1' },
- { propertyId: 'property-2', refId: 'p2' },
- { propertyId: 'e70495ff-c016-4175-9012-62c37857e0d1' },
- ],
-};
-
-const styleSettings = {
- p1: {
- color: '#00ff00',
- },
- p2: {
- color: '#0000ff',
- },
-};
-const MockWidget: QueryWidget = {
- ...MOCK_LINE_CHART_WIDGET,
- properties: {
- queryConfig: {
- source: 'iotsitewise',
- query: {
- assets: [MockAssetQuery],
- },
- },
- styleSettings,
- },
-};
+const user = userEvent.setup();
type SetupStoreOptions = {
widgets?: DashboardState['dashboardConfiguration']['widgets'];
- selectedWidgets?: DashboardState['selectedWidgets'];
+ selectedWidgets?: DashboardState['selectedWidgetIds'];
};
const setupStore = ({ widgets, selectedWidgets }: SetupStoreOptions) =>
@@ -84,15 +34,12 @@ const setupStore = ({ widgets, selectedWidgets }: SetupStoreOptions) =>
dashboardConfiguration: {
widgets,
},
- selectedWidgets,
+ selectedWidgetIds: selectedWidgets,
});
-const renderTestComponentAsync = async (
- options?: SetupStoreOptions
-): Promise = ({
}}
>
{!readOnly && (
- = ({
);
};
-
-export default Widgets;
diff --git a/packages/dashboard/src/components/widgets/selectionBox.tsx b/packages/dashboard/src/components/widgets/selectionBox.tsx
index 657c5ccd2..1ba934783 100644
--- a/packages/dashboard/src/components/widgets/selectionBox.tsx
+++ b/packages/dashboard/src/components/widgets/selectionBox.tsx
@@ -1,22 +1,20 @@
import { getSelectionBox } from '~/util/getSelectionBox';
import SelectionBoxAnchor from './selectionBoxAnchor';
-
-import type { DashboardWidget } from '~/types';
import { gestureable } from '../internalDashboard/gestures/determineTargetGestures';
import { useLayers } from '../internalDashboard/useLayers';
import './selectionBox.css';
+import { useSelectedWidgets } from '~/hooks/useSelectedWidget';
-export type SelectionBoxProps = {
- selectedWidgets: DashboardWidget[];
+export interface SelectionBoxProps {
cellSize: number;
dragEnabled: boolean;
-};
+}
const SelectionBox: React.FC
+
+## License
+This project is licensed under the Apache-2.0 License.
\ No newline at end of file
diff --git a/packages/resource-explorer/package.json b/packages/resource-explorer/package.json
new file mode 100644
index 000000000..624a8e93b
--- /dev/null
+++ b/packages/resource-explorer/package.json
@@ -0,0 +1,108 @@
+{
+ "name": "@iot-app-kit/resource-explorer",
+ "version": "12.5.0",
+ "license": "Apache-2.0",
+ "source": "./src/index.ts",
+ "type": "module",
+ "main": "./dist/cjs/index.js",
+ "module": "./dist/esm/index.js",
+ "types": "./dist/esm/index.d.ts",
+ "exports": {
+ ".": {
+ "types": "./dist/esm/index.d.ts",
+ "require": "./dist/cjs/index.js",
+ "import": "./dist/esm/index.js",
+ "default": "./dist/esm/index.js"
+ }
+ },
+ "files": [
+ "dist",
+ "CHANGELOG.md",
+ "*NOTICE",
+ "*styles.css"
+ ],
+ "publishConfig": {
+ "access": "public"
+ },
+ "scripts": {
+ "start": "storybook dev -p 6007",
+ "build": "tsc -b ./tsconfig.cjs.json ./tsconfig.esm.json && npm run copy-assets:es && npm run copy-assets:cjs",
+ "build:cjs": "tsc -b ./tsconfig.cjs.json && npm run copy-assets:cjs",
+ "build:es": "tsc -b ./tsconfig.esm.json && npm run copy-assets:es",
+ "clean": "rimraf dist storybook-static test-results coverage .turbo .cache",
+ "clean:nuke": "npm run clean && rimraf node_modules",
+ "copy-assets:es": "copyfiles -e \"**/*.tsx\" -e \"**/*.ts\" -e \"**/*.snap\" -e \"**/*.js\" -e \"**/*.jsx\" -e \"**/*.json\" \"src/**/*\" -u 1 dist/esm/",
+ "copy-assets:cjs": "copyfiles -e \"**/*.tsx\" -e \"**/*.ts\" -e \"**/*.snap\" -e \"**/*.js\" -e \"**/*.jsx\" -e \"**/*.json\" \"src/**/*\" -u 1 dist/cjs/",
+ "copy:styles": "cp ../components/styles.css styles.css",
+ "dev": "tsc -b ./tsconfig.esm.json --watch",
+ "dev:resource-explorer": "npm start",
+ "test": "TZ=utc vitest run --silent --coverage",
+ "test:watch": "TZ=utc vitest --silent",
+ "test:types": "tsc -p ./tsconfig.json --noEmit",
+ "lint": "eslint . --max-warnings=0 --cache --cache-location .cache/eslint/",
+ "fix": "eslint --fix . --cache --cache-location .cache/eslint/",
+ "copy:license": "cp ../../LICENSE LICENSE",
+ "copy:notice": "cp ../../NOTICE NOTICE",
+ "prepack": "npm run copy:license && npm run copy:notice",
+ "pack": "npm pack"
+ },
+ "devDependencies": {
+ "@iot-app-kit/testing-util": "12.5.0",
+ "@iot-app-kit/ts-config": "12.5.0",
+ "@playwright/test": "^1.48.2",
+ "@storybook/addon-essentials": "^8.4.5",
+ "@storybook/addon-links": "^8.4.5",
+ "@storybook/preview-api": "^8.5.8",
+ "@storybook/react": "^8.4.5",
+ "@storybook/react-vite": "^8.4.5",
+ "@storybook/test": "^8.4.5",
+ "@tanstack/eslint-plugin-query": "^5.40.1",
+ "@tanstack/react-query-devtools": "^5.40.1",
+ "@testing-library/jest-dom": "^6.6.3",
+ "@testing-library/react": "^16.0.1",
+ "@testing-library/user-event": "^14.5.2",
+ "@types/node": "^18.16.18",
+ "@types/react": "^18.2.12",
+ "@types/react-dom": "^18.2.5",
+ "@vitejs/plugin-react": "^4.3.3",
+ "@vitest/coverage-v8": "^2.1.5",
+ "babel-plugin-formatjs": "10.5.3",
+ "copyfiles": "^2.4.1",
+ "eslint-config-iot-app-kit": "12.5.0",
+ "eslint-plugin-jsx-a11y": "^6.8.0",
+ "jest-extended": "^3.2.4",
+ "react": "^18.2.0",
+ "react-dom": "^18.2.0",
+ "rimraf": "^5.0.1",
+ "storybook": "^8.4.5",
+ "storybook-dark-mode": "^3.0.3",
+ "tsconfig-paths-webpack-plugin": "^4.1.0",
+ "type-fest": "^4.28.1",
+ "typescript": "^5.5.4",
+ "vite": "^5.4.12",
+ "vitest": "^2.1.5",
+ "vitest-canvas-mock": "^0.3.3"
+ },
+ "dependencies": {
+ "@cloudscape-design/collection-hooks": "1.0.49",
+ "@cloudscape-design/components": "3.0.693",
+ "@cloudscape-design/design-tokens": "3.0.42",
+ "@cloudscape-design/global-styles": "1.0.32",
+ "@iot-app-kit/charts-core": "^2.1.2",
+ "@iot-app-kit/core": "12.5.0",
+ "@iot-app-kit/core-util": "12.5.0",
+ "@iot-app-kit/component-core": "12.5.0",
+ "@iot-app-kit/source-iotsitewise": "12.5.0",
+ "@tanstack/react-query": "^5.32.1",
+ "react-use": "17.4.0"
+ },
+ "peerDependencies": {
+ "@aws-sdk/client-iotsitewise": "^3.696.0",
+ "react": "^18",
+ "react-dom": "^18"
+ },
+ "bugs": {
+ "url": "https://github.com/awslabs/iot-app-kit/issues"
+ },
+ "homepage": "https://github.com/awslabs/iot-app-kit#readme"
+}
diff --git a/packages/resource-explorer/playwright.config.ts b/packages/resource-explorer/playwright.config.ts
new file mode 100644
index 000000000..36861479b
--- /dev/null
+++ b/packages/resource-explorer/playwright.config.ts
@@ -0,0 +1,76 @@
+import { defineConfig, devices } from '@playwright/test';
+
+const SECOND_IN_MS = 1000;
+const MINUTE_IN_MS = 60_000;
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+ testDir: './e2e',
+ expect: {
+ /**
+ * Maximum time expect() should wait for the condition to be met.
+ * For example in `await expect(locator).toHaveText();`
+ */
+ timeout: 100 * SECOND_IN_MS,
+ toMatchSnapshot: { maxDiffPixels: 200, maxDiffPixelRatio: 0.05 },
+ toHaveScreenshot: { maxDiffPixels: 200, maxDiffPixelRatio: 0.05 },
+ },
+ timeout: 100 * SECOND_IN_MS,
+ globalTimeout: 5 * MINUTE_IN_MS,
+ /* Run tests in files in parallel */
+ fullyParallel: true,
+ /* Fail the build on CI if you accidentally left test.only in the source code. */
+ forbidOnly: !!process.env.CI,
+ /* Retry on CI only */
+ retries: process.env.CI ? 2 : 0,
+ /* Opt out of parallel tests on CI. */
+ workers: process.env.CI ? 1 : undefined,
+ /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+ reporter: [
+ ['html', { host: '0.0.0.0' }],
+ ] /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */,
+ use: {
+ /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
+ actionTimeout: 0,
+ /* Base URL to use in actions like `await page.goto('/')`. */
+ // baseURL: 'http://localhost:3000',
+
+ /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+ trace: 'on-first-retry',
+ baseURL: 'http://localhost:6007/',
+ storageState: {
+ cookies: [],
+ origins: [
+ {
+ origin: 'localhost',
+ localStorage: [
+ { name: 'USE_SVG_FOR_ECHARTS_PLAYWRIGHT_TEST_ONLY', value: 'true' },
+ ],
+ },
+ ],
+ },
+ },
+
+ /* Configure projects for major browsers */
+ projects: [
+ {
+ name: 'chromium',
+ use: { ...devices['Desktop Chrome'] },
+ },
+ ],
+
+ /* Folder for test artifacts such as screenshots, videos, traces, etc. */
+ // outputDir: 'test-results/',
+
+ /* Run your local dev server before starting the tests */
+ webServer: {
+ command: 'npm run start',
+ reuseExistingServer: !process.env.CI,
+ url: 'http://localhost:6007',
+ timeout: 5 * MINUTE_IN_MS,
+ stdout: 'pipe',
+ stderr: 'pipe',
+ },
+});
diff --git a/packages/react-components/src/components/resource-explorers/constants/defaults.ts b/packages/resource-explorer/src/constants/defaults.ts
similarity index 97%
rename from packages/react-components/src/components/resource-explorers/constants/defaults.ts
rename to packages/resource-explorer/src/constants/defaults.ts
index 4e3d60dd0..34b77befa 100644
--- a/packages/react-components/src/components/resource-explorers/constants/defaults.ts
+++ b/packages/resource-explorer/src/constants/defaults.ts
@@ -1,4 +1,4 @@
-import type { RequestTimeout } from '@iot-app-kit/core';
+import { formatDate, type RequestTimeout } from '@iot-app-kit/core';
import type {
IsResourceDisabled,
IsTableFilterEnabled,
@@ -22,7 +22,6 @@ import type {
TableResourceField,
} from '../types/table';
import { type DataStreamResourceWithLatestValue } from '../types/resources';
-import { formatDate } from '../../../utils/time';
import { isNumeric, round } from '@iot-app-kit/core-util';
const NO_OP = () => {};
diff --git a/packages/react-components/src/components/resource-explorers/constants/drop-down-resource-definitions.ts b/packages/resource-explorer/src/constants/drop-down-resource-definitions.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/constants/drop-down-resource-definitions.ts
rename to packages/resource-explorer/src/constants/drop-down-resource-definitions.ts
diff --git a/packages/react-components/src/components/resource-explorers/constants/table-resource-definitions.ts b/packages/resource-explorer/src/constants/table-resource-definitions.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/constants/table-resource-definitions.ts
rename to packages/resource-explorer/src/constants/table-resource-definitions.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/alarm-explorer.tsx b/packages/resource-explorer/src/explorers/alarm-explorer/alarm-explorer.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/alarm-explorer.tsx
rename to packages/resource-explorer/src/explorers/alarm-explorer/alarm-explorer.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/index.ts b/packages/resource-explorer/src/explorers/alarm-explorer/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/index.ts
rename to packages/resource-explorer/src/explorers/alarm-explorer/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/internal-alarm-explorer.tsx b/packages/resource-explorer/src/explorers/alarm-explorer/internal-alarm-explorer.tsx
similarity index 99%
rename from packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/internal-alarm-explorer.tsx
rename to packages/resource-explorer/src/explorers/alarm-explorer/internal-alarm-explorer.tsx
index cc3f88174..8a8d2036f 100644
--- a/packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/internal-alarm-explorer.tsx
+++ b/packages/resource-explorer/src/explorers/alarm-explorer/internal-alarm-explorer.tsx
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { useAlarms } from '../../../../hooks/useAlarms';
+import { useAlarms } from '@iot-app-kit/component-core';
import {
DEFAULT_ALARM_RESOURCE_NAME,
DEFAULT_DEFAULT_PAGE_SIZE,
diff --git a/packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/transformAlarmData.ts b/packages/resource-explorer/src/explorers/alarm-explorer/transformAlarmData.ts
similarity index 90%
rename from packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/transformAlarmData.ts
rename to packages/resource-explorer/src/explorers/alarm-explorer/transformAlarmData.ts
index d0b2cc30a..c0c1ba54d 100644
--- a/packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/transformAlarmData.ts
+++ b/packages/resource-explorer/src/explorers/alarm-explorer/transformAlarmData.ts
@@ -1,8 +1,8 @@
import {
type AlarmData,
type AlarmDataStatus,
-} from '../../../../hooks/useAlarms';
-import { parseAlarmStateAssetProperty } from '../../../../hooks/useAlarms/transformers';
+ parseAlarmStateAssetProperty,
+} from '@iot-app-kit/component-core';
import {
type AlarmResource,
type AlarmResourceWithLatestValue,
diff --git a/packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/types.ts b/packages/resource-explorer/src/explorers/alarm-explorer/types.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/alarm-explorer/types.ts
rename to packages/resource-explorer/src/explorers/alarm-explorer/types.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-explorer.tsx b/packages/resource-explorer/src/explorers/asset-explorer/asset-explorer.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-explorer.tsx
rename to packages/resource-explorer/src/explorers/asset-explorer/asset-explorer.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/asset-hierarchy-path.spec.tsx b/packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/asset-hierarchy-path.spec.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/asset-hierarchy-path.spec.tsx
rename to packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/asset-hierarchy-path.spec.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/asset-hierarchy-path.tsx b/packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/asset-hierarchy-path.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/asset-hierarchy-path.tsx
rename to packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/asset-hierarchy-path.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/constants.ts b/packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/constants.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/constants.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/constants.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/index.ts b/packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/index.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/resource-relationship-path.tsx b/packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/resource-relationship-path.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/resource-relationship-path.tsx
rename to packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/resource-relationship-path.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/types.ts b/packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/types.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/types.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/types.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/use-ancestor-assets.ts b/packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/use-ancestor-assets.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/asset-hierarchy-path/use-ancestor-assets.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/asset-hierarchy-path/use-ancestor-assets.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/index.ts b/packages/resource-explorer/src/explorers/asset-explorer/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/index.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/internal-asset-explorer.tsx b/packages/resource-explorer/src/explorers/asset-explorer/internal-asset-explorer.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/internal-asset-explorer.tsx
rename to packages/resource-explorer/src/explorers/asset-explorer/internal-asset-explorer.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/predicates.ts b/packages/resource-explorer/src/explorers/asset-explorer/predicates.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/predicates.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/predicates.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/types.ts b/packages/resource-explorer/src/explorers/asset-explorer/types.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/types.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/types.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/index.ts b/packages/resource-explorer/src/explorers/asset-explorer/use-assets/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/index.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/use-assets/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-asset-model-assets.ts b/packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-asset-model-assets.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-asset-model-assets.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-asset-model-assets.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-asset-search.ts b/packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-asset-search.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-asset-search.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-asset-search.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-assets.ts b/packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-assets.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-assets.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-assets.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-child-assets.ts b/packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-child-assets.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-child-assets.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-child-assets.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-root-assets.ts b/packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-root-assets.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-assets/use-root-assets.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/use-assets/use-root-assets.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-parent-asset.ts b/packages/resource-explorer/src/explorers/asset-explorer/use-parent-asset.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-explorer/use-parent-asset.ts
rename to packages/resource-explorer/src/explorers/asset-explorer/use-parent-asset.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/asset-model-explorer.tsx b/packages/resource-explorer/src/explorers/asset-model-explorer/asset-model-explorer.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/asset-model-explorer.tsx
rename to packages/resource-explorer/src/explorers/asset-model-explorer/asset-model-explorer.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/index.ts b/packages/resource-explorer/src/explorers/asset-model-explorer/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/index.ts
rename to packages/resource-explorer/src/explorers/asset-model-explorer/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/internal-asset-model-explorer.tsx b/packages/resource-explorer/src/explorers/asset-model-explorer/internal-asset-model-explorer.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/internal-asset-model-explorer.tsx
rename to packages/resource-explorer/src/explorers/asset-model-explorer/internal-asset-model-explorer.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/types.ts b/packages/resource-explorer/src/explorers/asset-model-explorer/types.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/types.ts
rename to packages/resource-explorer/src/explorers/asset-model-explorer/types.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/use-asset-models.ts b/packages/resource-explorer/src/explorers/asset-model-explorer/use-asset-models.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-model-explorer/use-asset-models.ts
rename to packages/resource-explorer/src/explorers/asset-model-explorer/use-asset-models.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/asset-property-explorer.tsx b/packages/resource-explorer/src/explorers/asset-property-explorer/asset-property-explorer.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/asset-property-explorer.tsx
rename to packages/resource-explorer/src/explorers/asset-property-explorer/asset-property-explorer.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/index.ts b/packages/resource-explorer/src/explorers/asset-property-explorer/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/index.ts
rename to packages/resource-explorer/src/explorers/asset-property-explorer/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/internal-asset-property-explorer.tsx b/packages/resource-explorer/src/explorers/asset-property-explorer/internal-asset-property-explorer.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/internal-asset-property-explorer.tsx
rename to packages/resource-explorer/src/explorers/asset-property-explorer/internal-asset-property-explorer.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/types.ts b/packages/resource-explorer/src/explorers/asset-property-explorer/types.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/types.ts
rename to packages/resource-explorer/src/explorers/asset-property-explorer/types.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/index.ts b/packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/index.ts
rename to packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/use-asset-model-properties.ts b/packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/use-asset-model-properties.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/use-asset-model-properties.ts
rename to packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/use-asset-model-properties.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/use-asset-properties.ts b/packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/use-asset-properties.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/use-asset-properties.ts
rename to packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/use-asset-properties.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/use-asset-property-search.ts b/packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/use-asset-property-search.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/use-asset-property-search.ts
rename to packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/use-asset-property-search.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/use-list-asset-properties.ts b/packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/use-list-asset-properties.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/asset-property-explorer/use-asset-properties/use-list-asset-properties.ts
rename to packages/resource-explorer/src/explorers/asset-property-explorer/use-asset-properties/use-list-asset-properties.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/index.ts b/packages/resource-explorer/src/explorers/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/index.ts
rename to packages/resource-explorer/src/explorers/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/index.ts b/packages/resource-explorer/src/explorers/time-series-explorer/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/index.ts
rename to packages/resource-explorer/src/explorers/time-series-explorer/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/internal-time-series-explorer.tsx b/packages/resource-explorer/src/explorers/time-series-explorer/internal-time-series-explorer.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/internal-time-series-explorer.tsx
rename to packages/resource-explorer/src/explorers/time-series-explorer/internal-time-series-explorer.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/time-series-explorer.tsx b/packages/resource-explorer/src/explorers/time-series-explorer/time-series-explorer.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/time-series-explorer.tsx
rename to packages/resource-explorer/src/explorers/time-series-explorer/time-series-explorer.tsx
diff --git a/packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/types.ts b/packages/resource-explorer/src/explorers/time-series-explorer/types.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/types.ts
rename to packages/resource-explorer/src/explorers/time-series-explorer/types.ts
diff --git a/packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/use-time-series.ts b/packages/resource-explorer/src/explorers/time-series-explorer/use-time-series.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/explorers/time-series-explorer/use-time-series.ts
rename to packages/resource-explorer/src/explorers/time-series-explorer/use-time-series.ts
diff --git a/packages/react-components/src/components/resource-explorers/helpers/response-transformers.ts b/packages/resource-explorer/src/helpers/response-transformers.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/helpers/response-transformers.ts
rename to packages/resource-explorer/src/helpers/response-transformers.ts
diff --git a/packages/react-components/src/components/resource-explorers/helpers/search-statement-normalizer.spec.ts b/packages/resource-explorer/src/helpers/search-statement-normalizer.spec.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/helpers/search-statement-normalizer.spec.ts
rename to packages/resource-explorer/src/helpers/search-statement-normalizer.spec.ts
diff --git a/packages/react-components/src/components/resource-explorers/helpers/search-statement-normalizer.ts b/packages/resource-explorer/src/helpers/search-statement-normalizer.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/helpers/search-statement-normalizer.ts
rename to packages/resource-explorer/src/helpers/search-statement-normalizer.ts
diff --git a/packages/react-components/src/components/resource-explorers/helpers/use-persistable-state.ts b/packages/resource-explorer/src/helpers/use-persistable-state.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/helpers/use-persistable-state.ts
rename to packages/resource-explorer/src/helpers/use-persistable-state.ts
diff --git a/packages/react-components/src/components/resource-explorers/helpers/use-user-customization.ts b/packages/resource-explorer/src/helpers/use-user-customization.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/helpers/use-user-customization.ts
rename to packages/resource-explorer/src/helpers/use-user-customization.ts
diff --git a/packages/react-components/src/components/resource-explorers/index.ts b/packages/resource-explorer/src/index.ts
similarity index 76%
rename from packages/react-components/src/components/resource-explorers/index.ts
rename to packages/resource-explorer/src/index.ts
index 03b763fc7..ec6549b8f 100644
--- a/packages/react-components/src/components/resource-explorers/index.ts
+++ b/packages/resource-explorer/src/index.ts
@@ -13,12 +13,17 @@ export {
type TimeSeriesExplorerProps,
} from './explorers';
export { resourceExplorerQueryClient } from './requests';
-export type { SelectedResources, SelectionMode } from './types/common';
+export type {
+ SelectedResources,
+ SelectionMode,
+ ResourceFieldFilterOperator,
+} from './types/common';
export type {
AlarmResource,
AssetModelResource,
AssetPropertyResource,
AssetResource,
TimeSeriesResource,
+ TimeSeriesResourceWithLatestValue,
} from './types/resources';
-// TODO: Export additional necessary types for customers to use
+export type { TableResourceDefinition } from './types/table';
diff --git a/packages/react-components/src/components/resource-explorers/requests/index.ts b/packages/resource-explorer/src/requests/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/index.ts
rename to packages/resource-explorer/src/requests/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/requests/resource-explorer-query-client.tsx b/packages/resource-explorer/src/requests/resource-explorer-query-client.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/resource-explorer-query-client.tsx
rename to packages/resource-explorer/src/requests/resource-explorer-query-client.tsx
diff --git a/packages/react-components/src/components/resource-explorers/requests/use-latest-values/create-data-streams-with-latest-value.ts b/packages/resource-explorer/src/requests/use-latest-values/create-data-streams-with-latest-value.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/use-latest-values/create-data-streams-with-latest-value.ts
rename to packages/resource-explorer/src/requests/use-latest-values/create-data-streams-with-latest-value.ts
diff --git a/packages/react-components/src/components/resource-explorers/requests/use-latest-values/create-request-entry-batches.ts b/packages/resource-explorer/src/requests/use-latest-values/create-request-entry-batches.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/use-latest-values/create-request-entry-batches.ts
rename to packages/resource-explorer/src/requests/use-latest-values/create-request-entry-batches.ts
diff --git a/packages/react-components/src/components/resource-explorers/requests/use-latest-values/index.ts b/packages/resource-explorer/src/requests/use-latest-values/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/use-latest-values/index.ts
rename to packages/resource-explorer/src/requests/use-latest-values/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/requests/use-latest-values/toValue.ts b/packages/resource-explorer/src/requests/use-latest-values/toValue.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/use-latest-values/toValue.ts
rename to packages/resource-explorer/src/requests/use-latest-values/toValue.ts
diff --git a/packages/react-components/src/components/resource-explorers/requests/use-latest-values/types.ts b/packages/resource-explorer/src/requests/use-latest-values/types.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/use-latest-values/types.ts
rename to packages/resource-explorer/src/requests/use-latest-values/types.ts
diff --git a/packages/react-components/src/components/resource-explorers/requests/use-latest-values/use-latest-values.ts b/packages/resource-explorer/src/requests/use-latest-values/use-latest-values.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/use-latest-values/use-latest-values.ts
rename to packages/resource-explorer/src/requests/use-latest-values/use-latest-values.ts
diff --git a/packages/react-components/src/components/resource-explorers/requests/use-multiple-list-requests/index.ts b/packages/resource-explorer/src/requests/use-multiple-list-requests/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/use-multiple-list-requests/index.ts
rename to packages/resource-explorer/src/requests/use-multiple-list-requests/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/requests/use-multiple-list-requests/types.ts b/packages/resource-explorer/src/requests/use-multiple-list-requests/types.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/use-multiple-list-requests/types.ts
rename to packages/resource-explorer/src/requests/use-multiple-list-requests/types.ts
diff --git a/packages/react-components/src/components/resource-explorers/requests/use-multiple-list-requests/use-multiple-list-requests.ts b/packages/resource-explorer/src/requests/use-multiple-list-requests/use-multiple-list-requests.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/requests/use-multiple-list-requests/use-multiple-list-requests.ts
rename to packages/resource-explorer/src/requests/use-multiple-list-requests/use-multiple-list-requests.ts
diff --git a/packages/react-components/src/components/resource-explorers/testing/drop-down-variant/alarm-drop-down.spec.tsx b/packages/resource-explorer/src/testing/drop-down-variant/alarm-drop-down.spec.tsx
similarity index 99%
rename from packages/react-components/src/components/resource-explorers/testing/drop-down-variant/alarm-drop-down.spec.tsx
rename to packages/resource-explorer/src/testing/drop-down-variant/alarm-drop-down.spec.tsx
index ab81e2164..b33bf0d9f 100644
--- a/packages/react-components/src/components/resource-explorers/testing/drop-down-variant/alarm-drop-down.spec.tsx
+++ b/packages/resource-explorer/src/testing/drop-down-variant/alarm-drop-down.spec.tsx
@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react';
import * as dropDown from '../helpers/drop-down';
import { AlarmExplorer } from '../../explorers';
import { resourceExplorerQueryClient } from '../../requests/resource-explorer-query-client';
-import { queryClient } from '../../../../queries';
+import { queryClient } from '@iot-app-kit/component-core';
describe('asset property drop-down', () => {
beforeEach(() => {
diff --git a/packages/react-components/src/components/resource-explorers/testing/drop-down-variant/asset-drop-down.spec.tsx b/packages/resource-explorer/src/testing/drop-down-variant/asset-drop-down.spec.tsx
similarity index 98%
rename from packages/react-components/src/components/resource-explorers/testing/drop-down-variant/asset-drop-down.spec.tsx
rename to packages/resource-explorer/src/testing/drop-down-variant/asset-drop-down.spec.tsx
index 4b1cef57a..3f3733d8c 100644
--- a/packages/react-components/src/components/resource-explorers/testing/drop-down-variant/asset-drop-down.spec.tsx
+++ b/packages/resource-explorer/src/testing/drop-down-variant/asset-drop-down.spec.tsx
@@ -42,7 +42,11 @@ describe('asset drop-down', () => {
await dropDown.open();
- expect(screen.getByText('No assets.')).toBeVisible();
+ /**
+ * cloudscape added an extra span for screenreaders
+ * that is detected by the testing framework
+ */
+ expect(screen.getAllByText('No assets.')[0]).toBeVisible();
});
it('renders a multi-select drop-down without configuration', async () => {
@@ -52,7 +56,7 @@ describe('asset drop-down', () => {
await dropDown.open();
- expect(screen.getByText('No assets.')).toBeVisible();
+ expect(screen.getAllByText('No assets.')[0]).toBeVisible();
});
it('renders drop-down options', async () => {
diff --git a/packages/react-components/src/components/resource-explorers/testing/drop-down-variant/asset-model-drop-down.spec.tsx b/packages/resource-explorer/src/testing/drop-down-variant/asset-model-drop-down.spec.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/testing/drop-down-variant/asset-model-drop-down.spec.tsx
rename to packages/resource-explorer/src/testing/drop-down-variant/asset-model-drop-down.spec.tsx
diff --git a/packages/react-components/src/components/resource-explorers/testing/drop-down-variant/asset-property-drop-down.spec.tsx b/packages/resource-explorer/src/testing/drop-down-variant/asset-property-drop-down.spec.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/testing/drop-down-variant/asset-property-drop-down.spec.tsx
rename to packages/resource-explorer/src/testing/drop-down-variant/asset-property-drop-down.spec.tsx
diff --git a/packages/react-components/src/components/resource-explorers/testing/drop-down-variant/time-series-drop-down.spec.tsx b/packages/resource-explorer/src/testing/drop-down-variant/time-series-drop-down.spec.tsx
similarity index 98%
rename from packages/react-components/src/components/resource-explorers/testing/drop-down-variant/time-series-drop-down.spec.tsx
rename to packages/resource-explorer/src/testing/drop-down-variant/time-series-drop-down.spec.tsx
index 2535f58e5..7532767d1 100644
--- a/packages/react-components/src/components/resource-explorers/testing/drop-down-variant/time-series-drop-down.spec.tsx
+++ b/packages/resource-explorer/src/testing/drop-down-variant/time-series-drop-down.spec.tsx
@@ -48,7 +48,11 @@ describe('time series drop-down', () => {
await dropDown.open();
- expect(screen.getByText('No time series.')).toBeVisible();
+ /**
+ * cloudscape added an extra span for screenreaders
+ * that is detected by the testing framework
+ */
+ expect(screen.getAllByText('No time series.')[0]).toBeVisible();
});
it('renders a multi-select drop-down without configuration', async () => {
@@ -58,7 +62,7 @@ describe('time series drop-down', () => {
await dropDown.open();
- expect(screen.getByText('No time series.')).toBeVisible();
+ expect(screen.getAllByText('No time series.')[0]).toBeVisible();
});
it('renders drop-down options', async () => {
diff --git a/packages/react-components/src/components/resource-explorers/testing/helpers/drop-down.tsx b/packages/resource-explorer/src/testing/helpers/drop-down.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/testing/helpers/drop-down.tsx
rename to packages/resource-explorer/src/testing/helpers/drop-down.tsx
diff --git a/packages/react-components/src/components/resource-explorers/testing/helpers/responses.ts b/packages/resource-explorer/src/testing/helpers/responses.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/testing/helpers/responses.ts
rename to packages/resource-explorer/src/testing/helpers/responses.ts
diff --git a/packages/react-components/src/components/resource-explorers/testing/helpers/table.tsx b/packages/resource-explorer/src/testing/helpers/table.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/testing/helpers/table.tsx
rename to packages/resource-explorer/src/testing/helpers/table.tsx
diff --git a/packages/react-components/src/components/resource-explorers/testing/table-variant/alarm-table.spec.tsx b/packages/resource-explorer/src/testing/table-variant/alarm-table.spec.tsx
similarity index 99%
rename from packages/react-components/src/components/resource-explorers/testing/table-variant/alarm-table.spec.tsx
rename to packages/resource-explorer/src/testing/table-variant/alarm-table.spec.tsx
index 17319a600..b40e72e74 100644
--- a/packages/react-components/src/components/resource-explorers/testing/table-variant/alarm-table.spec.tsx
+++ b/packages/resource-explorer/src/testing/table-variant/alarm-table.spec.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
import { AlarmExplorer } from '../../explorers';
import { resourceExplorerQueryClient } from '../../requests';
import * as table from '../helpers/table';
-import { queryClient } from '../../../../queries';
+import { queryClient } from '@iot-app-kit/component-core';
describe('alarm table', () => {
beforeEach(() => {
diff --git a/packages/react-components/src/components/resource-explorers/testing/table-variant/asset-model-table.spec.tsx b/packages/resource-explorer/src/testing/table-variant/asset-model-table.spec.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/testing/table-variant/asset-model-table.spec.tsx
rename to packages/resource-explorer/src/testing/table-variant/asset-model-table.spec.tsx
diff --git a/packages/react-components/src/components/resource-explorers/testing/table-variant/asset-property-table.spec.tsx b/packages/resource-explorer/src/testing/table-variant/asset-property-table.spec.tsx
similarity index 99%
rename from packages/react-components/src/components/resource-explorers/testing/table-variant/asset-property-table.spec.tsx
rename to packages/resource-explorer/src/testing/table-variant/asset-property-table.spec.tsx
index e10e40f2b..2fb0ab728 100644
--- a/packages/react-components/src/components/resource-explorers/testing/table-variant/asset-property-table.spec.tsx
+++ b/packages/resource-explorer/src/testing/table-variant/asset-property-table.spec.tsx
@@ -4,10 +4,10 @@ import type {
ListAssetModelProperties,
ListAssetProperties,
} from '@iot-app-kit/core';
+import { formatDate } from '@iot-app-kit/core';
import { render, screen, within } from '@testing-library/react';
import ue from '@testing-library/user-event';
import { useState } from 'react';
-import { formatDate } from '../../../../utils/time';
import { DEFAULT_LATEST_VALUE_REQUEST_INTERVAL } from '../../constants/defaults';
import { AssetPropertyExplorer } from '../../explorers';
import { resourceExplorerQueryClient } from '../../requests';
diff --git a/packages/react-components/src/components/resource-explorers/testing/table-variant/asset-table.spec.tsx b/packages/resource-explorer/src/testing/table-variant/asset-table.spec.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/testing/table-variant/asset-table.spec.tsx
rename to packages/resource-explorer/src/testing/table-variant/asset-table.spec.tsx
diff --git a/packages/react-components/src/components/resource-explorers/testing/table-variant/time-series-table.spec.tsx b/packages/resource-explorer/src/testing/table-variant/time-series-table.spec.tsx
similarity index 99%
rename from packages/react-components/src/components/resource-explorers/testing/table-variant/time-series-table.spec.tsx
rename to packages/resource-explorer/src/testing/table-variant/time-series-table.spec.tsx
index 73f924974..4c10106b3 100644
--- a/packages/react-components/src/components/resource-explorers/testing/table-variant/time-series-table.spec.tsx
+++ b/packages/resource-explorer/src/testing/table-variant/time-series-table.spec.tsx
@@ -2,10 +2,10 @@ import type {
BatchGetAssetPropertyValue,
ListTimeSeries,
} from '@iot-app-kit/core';
+import { formatDate } from '@iot-app-kit/core';
import { render, screen, within } from '@testing-library/react';
import ue from '@testing-library/user-event';
import { useState } from 'react';
-import { formatDate } from '../../../../utils/time';
import { DEFAULT_LATEST_VALUE_REQUEST_INTERVAL } from '../../constants/defaults';
import { TimeSeriesExplorer } from '../../explorers';
import { resourceExplorerQueryClient } from '../../requests';
diff --git a/packages/react-components/src/components/resource-explorers/types/common.ts b/packages/resource-explorer/src/types/common.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/types/common.ts
rename to packages/resource-explorer/src/types/common.ts
diff --git a/packages/react-components/src/components/resource-explorers/types/drop-down.ts b/packages/resource-explorer/src/types/drop-down.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/types/drop-down.ts
rename to packages/resource-explorer/src/types/drop-down.ts
diff --git a/packages/react-components/src/components/resource-explorers/types/requests.ts b/packages/resource-explorer/src/types/requests.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/types/requests.ts
rename to packages/resource-explorer/src/types/requests.ts
diff --git a/packages/react-components/src/components/resource-explorers/types/resource-explorer.ts b/packages/resource-explorer/src/types/resource-explorer.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/types/resource-explorer.ts
rename to packages/resource-explorer/src/types/resource-explorer.ts
diff --git a/packages/react-components/src/components/resource-explorers/types/resources.ts b/packages/resource-explorer/src/types/resources.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/types/resources.ts
rename to packages/resource-explorer/src/types/resources.ts
diff --git a/packages/react-components/src/components/resource-explorers/types/table.ts b/packages/resource-explorer/src/types/table.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/types/table.ts
rename to packages/resource-explorer/src/types/table.ts
diff --git a/packages/react-components/src/components/resource-explorers/variants/index.ts b/packages/resource-explorer/src/variants/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/index.ts
rename to packages/resource-explorer/src/variants/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-drop-down/index.ts b/packages/resource-explorer/src/variants/resource-drop-down/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-drop-down/index.ts
rename to packages/resource-explorer/src/variants/resource-drop-down/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-drop-down/resource-drop-down.tsx b/packages/resource-explorer/src/variants/resource-drop-down/resource-drop-down.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-drop-down/resource-drop-down.tsx
rename to packages/resource-explorer/src/variants/resource-drop-down/resource-drop-down.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/index.ts b/packages/resource-explorer/src/variants/resource-table/index.ts
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/index.ts
rename to packages/resource-explorer/src/variants/resource-table/index.ts
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-empty.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table-empty.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-empty.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table-empty.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-error.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table-error.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-error.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table-error.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-filter.css b/packages/resource-explorer/src/variants/resource-table/resource-table-filter.css
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-filter.css
rename to packages/resource-explorer/src/variants/resource-table/resource-table-filter.css
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-filter.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table-filter.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-filter.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table-filter.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-header.css b/packages/resource-explorer/src/variants/resource-table/resource-table-header.css
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-header.css
rename to packages/resource-explorer/src/variants/resource-table/resource-table-header.css
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-header.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table-header.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-header.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table-header.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-no-filter-match.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table-no-filter-match.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-no-filter-match.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table-no-filter-match.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-pagination.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table-pagination.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-pagination.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table-pagination.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-search.css b/packages/resource-explorer/src/variants/resource-table/resource-table-search.css
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-search.css
rename to packages/resource-explorer/src/variants/resource-table/resource-table-search.css
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-search.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table-search.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-search.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table-search.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-title.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table-title.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-title.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table-title.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-user-settings.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table-user-settings.tsx
similarity index 100%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table-user-settings.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table-user-settings.tsx
diff --git a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table.tsx b/packages/resource-explorer/src/variants/resource-table/resource-table.tsx
similarity index 97%
rename from packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table.tsx
rename to packages/resource-explorer/src/variants/resource-table/resource-table.tsx
index 673903443..ede4d5478 100644
--- a/packages/react-components/src/components/resource-explorers/variants/resource-table/resource-table.tsx
+++ b/packages/resource-explorer/src/variants/resource-table/resource-table.tsx
@@ -16,6 +16,7 @@ import { ResourceTablePagination } from './resource-table-pagination';
import { ResourceTableSearch } from './resource-table-search';
import { ResourceTableTitle } from './resource-table-title';
import { ResourceTableUserSettings } from './resource-table-user-settings';
+import { colorBackgroundContainerContent } from '@cloudscape-design/design-tokens';
export function ResourceTable