@journeyapps-labs/reactor-mod-data-browser 2.2.0 → 2.4.0

package/src/panels/query/TableControlsWidget.tsx

@@ -1,9 +1,25 @@
 import * as React from 'react';
-import { ComboBoxItem, PanelButtonWidget, PanelDropdownWidget, styled } from '@journeyapps-labs/reactor-mod';
+import {
+  ComboBoxItem,
+  ioc,
+  PanelButtonWidget,
+  PanelDropdownWidget,
+  setupTooltipProps,
+  styled,
+  theme,
+  ThemeStore,
+  TooltipPosition,
+  WorkspaceStore
+} from '@journeyapps-labs/reactor-mod';
 import { AbstractQuery } from '../../core/query/AbstractQuery';
 import { observer } from 'mobx-react';
 import * as _ from 'lodash';
 import { Page } from '../../core/query/Page';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { SimplePage } from '../../core/query/query-simple/SimplePage';
+import { QueryPanelModel } from './QueryPanelFactory';
+import { ChangedModelQuery } from '../../core/query/query-changed/ChangedModelQuery';
+import { SimpleQuery } from '../../core/query/query-simple/SimpleQuery';
 
 export interface TableControlsWidgetProps {
   current_page: Page;
@@ -13,6 +29,8 @@ export interface TableControlsWidgetProps {
 }
 
 export const TableControlsWidget: React.FC<TableControlsWidgetProps> = observer((props) => {
+  const _theme = ioc.get(ThemeStore).getCurrentTheme(theme);
+  const dirtyObjects = props.query.getDirtyObjects();
   return (
     <S.Container className={props.className}>
       <PanelButtonWidget
@@ -22,6 +40,13 @@ export const TableControlsWidget: React.FC<TableControlsWidgetProps> = observer(
           props.goToPage(props.current_page.index - 1);
         }}
       />
+      <PanelButtonWidget
+        disabled={props.query.totalPages == props.current_page.index + 1}
+        label="Next"
+        action={() => {
+          props.goToPage(props.current_page.index + 1);
+        }}
+      />
       <S.PageSelector>
         <PanelDropdownWidget
           onChange={({ key }) => {
@@ -37,29 +62,65 @@ export const TableControlsWidget: React.FC<TableControlsWidgetProps> = observer(
         />
         <S.TotalPages>/ {props.query.totalPages}</S.TotalPages>
       </S.PageSelector>
+      {props.current_page instanceof SimplePage ? (
+        <PanelButtonWidget
+          label="Page"
+          tooltip="Reload page"
+          icon="refresh"
+          action={async () => {
+            await (props.current_page as SimplePage).load();
+          }}
+        />
+      ) : null}
       <PanelButtonWidget
-        disabled={props.query.totalPages == props.current_page.index + 1}
-        label="Next"
-        action={() => {
-          props.goToPage(props.current_page.index + 1);
-        }}
-      />
-      <PanelButtonWidget
-        label="Page"
-        tooltip="Reload page"
-        icon="refresh"
-        action={() => {
-          props.current_page.load();
-        }}
-      />
-      <PanelButtonWidget
-        label="Query"
         tooltip="Reload Query"
         icon="refresh"
         action={async (event, loading) => {
           await props.query.load();
         }}
       />
+      {dirtyObjects.length > 0 ? (
+        <>
+          <PanelButtonWidget
+            label={`Save all [${dirtyObjects.length}]`}
+            icon="save"
+            iconColor={_theme.status.success}
+            action={async (event, loading) => {
+              props.query.batchSave();
+            }}
+          />
+          <span
+            {...setupTooltipProps({
+              tooltip: 'Discard all edits',
+              tooltipPos: TooltipPosition.RIGHT
+            })}
+          >
+            <S.RevertButton
+              icon="arrow-rotate-back"
+              onClick={() => {
+                props.current_page.reset();
+              }}
+            />
+          </span>
+          {props.query instanceof SimpleQuery ? (
+            <span
+              {...setupTooltipProps({
+                tooltip: 'View changed models',
+                tooltipPos: TooltipPosition.RIGHT
+              })}
+            >
+              <S.RevertButton
+                icon="eye"
+                onClick={() => {
+                  ioc
+                    .get(WorkspaceStore)
+                    .addModel(new QueryPanelModel(new ChangedModelQuery(props.query as SimpleQuery)));
+                }}
+              />
+            </span>
+          ) : null}
+        </>
+      ) : null}
     </S.Container>
   );
 });
@@ -82,4 +143,11 @@ namespace S {
     color: ${(p) => p.theme.text.primary};
     padding-left: 5px;
   `;
+
+  export const RevertButton = styled(FontAwesomeIcon)`
+    color: ${(p) => p.theme.status.success};
+    font-size: 12px;
+    padding: 5px;
+    cursor: pointer;
+  `;
 }

package/webpack.config.js

@@ -1,9 +1,16 @@
-const { patchExportedLibrary } = require('@journeyapps-labs/lib-reactor-builder');
+const { patchExportedLibrary, patchImportedLibrary } = require('@journeyapps-labs/lib-reactor-builder');
 module.exports = (webpack) => {
-  return patchExportedLibrary({
+  webpack = patchExportedLibrary({
     w: webpack,
     module: '@journeyapps/db',
     dir: __dirname,
     alias: true
   });
+
+  webpack = patchImportedLibrary({
+    w: webpack,
+    module: 'react-monaco-editor'
+  });
+
+  return webpack;
 };

package/dist/core/query/SimpleQuery.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SimpleQuery.js","sourceRoot":"","sources":["../../../src/core/query/SimpleQuery.tsx"],"names":[],"mappings":"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"}