@quillsql/admin 1.6.4 → 1.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Admin.d.ts +11 -8
- package/dist/cjs/Admin.d.ts.map +1 -1
- package/dist/cjs/Admin.js +114 -7
- package/dist/cjs/AdminProvider.d.ts +24 -5
- package/dist/cjs/AdminProvider.d.ts.map +1 -1
- package/dist/cjs/AdminProvider.js +173 -85
- package/dist/cjs/api/ConnectionClient.d.ts +6 -3
- package/dist/cjs/api/ConnectionClient.d.ts.map +1 -1
- package/dist/cjs/api/ConnectionClient.js +66 -6
- package/dist/cjs/assets/ArrowDownHeadIcon.d.ts.map +1 -1
- package/dist/cjs/assets/XIcon.d.ts.map +1 -1
- package/dist/cjs/components/ClipboardButton.d.ts.map +1 -1
- package/dist/cjs/components/DashboardSelectPopover.d.ts.map +1 -1
- package/dist/cjs/components/DashboardSelectPopover.js +29 -1
- package/dist/cjs/components/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/cjs/components/InternalDashboard/DashboardFilter.d.ts +1 -1
- package/dist/cjs/components/InternalDashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/cjs/components/InternalDashboard/DashboardLoadingComponent.d.ts.map +1 -1
- package/dist/cjs/components/InternalDashboard/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/cjs/components/InternalDashboard/InternalDashboard.d.ts.map +1 -1
- package/dist/cjs/components/InternalDashboard/InternalDashboard.js +114 -34
- package/dist/cjs/components/OrgSelect.d.ts.map +1 -1
- package/dist/cjs/components/OrgSelect.js +48 -4
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts +5 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillMultiSelectWithCombo.js +328 -149
- package/dist/cjs/components/QuillSelectWithCombo.d.ts +4 -3
- package/dist/cjs/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/cjs/components/QuillSelectWithCombo.js +34 -6
- package/dist/cjs/components/QuillToolTipPortal.d.ts.map +1 -1
- package/dist/cjs/components/SqlTextEditor.d.ts.map +1 -1
- package/dist/cjs/components/SqlTextEditor.js +15 -2
- package/dist/cjs/components/Tenants/EditTenant.d.ts.map +1 -1
- package/dist/cjs/components/Tenants/EditTenant.js +51 -8
- package/dist/cjs/components/UiComponents.d.ts.map +1 -1
- package/dist/cjs/components/UiComponents.js +1 -0
- package/dist/cjs/forms/client_onboard/ConnectDatabase.d.ts.map +1 -1
- package/dist/cjs/forms/client_onboard/ConnectDatabase.js +50 -2
- package/dist/cjs/forms/client_onboard/ConnectSchema.d.ts.map +1 -1
- package/dist/cjs/forms/client_onboard/ConnectSchema.js +33 -1
- package/dist/cjs/forms/client_onboard/CreateVirtualTables.d.ts +2 -1
- package/dist/cjs/forms/client_onboard/CreateVirtualTables.d.ts.map +1 -1
- package/dist/cjs/forms/client_onboard/CreateVirtualTables.js +55 -21
- package/dist/cjs/forms/client_onboard/__tests__/ConnectSchema.test.js +1 -1
- package/dist/cjs/forms/client_onboard/__tests__/CreateVirtualTables.test.js +1 -1
- package/dist/cjs/forms/virtual_tables/CreateEditVirtualTable.d.ts.map +1 -1
- package/dist/cjs/forms/virtual_tables/CreateEditVirtualTable.js +92 -10
- package/dist/cjs/hooks/useDatabaseSchema.d.ts.map +1 -1
- package/dist/cjs/hooks/useDatabaseSchema.js +12 -1
- package/dist/cjs/hooks/useLongLoading.d.ts +13 -0
- package/dist/cjs/hooks/useLongLoading.d.ts.map +1 -0
- package/dist/cjs/hooks/useLongLoading.js +67 -0
- package/dist/cjs/hooks/useOnClickOutside.d.ts.map +1 -1
- package/dist/cjs/hooks/useThrottle.d.ts.map +1 -1
- package/dist/cjs/icons/ArrowDownHeadIcon.d.ts.map +1 -1
- package/dist/cjs/icons/CheckCircleIcon.d.ts.map +1 -1
- package/dist/cjs/icons/ExclamationFilledIcon.d.ts.map +1 -1
- package/dist/cjs/icons/ExteriorLinkIcon.d.ts.map +1 -1
- package/dist/cjs/icons/QuestionMarkCircleIcon.d.ts.map +1 -1
- package/dist/cjs/modals/CodePreview.d.ts.map +1 -1
- package/dist/cjs/modals/CodePreview.js +7 -2
- package/dist/cjs/modals/CreateEnvironmentModal.d.ts +5 -0
- package/dist/cjs/modals/CreateEnvironmentModal.d.ts.map +1 -0
- package/dist/cjs/modals/CreateEnvironmentModal.js +21 -0
- package/dist/cjs/modals/EditEnvironmentModal.d.ts.map +1 -1
- package/dist/cjs/modals/EditEnvironmentModal.js +67 -15
- package/dist/cjs/modals/EditFiltersModal.d.ts.map +1 -1
- package/dist/cjs/modals/EditFiltersModal.js +12 -8
- package/dist/cjs/modals/NewDashboardModal.d.ts.map +1 -1
- package/dist/cjs/modals/NewDashboardModal.js +54 -28
- package/dist/cjs/modals/PromoteReportModal.d.ts.map +1 -1
- package/dist/cjs/modals/PromoteReportModal.js +15 -4
- package/dist/cjs/modals/PromoteViewModal.d.ts.map +1 -1
- package/dist/cjs/modals/PromoteViewModal.js +13 -2
- package/dist/cjs/primitives/CheckboxPrimitive.d.ts.map +1 -1
- package/dist/cjs/primitives/CheckboxPrimitive.js +2 -0
- package/dist/cjs/primitives/PopoverPrimitive.d.ts.map +1 -1
- package/dist/cjs/primitives/PopoverPrimitive.js +16 -5
- package/dist/cjs/primitives/TogglePrimitive.d.ts.map +1 -1
- package/dist/cjs/public_components/ChartQueryBuilder.d.ts.map +1 -1
- package/dist/cjs/public_components/ChartQueryBuilder.js +6 -6
- package/dist/cjs/public_components/CreateEnvironment.d.ts.map +1 -1
- package/dist/cjs/public_components/CreateEnvironment.js +49 -16
- package/dist/cjs/public_components/DashboardManager.d.ts.map +1 -1
- package/dist/cjs/public_components/DashboardManager.js +63 -5
- package/dist/cjs/public_components/EnvSelectPopover.d.ts.map +1 -1
- package/dist/cjs/public_components/EnvSelectPopover.js +31 -3
- package/dist/cjs/public_components/VirtualTableManager.d.ts.map +1 -1
- package/dist/cjs/public_components/VirtualTableManager.js +95 -5
- package/dist/cjs/public_components/__tests__/CreateEnvironment.test.js +41 -2
- package/dist/cjs/utils/astProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/columnProcessing.d.ts.map +1 -1
- package/dist/cjs/utils/columnProcessing.js +6 -1
- package/dist/cjs/utils/dataEditor.d.ts.map +1 -1
- package/dist/cjs/utils/dataFetcher.d.ts.map +1 -1
- package/dist/cjs/utils/databases.d.ts +6 -1
- package/dist/cjs/utils/databases.d.ts.map +1 -1
- package/dist/cjs/utils/databases.js +18 -0
- package/dist/cjs/utils/delay.d.ts.map +1 -1
- package/dist/cjs/utils/filter.d.ts +17 -21
- package/dist/cjs/utils/filter.d.ts.map +1 -1
- package/dist/cjs/utils/filter.js +6 -6
- package/dist/cjs/utils/report.d.ts +5 -5
- package/dist/cjs/utils/report.d.ts.map +1 -1
- package/dist/cjs/utils/schema.d.ts +6 -3
- package/dist/cjs/utils/schema.d.ts.map +1 -1
- package/dist/cjs/utils/schema.js +42 -3
- package/dist/cjs/utils/table.d.ts.map +1 -1
- package/dist/cjs/utils/tenants.d.ts.map +1 -1
- package/dist/cjs/utils/ui.d.ts.map +1 -1
- package/dist/esm/Admin.d.ts +11 -8
- package/dist/esm/Admin.d.ts.map +1 -1
- package/dist/esm/Admin.js +115 -8
- package/dist/esm/AdminProvider.d.ts +24 -5
- package/dist/esm/AdminProvider.d.ts.map +1 -1
- package/dist/esm/AdminProvider.js +174 -86
- package/dist/esm/api/ConnectionClient.d.ts +6 -3
- package/dist/esm/api/ConnectionClient.d.ts.map +1 -1
- package/dist/esm/api/ConnectionClient.js +66 -6
- package/dist/esm/assets/ArrowDownHeadIcon.d.ts.map +1 -1
- package/dist/esm/assets/XIcon.d.ts.map +1 -1
- package/dist/esm/components/ClipboardButton.d.ts.map +1 -1
- package/dist/esm/components/DashboardSelectPopover.d.ts.map +1 -1
- package/dist/esm/components/DashboardSelectPopover.js +29 -1
- package/dist/esm/components/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/esm/components/InternalDashboard/DashboardFilter.d.ts +1 -1
- package/dist/esm/components/InternalDashboard/DashboardFilter.d.ts.map +1 -1
- package/dist/esm/components/InternalDashboard/DashboardFilter.js +1 -1
- package/dist/esm/components/InternalDashboard/DashboardLoadingComponent.d.ts.map +1 -1
- package/dist/esm/components/InternalDashboard/DateRangePicker/dateRangePickerUtils.d.ts.map +1 -1
- package/dist/esm/components/InternalDashboard/InternalDashboard.d.ts.map +1 -1
- package/dist/esm/components/InternalDashboard/InternalDashboard.js +115 -35
- package/dist/esm/components/OrgSelect.d.ts.map +1 -1
- package/dist/esm/components/OrgSelect.js +48 -4
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts +5 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillMultiSelectWithCombo.js +328 -149
- package/dist/esm/components/QuillSelectWithCombo.d.ts +4 -3
- package/dist/esm/components/QuillSelectWithCombo.d.ts.map +1 -1
- package/dist/esm/components/QuillSelectWithCombo.js +34 -6
- package/dist/esm/components/QuillToolTipPortal.d.ts.map +1 -1
- package/dist/esm/components/SqlTextEditor.d.ts.map +1 -1
- package/dist/esm/components/SqlTextEditor.js +15 -2
- package/dist/esm/components/Tenants/EditTenant.d.ts.map +1 -1
- package/dist/esm/components/Tenants/EditTenant.js +51 -8
- package/dist/esm/components/UiComponents.d.ts.map +1 -1
- package/dist/esm/components/UiComponents.js +1 -0
- package/dist/esm/forms/client_onboard/ConnectDatabase.d.ts.map +1 -1
- package/dist/esm/forms/client_onboard/ConnectDatabase.js +50 -2
- package/dist/esm/forms/client_onboard/ConnectSchema.d.ts.map +1 -1
- package/dist/esm/forms/client_onboard/ConnectSchema.js +33 -1
- package/dist/esm/forms/client_onboard/CreateVirtualTables.d.ts +2 -1
- package/dist/esm/forms/client_onboard/CreateVirtualTables.d.ts.map +1 -1
- package/dist/esm/forms/client_onboard/CreateVirtualTables.js +56 -22
- package/dist/esm/forms/client_onboard/__tests__/ConnectSchema.test.js +1 -1
- package/dist/esm/forms/client_onboard/__tests__/CreateVirtualTables.test.js +1 -1
- package/dist/esm/forms/virtual_tables/CreateEditVirtualTable.d.ts.map +1 -1
- package/dist/esm/forms/virtual_tables/CreateEditVirtualTable.js +93 -11
- package/dist/esm/hooks/useDatabaseSchema.d.ts.map +1 -1
- package/dist/esm/hooks/useDatabaseSchema.js +12 -1
- package/dist/esm/hooks/useLongLoading.d.ts +13 -0
- package/dist/esm/hooks/useLongLoading.d.ts.map +1 -0
- package/dist/esm/hooks/useLongLoading.js +64 -0
- package/dist/esm/hooks/useOnClickOutside.d.ts.map +1 -1
- package/dist/esm/hooks/useThrottle.d.ts.map +1 -1
- package/dist/esm/icons/ArrowDownHeadIcon.d.ts.map +1 -1
- package/dist/esm/icons/CheckCircleIcon.d.ts.map +1 -1
- package/dist/esm/icons/ExclamationFilledIcon.d.ts.map +1 -1
- package/dist/esm/icons/ExteriorLinkIcon.d.ts.map +1 -1
- package/dist/esm/icons/QuestionMarkCircleIcon.d.ts.map +1 -1
- package/dist/esm/modals/CodePreview.d.ts.map +1 -1
- package/dist/esm/modals/CodePreview.js +7 -2
- package/dist/esm/modals/CreateEnvironmentModal.d.ts +5 -0
- package/dist/esm/modals/CreateEnvironmentModal.d.ts.map +1 -0
- package/dist/esm/modals/CreateEnvironmentModal.js +15 -0
- package/dist/esm/modals/EditEnvironmentModal.d.ts.map +1 -1
- package/dist/esm/modals/EditEnvironmentModal.js +67 -15
- package/dist/esm/modals/EditFiltersModal.d.ts.map +1 -1
- package/dist/esm/modals/EditFiltersModal.js +13 -9
- package/dist/esm/modals/NewDashboardModal.d.ts.map +1 -1
- package/dist/esm/modals/NewDashboardModal.js +55 -29
- package/dist/esm/modals/PromoteReportModal.d.ts.map +1 -1
- package/dist/esm/modals/PromoteReportModal.js +15 -4
- package/dist/esm/modals/PromoteViewModal.d.ts.map +1 -1
- package/dist/esm/modals/PromoteViewModal.js +13 -2
- package/dist/esm/primitives/CheckboxPrimitive.d.ts.map +1 -1
- package/dist/esm/primitives/CheckboxPrimitive.js +2 -0
- package/dist/esm/primitives/PopoverPrimitive.d.ts.map +1 -1
- package/dist/esm/primitives/PopoverPrimitive.js +16 -5
- package/dist/esm/primitives/TogglePrimitive.d.ts.map +1 -1
- package/dist/esm/public_components/ChartQueryBuilder.d.ts.map +1 -1
- package/dist/esm/public_components/ChartQueryBuilder.js +8 -8
- package/dist/esm/public_components/CreateEnvironment.d.ts.map +1 -1
- package/dist/esm/public_components/CreateEnvironment.js +49 -16
- package/dist/esm/public_components/DashboardManager.d.ts.map +1 -1
- package/dist/esm/public_components/DashboardManager.js +64 -6
- package/dist/esm/public_components/EnvSelectPopover.d.ts.map +1 -1
- package/dist/esm/public_components/EnvSelectPopover.js +31 -3
- package/dist/esm/public_components/VirtualTableManager.d.ts.map +1 -1
- package/dist/esm/public_components/VirtualTableManager.js +95 -5
- package/dist/esm/public_components/__tests__/CreateEnvironment.test.js +41 -2
- package/dist/esm/utils/astProcessing.d.ts.map +1 -1
- package/dist/esm/utils/columnProcessing.d.ts.map +1 -1
- package/dist/esm/utils/columnProcessing.js +6 -1
- package/dist/esm/utils/dataEditor.d.ts.map +1 -1
- package/dist/esm/utils/dataFetcher.d.ts.map +1 -1
- package/dist/esm/utils/databases.d.ts +6 -1
- package/dist/esm/utils/databases.d.ts.map +1 -1
- package/dist/esm/utils/databases.js +18 -0
- package/dist/esm/utils/delay.d.ts.map +1 -1
- package/dist/esm/utils/filter.d.ts +17 -21
- package/dist/esm/utils/filter.d.ts.map +1 -1
- package/dist/esm/utils/filter.js +5 -5
- package/dist/esm/utils/report.d.ts +5 -5
- package/dist/esm/utils/report.d.ts.map +1 -1
- package/dist/esm/utils/schema.d.ts +6 -3
- package/dist/esm/utils/schema.d.ts.map +1 -1
- package/dist/esm/utils/schema.js +42 -3
- package/dist/esm/utils/table.d.ts.map +1 -1
- package/dist/esm/utils/tenants.d.ts.map +1 -1
- package/dist/esm/utils/ui.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -10,32 +10,35 @@ import { SINGLE_TENANT } from '../utils/constants';
|
|
|
10
10
|
import { EditTenant } from '../components/Tenants/EditTenant';
|
|
11
11
|
import { getTableColumnsBySchema } from '../api/ConnectionClient';
|
|
12
12
|
import { useDashboardManager } from '../hooks/useDashboardManager';
|
|
13
|
-
const header1Style = {
|
|
14
|
-
fontWeight: '600',
|
|
15
|
-
fontSize: '18px',
|
|
16
|
-
marginBottom: '6px',
|
|
17
|
-
color: '#000000',
|
|
18
|
-
};
|
|
19
|
-
const header2Style = {
|
|
20
|
-
fontWeight: '500',
|
|
21
|
-
fontSize: '13px',
|
|
22
|
-
color: '#595959',
|
|
23
|
-
marginBottom: '4px',
|
|
24
|
-
};
|
|
25
13
|
export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent, TextInputComponent, ButtonComponent, HeaderComponent, SecondaryButtonComponent, }) {
|
|
26
|
-
const { state, dispatch, setClient, getToken, quillFetchWithToken } = useAdmin();
|
|
14
|
+
const { state, dispatch, setClient, getToken, quillFetchWithToken, eventTracking, } = useAdmin();
|
|
27
15
|
const { setSelectedDashboard } = useDashboardManager();
|
|
28
16
|
const [selectedEnvironmentName, setSelectedEnvironmentName] = useState(state.client.name);
|
|
29
17
|
const [copied, setCopied] = useState(false);
|
|
30
18
|
const [isSubmitTenantLoading, setSubmitTenantLoading] = useState(false);
|
|
31
19
|
const [validationError, setValidationError] = useState(undefined);
|
|
32
20
|
const [formError, setFormError] = useState(undefined);
|
|
33
|
-
|
|
34
|
-
|
|
21
|
+
const connectionDetails = useMemo(() => {
|
|
22
|
+
return getDatabaseConnectionFormat(state.client?.databaseType || '');
|
|
23
|
+
}, [state.client?.databaseType]);
|
|
35
24
|
const [tenantToEdit, setTenantToEdit] = useState(undefined);
|
|
36
25
|
const [fetchSchemasLoading, setFetchSchemasLoading] = useState(false);
|
|
37
26
|
const [createNewTenant, setCreateNewTenant] = useState(false);
|
|
38
27
|
const [isConnectDatabaseModalOpen, setIsConnectDatabaseModalOpen] = useState(false);
|
|
28
|
+
const header1Style = {
|
|
29
|
+
fontWeight: '600',
|
|
30
|
+
fontSize: '18px',
|
|
31
|
+
marginBottom: '6px',
|
|
32
|
+
color: state.theme?.primaryTextColor,
|
|
33
|
+
fontFamily: state.theme?.fontFamily,
|
|
34
|
+
};
|
|
35
|
+
const header2Style = {
|
|
36
|
+
fontWeight: '500',
|
|
37
|
+
fontSize: '13px',
|
|
38
|
+
marginBottom: '4px',
|
|
39
|
+
fontFamily: state.theme?.fontFamily,
|
|
40
|
+
color: state.theme?.secondaryTextColor,
|
|
41
|
+
};
|
|
39
42
|
const tenantRequest = async (tenant, mode) => {
|
|
40
43
|
if (!tenant.clientId) {
|
|
41
44
|
throw new Error('Client ID is required on tenant');
|
|
@@ -80,11 +83,27 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
|
|
|
80
83
|
if (!results.length) {
|
|
81
84
|
setFormError(`No rows were returned from this ${tenant.tenantTableQuery ? 'query' : 'table'}`);
|
|
82
85
|
}
|
|
86
|
+
const uniqueIds = new Set(results?.map((r) => r.id));
|
|
87
|
+
if (uniqueIds.size < results?.length) {
|
|
88
|
+
setFormError('Duplicate tenant IDs found in results. Each tenant must have a unique ID.');
|
|
89
|
+
return [];
|
|
90
|
+
}
|
|
83
91
|
return results;
|
|
84
92
|
}
|
|
85
93
|
}
|
|
86
94
|
catch (e) {
|
|
87
95
|
setFormError(e.message);
|
|
96
|
+
eventTracking?.logError?.({
|
|
97
|
+
type: 'bug', // TODO: determine type
|
|
98
|
+
severity: 'high',
|
|
99
|
+
message: 'Error validating tenant',
|
|
100
|
+
errorMessage: e.message,
|
|
101
|
+
errorStack: e.stack,
|
|
102
|
+
errorData: {
|
|
103
|
+
caller: 'EditEnvironmentModal',
|
|
104
|
+
function: 'onValidateEditTenant',
|
|
105
|
+
},
|
|
106
|
+
});
|
|
88
107
|
throw e;
|
|
89
108
|
}
|
|
90
109
|
finally {
|
|
@@ -199,6 +218,17 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
|
|
|
199
218
|
}, 50);
|
|
200
219
|
}
|
|
201
220
|
catch (e) {
|
|
221
|
+
eventTracking?.logError?.({
|
|
222
|
+
type: 'bug', // TODO: determine type
|
|
223
|
+
severity: 'high',
|
|
224
|
+
message: 'Error submitting tenant',
|
|
225
|
+
errorMessage: e.message,
|
|
226
|
+
errorStack: e.stack,
|
|
227
|
+
errorData: {
|
|
228
|
+
caller: 'EditEnvironmentModal',
|
|
229
|
+
function: 'onSubmitEditTenant',
|
|
230
|
+
},
|
|
231
|
+
});
|
|
202
232
|
setFormError(e.message);
|
|
203
233
|
}
|
|
204
234
|
finally {
|
|
@@ -244,6 +274,17 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
|
|
|
244
274
|
}
|
|
245
275
|
catch (e) {
|
|
246
276
|
console.log('error', e);
|
|
277
|
+
eventTracking?.logError?.({
|
|
278
|
+
type: 'bug', // TODO: determine type
|
|
279
|
+
severity: 'high',
|
|
280
|
+
message: 'Error deleting tenant',
|
|
281
|
+
errorMessage: e.message,
|
|
282
|
+
errorStack: e.stack,
|
|
283
|
+
errorData: {
|
|
284
|
+
caller: 'EditEnvironmentModal',
|
|
285
|
+
function: 'onDeleteTenant',
|
|
286
|
+
},
|
|
287
|
+
});
|
|
247
288
|
setValidationError('Error deleting tenant');
|
|
248
289
|
}
|
|
249
290
|
finally {
|
|
@@ -338,6 +379,17 @@ export function EditEnvironmentModal({ isOpen, setIsOpen, onSave, ModalComponent
|
|
|
338
379
|
setIsConnectDatabaseModalOpen(false);
|
|
339
380
|
}
|
|
340
381
|
catch (e) {
|
|
382
|
+
eventTracking?.logError?.({
|
|
383
|
+
type: 'bug', // TODO: determine type
|
|
384
|
+
severity: 'high',
|
|
385
|
+
message: 'Error updating environment',
|
|
386
|
+
errorMessage: e.message,
|
|
387
|
+
errorStack: e.stack,
|
|
388
|
+
errorData: {
|
|
389
|
+
caller: 'EditEnvironmentModal',
|
|
390
|
+
function: 'handleUpdateEnvironment',
|
|
391
|
+
},
|
|
392
|
+
});
|
|
341
393
|
setIsConnectDatabaseModalOpen(false);
|
|
342
394
|
setValidationError(e.message);
|
|
343
395
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EditFiltersModal.d.ts","sourceRoot":"","sources":["../../../src/modals/EditFiltersModal.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwC,MAAM,OAAO,CAAC;AAExE,OAAO,EACL,oBAAoB,EAKrB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAEL,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AAOpC,OAA2B,EACzB,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAY1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"EditFiltersModal.d.ts","sourceRoot":"","sources":["../../../src/modals/EditFiltersModal.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwC,MAAM,OAAO,CAAC;AAExE,OAAO,EACL,oBAAoB,EAKrB,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAEL,oBAAoB,EACrB,MAAM,4BAA4B,CAAC;AAOpC,OAA2B,EACzB,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAY1C,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AAsBvF,wBAAgB,gBAAgB,CAAC,EAC/B,MAAM,EACN,qBAAqB,EACrB,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,eAAe,EACf,SAAS,EACT,wBAAwB,EACxB,cAAc,EACd,gBAAgB,GACjB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EAAE,KAAK,CAAC,yBAAyB,CAAC,uBAAuB,CAAC,CAAC;IAC7E,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,SAAS,EAAE,GAAG,CAAC;IACf,wBAAwB,EAAE,CAAC,KAAK,EAAE,6BAA6B,KAAK,SAAS,CAAC;IAC9E,cAAc,EAAE,GAAG,CAAC;IACpB,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B,2CA2kFA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
|
3
3
|
import { useAdmin } from '../AdminProvider';
|
|
4
|
-
import {
|
|
4
|
+
import { useDashboardInternal, useDashboards, } from '@quillsql/react';
|
|
5
5
|
import { SAVED_QUERIES_DASHBOARD,
|
|
6
6
|
// DateRangeOption,
|
|
7
7
|
// InitialDateRangeOptions,
|
|
@@ -47,7 +47,7 @@ const intervalTypeOptions = [
|
|
|
47
47
|
export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onSave, ModalComponent, TextInputComponent, ButtonComponent, HeaderComponent, SelectComponent, dashNames, SecondaryButtonComponent, ErrorComponent, openPromoteModal, }) {
|
|
48
48
|
const { state } = useAdmin();
|
|
49
49
|
const { dashboards, deleteDashboard, updateDashboard } = useDashboards();
|
|
50
|
-
const { data: selectedDashboard } =
|
|
50
|
+
const { data: selectedDashboard } = useDashboardInternal(selectedDashboardName);
|
|
51
51
|
const [isDateComparison, setIsDateComparison] = useState(false);
|
|
52
52
|
const [currentDashboardName, setCurrentDashboardName] = useState(selectedDashboardName);
|
|
53
53
|
const [newFilters, setNewFilters] = useState([]);
|
|
@@ -379,7 +379,8 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
|
|
|
379
379
|
return 'Dashboard name cannot be empty';
|
|
380
380
|
if (newFilters?.some((f) => !f.label || !f.table || !f.field))
|
|
381
381
|
return 'Filters must have a label, table, and field';
|
|
382
|
-
if (newFilters
|
|
382
|
+
if ((newFilters ?? [])
|
|
383
|
+
.concat(newDateFilter ? [newDateFilter] : [])
|
|
383
384
|
?.map((f) => f.label)
|
|
384
385
|
.filter((label, index, self) => self.indexOf(label) !== index).length)
|
|
385
386
|
return 'Filters must have unique labels';
|
|
@@ -422,14 +423,15 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
|
|
|
422
423
|
.join(' ') ?? '');
|
|
423
424
|
};
|
|
424
425
|
const handleSubmitDashboardChanges = async () => {
|
|
425
|
-
const validationErrorMessages = validateDashboard(newFilters, dashNames, currentDashboardName, newDateFilter ? { ...newDateFilter, comparison: isDateComparison } : null,
|
|
426
|
+
const validationErrorMessages = validateDashboard(newFilters, dashNames, currentDashboardName, newDateFilter ? { ...newDateFilter, comparison: isDateComparison } : null, selectedDashboard);
|
|
426
427
|
if (validationErrorMessages.length !== 0) {
|
|
427
428
|
setValidationError(validationErrorMessages);
|
|
428
429
|
return;
|
|
429
430
|
}
|
|
430
431
|
const updatedFilters = newFilters.map((filter) => {
|
|
431
432
|
const table = filteredTables.find((table) => table?.name === filter?.table);
|
|
432
|
-
const
|
|
433
|
+
const column = table?.columns.find((col) => col.field === filter?.field);
|
|
434
|
+
const filterType = column ? getPostgresBasicType(column) : 'string';
|
|
433
435
|
return {
|
|
434
436
|
table: filter.table,
|
|
435
437
|
field: filter.field,
|
|
@@ -1236,10 +1238,10 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
|
|
|
1236
1238
|
})
|
|
1237
1239
|
.map((column) => {
|
|
1238
1240
|
return {
|
|
1239
|
-
label: column.
|
|
1240
|
-
value: column.
|
|
1241
|
+
label: column.label || column.field,
|
|
1242
|
+
value: column.field,
|
|
1241
1243
|
};
|
|
1242
|
-
})
|
|
1244
|
+
}) || []
|
|
1243
1245
|
: [], onChange: (event) => {
|
|
1244
1246
|
// Capitalize the label
|
|
1245
1247
|
const e = event.target.value;
|
|
@@ -1306,5 +1308,7 @@ export function EditFiltersModal({ isOpen, selectedDashboardName, setIsOpen, onS
|
|
|
1306
1308
|
flexDirection: 'row',
|
|
1307
1309
|
justifyContent: 'space-between',
|
|
1308
1310
|
alignItems: 'center',
|
|
1309
|
-
}, children: [_jsx(ButtonComponent, { onClick: handleSubmitDashboardChanges, label: "Save changes", disabled: !!dashboardValidationError, tooltipText: dashboardValidationError }), validationError.length !== 0 && (_jsx(ErrorComponent, { errorMessage: validationError && validationError[0]
|
|
1311
|
+
}, children: [_jsx(ButtonComponent, { onClick: handleSubmitDashboardChanges, label: "Save changes", disabled: !!dashboardValidationError, tooltipText: dashboardValidationError }), validationError.length !== 0 && (_jsx(ErrorComponent, { errorMessage: validationError && validationError[0], containerStyle: {
|
|
1312
|
+
marginLeft: 4,
|
|
1313
|
+
} }))] })] }) }) }) }));
|
|
1310
1314
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NewDashboardModal.d.ts","sourceRoot":"","sources":["../../../src/modals/NewDashboardModal.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAiB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAYlE,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,eAAe,EACf,SAAS,EACT,wBAAwB,GACzB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EAAE,GAAG,CAAC;IACxB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,SAAS,EAAE,GAAG,CAAC;IACf,wBAAwB,EAAE,GAAG,CAAC;CAC/B,
|
|
1
|
+
{"version":3,"file":"NewDashboardModal.d.ts","sourceRoot":"","sources":["../../../src/modals/NewDashboardModal.tsx"],"names":[],"mappings":"AASA,OAAO,EAAE,oBAAoB,EAAiB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAYlE,wBAAgB,iBAAiB,CAAC,EAChC,MAAM,EACN,SAAS,EACT,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,eAAe,EACf,SAAS,EACT,wBAAwB,GACzB,EAAE;IACD,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,cAAc,EAAE,GAAG,CAAC;IACpB,kBAAkB,EAAE,GAAG,CAAC;IACxB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC9D,SAAS,EAAE,GAAG,CAAC;IACf,wBAAwB,EAAE,GAAG,CAAC;CAC/B,2CAgqBA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
-
import { useState, useMemo } from 'react';
|
|
2
|
+
import { useState, useMemo, useCallback } from 'react';
|
|
3
3
|
import InputLabel from '../components/InputLabel';
|
|
4
4
|
import CardSection from '../components/CardSection';
|
|
5
5
|
import { useAdmin } from '../AdminProvider';
|
|
@@ -25,6 +25,7 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
|
|
|
25
25
|
const [initialRange, setInitialRange] = useState({ label: 'Last 30 days', value: 'LAST_30_DAYS' });
|
|
26
26
|
const [newDateFilter, setNewDateFilter] = useState(undefined);
|
|
27
27
|
const [tenantKey, setTenantKey] = useState(state.client?.ownerTenantFields?.[0]);
|
|
28
|
+
const [isSubmitting, setIsSubmitting] = useState(false);
|
|
28
29
|
const ownerTenants = useMemo(() => state.client?.allTenantTypes?.filter((tenant) => state.client?.ownerTenantFields?.includes(tenant.tenantField)), [state.client?.allTenantTypes, state.client?.ownerTenantFields]);
|
|
29
30
|
const filteredTables = useMemo(() => {
|
|
30
31
|
return state.tables.filter((table) => {
|
|
@@ -37,12 +38,16 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
|
|
|
37
38
|
return (newFilters.some((filter) => !filter.label || !filter.table || !filter.field) ||
|
|
38
39
|
newDateFilter?.label === '' ||
|
|
39
40
|
!tenantKey ||
|
|
40
|
-
!selectedDashboardName
|
|
41
|
-
|
|
41
|
+
!selectedDashboardName ||
|
|
42
|
+
isSubmitting);
|
|
43
|
+
}, [newFilters, newDateFilter, selectedDashboardName, isSubmitting]);
|
|
42
44
|
const handleAddFilter = async () => {
|
|
43
45
|
setNewFilters([...newFilters, {}]);
|
|
44
46
|
};
|
|
45
|
-
const handleSubmitDashboardChanges = async () => {
|
|
47
|
+
const handleSubmitDashboardChanges = useCallback(async () => {
|
|
48
|
+
if (isSubmitting) {
|
|
49
|
+
return; // Prevent double submission
|
|
50
|
+
}
|
|
46
51
|
if (!selectedDashboardName ||
|
|
47
52
|
newFilters.some((filter) => !filter.label) ||
|
|
48
53
|
(Object.keys(newDateFilter ?? {}).length && !newDateFilter?.label)) {
|
|
@@ -101,26 +106,47 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
|
|
|
101
106
|
alert('Your dashboard must have an owner');
|
|
102
107
|
return;
|
|
103
108
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
109
|
+
setIsSubmitting(true);
|
|
110
|
+
try {
|
|
111
|
+
await createDashboard({
|
|
112
|
+
name: selectedDashboardName.trim(),
|
|
113
|
+
filters: updatedFilters,
|
|
114
|
+
dateFilter: newDateFilter
|
|
115
|
+
? {
|
|
116
|
+
...newDateFilter,
|
|
117
|
+
// comparison: isDateComparison,
|
|
118
|
+
comparison: false,
|
|
119
|
+
primaryRange: initialRange,
|
|
120
|
+
}
|
|
121
|
+
: undefined,
|
|
122
|
+
dashboardOwners: [tenantKey],
|
|
123
|
+
});
|
|
124
|
+
onSave(selectedDashboardName, tenantKey);
|
|
125
|
+
await delay(200);
|
|
126
|
+
setIsOpen(false);
|
|
127
|
+
setSelectedDashboardName('');
|
|
128
|
+
setNewFilters([]);
|
|
129
|
+
// setIsDateComparison(false);
|
|
130
|
+
}
|
|
131
|
+
catch (error) {
|
|
132
|
+
console.error('Error creating dashboard:', error);
|
|
133
|
+
// Optionally show an error message to the user
|
|
134
|
+
}
|
|
135
|
+
finally {
|
|
136
|
+
setIsSubmitting(false);
|
|
137
|
+
}
|
|
138
|
+
}, [
|
|
139
|
+
isSubmitting,
|
|
140
|
+
selectedDashboardName,
|
|
141
|
+
newFilters,
|
|
142
|
+
newDateFilter,
|
|
143
|
+
dashNames,
|
|
144
|
+
tenantKey,
|
|
145
|
+
initialRange,
|
|
146
|
+
createDashboard,
|
|
147
|
+
onSave,
|
|
148
|
+
setIsOpen,
|
|
149
|
+
]);
|
|
124
150
|
const handleDeleteFilter = (index) => {
|
|
125
151
|
setNewFilters(newFilters.filter((_, i) => i !== index));
|
|
126
152
|
};
|
|
@@ -239,13 +265,13 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
|
|
|
239
265
|
}, children: [index === 0 && _jsx(InputLabel, { children: "Field" }), _jsx(SelectComponent, { value: filter?.field ?? '', options: filter?.table
|
|
240
266
|
? filteredTables
|
|
241
267
|
.find((t) => t.name === filter.table)
|
|
242
|
-
|
|
268
|
+
?.columns.filter((column) => convertFieldTypeToJSType(column.fieldType) === 'string')
|
|
243
269
|
.map((column) => {
|
|
244
270
|
return {
|
|
245
|
-
label: column.
|
|
246
|
-
value: column.
|
|
271
|
+
label: column.label || column.field,
|
|
272
|
+
value: column.field,
|
|
247
273
|
};
|
|
248
|
-
})
|
|
274
|
+
}) || []
|
|
249
275
|
: [], onChange: (e) => {
|
|
250
276
|
// Capitalize the label
|
|
251
277
|
const updatedFilters = newFilters.map((otherFilter, i) => index === i
|
|
@@ -291,5 +317,5 @@ export function NewDashboardModal({ isOpen, setIsOpen, onSave, ModalComponent, T
|
|
|
291
317
|
cursor: 'pointer',
|
|
292
318
|
width: '100%',
|
|
293
319
|
}, children: _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 24 24", fill: "#4C5462", width: "20", height: "20", children: _jsx("path", { fillRule: "evenodd", d: "M5.47 5.47a.75.75 0 011.06 0L12 10.94l5.47-5.47a.75.75 0 111.06 1.06L13.06 12l5.47 5.47a.75.75 0 11-1.06 1.06L12 13.06l-5.47 5.47a.75.75 0 01-1.06-1.06L10.94 12 5.47 6.53a.75.75 0 010-1.06z", clipRule: "evenodd" }) }) })] }) })] })] }));
|
|
294
|
-
}) })), _jsx("div", { style: { height: 12 } }), _jsx(SecondaryButtonComponent, { onClick: handleAddFilter, label: "Add filter +" })] }), _jsx("div", { style: { height: 18 } }), _jsx("div", { style: { maxWidth: 230 }, children: _jsx(ButtonComponent, { onClick: handleSubmitDashboardChanges, label: 'Create', disabled: saveButtonDisabled }) })] }) }));
|
|
320
|
+
}) })), _jsx("div", { style: { height: 12 } }), _jsx(SecondaryButtonComponent, { onClick: handleAddFilter, label: "Add filter +" })] }), _jsx("div", { style: { height: 18 } }), _jsx("div", { style: { maxWidth: 230 }, children: _jsx(ButtonComponent, { onClick: handleSubmitDashboardChanges, label: isSubmitting ? 'Creating...' : 'Create', disabled: saveButtonDisabled }) })] }) }));
|
|
295
321
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PromoteReportModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteReportModal.tsx"],"names":[],"mappings":"AAIA,UAAU,kBAAkB;IAC1B,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,cAAc,EACd,eAAe,EACf,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,eAAe,EACf,oBAAoB,GACrB,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"PromoteReportModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteReportModal.tsx"],"names":[],"mappings":"AAIA,UAAU,kBAAkB;IAC1B,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,EACzC,cAAc,EACd,eAAe,EACf,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,eAAe,EACf,oBAAoB,GACrB,EAAE,kBAAkB,2CA2MpB"}
|
|
@@ -3,7 +3,7 @@ import { useState } from 'react';
|
|
|
3
3
|
import { useAdmin } from '../AdminProvider';
|
|
4
4
|
import { useDashboards } from '@quillsql/react';
|
|
5
5
|
export default function PromoteReportModal({ ModalComponent, HeaderComponent, ButtonComponent, SelectComponent, CheckboxComponent, isOpen, setIsOpen, reportId, currentClientId, currentDashboardName, }) {
|
|
6
|
-
const { state, quillFetchWithToken } = useAdmin();
|
|
6
|
+
const { state, quillFetchWithToken, eventTracking } = useAdmin();
|
|
7
7
|
const { dashboards } = useDashboards();
|
|
8
8
|
const [selectedClientId, setSelectedClientId] = useState(currentClientId);
|
|
9
9
|
const [dashboardName, setDashboardName] = useState(null);
|
|
@@ -48,7 +48,7 @@ export default function PromoteReportModal({ ModalComponent, HeaderComponent, Bu
|
|
|
48
48
|
dashboardName: dashboardName,
|
|
49
49
|
itemId: reportId,
|
|
50
50
|
skipWarning,
|
|
51
|
-
addMissingTables: autoPromoteVirtualTables,
|
|
51
|
+
addMissingTables: autoPromoteVirtualTables && currentClientId !== selectedClientId,
|
|
52
52
|
},
|
|
53
53
|
adminMode: true,
|
|
54
54
|
});
|
|
@@ -78,6 +78,17 @@ export default function PromoteReportModal({ ModalComponent, HeaderComponent, Bu
|
|
|
78
78
|
alert('Report promoted successfully.');
|
|
79
79
|
}
|
|
80
80
|
catch (error) {
|
|
81
|
+
eventTracking?.logError?.({
|
|
82
|
+
type: 'bug', // TODO: determine type
|
|
83
|
+
severity: 'high',
|
|
84
|
+
message: 'Error promoting report',
|
|
85
|
+
errorMessage: error.message,
|
|
86
|
+
errorStack: error.stack,
|
|
87
|
+
errorData: {
|
|
88
|
+
caller: 'PromoteReportModal',
|
|
89
|
+
function: 'handlePromote',
|
|
90
|
+
},
|
|
91
|
+
});
|
|
81
92
|
console.error('Promotion failed:', error);
|
|
82
93
|
}
|
|
83
94
|
};
|
|
@@ -112,13 +123,13 @@ export default function PromoteReportModal({ ModalComponent, HeaderComponent, Bu
|
|
|
112
123
|
display: 'flex',
|
|
113
124
|
justifyContent: 'space-between',
|
|
114
125
|
gap: 12,
|
|
115
|
-
}, children: [_jsx(CheckboxComponent, { label: "Add missing tables", isChecked: autoPromoteVirtualTables, onChange: () => {
|
|
126
|
+
}, children: [_jsx(CheckboxComponent, { label: "Add missing tables", isChecked: autoPromoteVirtualTables && currentClientId !== selectedClientId, onChange: () => {
|
|
116
127
|
setAutoPromoteVirtualTables(!autoPromoteVirtualTables);
|
|
117
128
|
}, labelStyle: {
|
|
118
129
|
color: '#666666',
|
|
119
130
|
fontSize: '13px',
|
|
120
131
|
fontWeight: 400,
|
|
121
|
-
} }), _jsx(ButtonComponent, { onClick: () => {
|
|
132
|
+
}, disabled: currentClientId === selectedClientId }), _jsx(ButtonComponent, { onClick: () => {
|
|
122
133
|
handlePromote();
|
|
123
134
|
setIsOpen(false);
|
|
124
135
|
}, label: "Promote Report", disabled: !selectedClientId || !dashboardName, width: 160 })] })] })] }) }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PromoteViewModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteViewModal.tsx"],"names":[],"mappings":"AAIA,UAAU,wBAAwB;IAChC,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;CAChB;AAED,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,EAC/C,cAAc,EACd,eAAe,EACf,eAAe,EACf,MAAM,EACN,SAAS,EACT,QAAQ,EACR,MAAM,EACN,OAAO,EACP,IAAI,GACL,EAAE,wBAAwB,
|
|
1
|
+
{"version":3,"file":"PromoteViewModal.d.ts","sourceRoot":"","sources":["../../../src/modals/PromoteViewModal.tsx"],"names":[],"mappings":"AAIA,UAAU,wBAAwB;IAChC,cAAc,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACzC,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;CAChB;AAED,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAC,EAC/C,cAAc,EACd,eAAe,EACf,eAAe,EACf,MAAM,EACN,SAAS,EACT,QAAQ,EACR,MAAM,EACN,OAAO,EACP,IAAI,GACL,EAAE,wBAAwB,2CAsI1B"}
|
|
@@ -3,10 +3,10 @@ import { useEffect, useState } from 'react';
|
|
|
3
3
|
import { QuillSelectComponentWithCombo } from '../components/QuillSelectWithCombo';
|
|
4
4
|
import { useAdmin } from '../AdminProvider';
|
|
5
5
|
export default function PromoteVirtualTableModal({ ModalComponent, HeaderComponent, ButtonComponent, isOpen, setIsOpen, clientId, client, clients, view, }) {
|
|
6
|
-
const { state, quillFetchWithToken } = useAdmin();
|
|
6
|
+
const { state, quillFetchWithToken, eventTracking } = useAdmin();
|
|
7
7
|
const [selectedClientId, setClientId] = useState(undefined);
|
|
8
8
|
useEffect(() => {
|
|
9
|
-
setClientId(clients[0]
|
|
9
|
+
setClientId(clients[0]?.id);
|
|
10
10
|
}, [clients]);
|
|
11
11
|
const handlePromote = async (skipWarning = false) => {
|
|
12
12
|
if (!selectedClientId) {
|
|
@@ -48,6 +48,17 @@ export default function PromoteVirtualTableModal({ ModalComponent, HeaderCompone
|
|
|
48
48
|
alert('Virtual Table promoted successfully.');
|
|
49
49
|
}
|
|
50
50
|
catch (error) {
|
|
51
|
+
eventTracking?.logError?.({
|
|
52
|
+
type: 'bug', // TODO: determine type
|
|
53
|
+
severity: 'high',
|
|
54
|
+
message: 'Error promoting virtual table',
|
|
55
|
+
errorMessage: error.message,
|
|
56
|
+
errorStack: error.stack,
|
|
57
|
+
errorData: {
|
|
58
|
+
caller: 'PromoteViewModal',
|
|
59
|
+
function: 'handlePromote',
|
|
60
|
+
},
|
|
61
|
+
});
|
|
51
62
|
console.error('Promotion failed:', error);
|
|
52
63
|
}
|
|
53
64
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckboxPrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/CheckboxPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC/D,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CAClC,CAAC;AAEF,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"CheckboxPrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/CheckboxPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,IAAI,CAAC;IAC/D,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CAClC,CAAC;AAEF,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAkDvD,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
|
|
@@ -13,6 +13,7 @@ const CheckboxPrimitive = ({ label, isChecked, onChange, containerStyle, labelSt
|
|
|
13
13
|
height: '14px',
|
|
14
14
|
margin: 'auto 0',
|
|
15
15
|
cursor: 'pointer',
|
|
16
|
+
opacity: disabled ? 0.5 : 1,
|
|
16
17
|
} }), _jsx("span", { style: {
|
|
17
18
|
display: 'block',
|
|
18
19
|
marginTop: 'auto',
|
|
@@ -21,6 +22,7 @@ const CheckboxPrimitive = ({ label, isChecked, onChange, containerStyle, labelSt
|
|
|
21
22
|
whiteSpace: 'nowrap',
|
|
22
23
|
textOverflow: 'ellipsis',
|
|
23
24
|
overflow: 'hidden',
|
|
25
|
+
opacity: disabled ? 0.5 : 1,
|
|
24
26
|
...labelStyle,
|
|
25
27
|
}, children: label })] }));
|
|
26
28
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopoverPrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/PopoverPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAG3D,UAAU,YAAY;IACpB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;CAC1B;AACD,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"PopoverPrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/PopoverPrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAG3D,UAAU,YAAY;IACpB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;IACzB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;CAC1B;AACD,eAAO,MAAM,OAAO,GAAI,sBAAsB,YAAY,4CAqFzD,CAAC"}
|
|
@@ -24,14 +24,25 @@ export const Popover = ({ trigger, content }) => {
|
|
|
24
24
|
updatePosition();
|
|
25
25
|
window.addEventListener('scroll', updatePosition);
|
|
26
26
|
window.addEventListener('resize', updatePosition);
|
|
27
|
+
const handleClickOutside = (event) => {
|
|
28
|
+
if (triggerRef.current &&
|
|
29
|
+
!triggerRef.current.contains(event.target) &&
|
|
30
|
+
!document
|
|
31
|
+
.querySelector('[data-popover-content]')
|
|
32
|
+
?.contains(event.target)) {
|
|
33
|
+
setIsVisible(false);
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
document.addEventListener('mousedown', handleClickOutside);
|
|
37
|
+
return () => {
|
|
38
|
+
window.removeEventListener('scroll', updatePosition);
|
|
39
|
+
window.removeEventListener('resize', updatePosition);
|
|
40
|
+
document.removeEventListener('mousedown', handleClickOutside);
|
|
41
|
+
};
|
|
27
42
|
}
|
|
28
|
-
return () => {
|
|
29
|
-
window.removeEventListener('scroll', updatePosition);
|
|
30
|
-
window.removeEventListener('resize', updatePosition);
|
|
31
|
-
};
|
|
32
43
|
}, [isVisible]);
|
|
33
44
|
return (_jsxs("div", { id: "my-relative-container", style: { position: 'relative' }, children: [_jsx("div", { ref: triggerRef, onClick: () => setIsVisible((isVisible) => !isVisible), children: trigger }), isVisible &&
|
|
34
|
-
createPortal(_jsx("div", { onMouseEnter: () => setIsVisible(true), onMouseLeave: () => setIsVisible(false), onClick: () => setIsVisible(false), style: {
|
|
45
|
+
createPortal(_jsx("div", { "data-popover-content": true, onMouseEnter: () => setIsVisible(true), onMouseLeave: () => setIsVisible(false), onClick: () => setIsVisible(false), style: {
|
|
35
46
|
position: 'absolute',
|
|
36
47
|
zIndex: 1000,
|
|
37
48
|
top: position.top,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TogglePrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/TogglePrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,QAAA,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"TogglePrimitive.d.ts","sourceRoot":"","sources":["../../../src/primitives/TogglePrimitive.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,QAAA,MAAM,eAAe,GAAI,sCAKtB;IACD,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,4CAoEA,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChartQueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/public_components/ChartQueryBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+B,MAAM,OAAO,CAAC;AAGnE,OAAO,EACL,WAAW,EAIZ,MAAM,iBAAiB,CAAC;AAWzB,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,eAAe,EACf,MAAM,EACN,cAAc,EACd,oBAAoB,GACrB,EAAE;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,oBAAoB,EAAE,MAAM,CAAC;CAC9B,
|
|
1
|
+
{"version":3,"file":"ChartQueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/public_components/ChartQueryBuilder.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAA+B,MAAM,OAAO,CAAC;AAGnE,OAAO,EACL,WAAW,EAIZ,MAAM,iBAAiB,CAAC;AAWzB,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,eAAe,EACf,MAAM,EACN,cAAc,EACd,oBAAoB,GACrB,EAAE;IACD,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,cAAc,CAAC,EAAE,aAAa,CAAC;IAC/B,oBAAoB,EAAE,MAAM,CAAC;CAC9B,2CA4PA"}
|
|
@@ -2,25 +2,25 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
2
2
|
import { useEffect, useRef, useState } from 'react';
|
|
3
3
|
import { useAdmin } from '../AdminProvider';
|
|
4
4
|
import { EnvSelectPopover, OrgSelect } from '../components';
|
|
5
|
-
import { ReportBuilder, SQLEditor,
|
|
5
|
+
import { ReportBuilder, SQLEditor, useDashboardInternal, } from '@quillsql/react';
|
|
6
6
|
import DatabaseMismatchCard from '../components/DatabaseMismatchCard';
|
|
7
7
|
import QuillTab from '../components/QuillTab';
|
|
8
8
|
import XMarkIcon from '../icons/XMarkIcon';
|
|
9
9
|
import PlaceholderPrimitive from '../primitives/PlaceholderPrimitive';
|
|
10
10
|
import { useDashboardManager } from '../hooks/useDashboardManager';
|
|
11
11
|
import { onlySingleDatabaseTenant } from '../utils/tenants';
|
|
12
|
-
import { ButtonPrimitive
|
|
12
|
+
import { ButtonPrimitive } from '../primitives';
|
|
13
13
|
import { SAVED_QUERIES_DASHBOARD } from '../utils/constants';
|
|
14
|
-
import
|
|
14
|
+
import CreateEnvironmentModal from '../modals/CreateEnvironmentModal';
|
|
15
15
|
export default function ChartQueryBuilder({ activeComponent, onExit, containerStyle, destinationDashboard, }) {
|
|
16
16
|
const parentRef = useRef(null);
|
|
17
17
|
const envPopoverRef = useRef(null);
|
|
18
|
-
const { state, dispatch, clientLoading, setClient } = useAdmin();
|
|
18
|
+
const { state, dispatch, clientLoading, setClient, onRequestAddVirtualTable, } = useAdmin();
|
|
19
19
|
const [query, setQuery] = useState(state.activeQuery);
|
|
20
20
|
const [toggleMode, setToggleMode] = useState(activeComponent);
|
|
21
21
|
const [showCreateEnvironmentModal, setShowCreateEnvironmentModal] = useState(false);
|
|
22
22
|
const { setSelectedDashboard } = useDashboardManager();
|
|
23
|
-
const { reload } =
|
|
23
|
+
const { reload } = useDashboardInternal(SAVED_QUERIES_DASHBOARD);
|
|
24
24
|
const modeToggleOptions = [
|
|
25
25
|
{ label: 'SQL Editor', value: 'SQL Editor' },
|
|
26
26
|
{ label: 'Report Builder', value: 'Report Builder' },
|
|
@@ -52,7 +52,7 @@ export default function ChartQueryBuilder({ activeComponent, onExit, containerSt
|
|
|
52
52
|
setToggleMode(activeComponent);
|
|
53
53
|
}, [activeComponent]);
|
|
54
54
|
if (showCreateEnvironmentModal) {
|
|
55
|
-
return (_jsx(
|
|
55
|
+
return (_jsx(CreateEnvironmentModal, { showCreateEnvironmentModal: showCreateEnvironmentModal, setShowCreateEnvironmentModal: setShowCreateEnvironmentModal }));
|
|
56
56
|
}
|
|
57
57
|
return (_jsx("div", { style: {
|
|
58
58
|
height: '100%',
|
|
@@ -122,7 +122,7 @@ export default function ChartQueryBuilder({ activeComponent, onExit, containerSt
|
|
|
122
122
|
return (_jsx(ButtonPrimitive, { onClick: onClick, label: label, isLoading: isLoading, disabled: disabled }));
|
|
123
123
|
}, destinationDashboard: destinationDashboard, chartBuilderTitle: `Add to ${destinationDashboard ?? 'dashboard'}`, isAIEnabled: state.client?.databaseType?.toLowerCase() === 'mssql'
|
|
124
124
|
? false
|
|
125
|
-
: true })) : (_jsx(SQLEditor, { isAdminEnabled: true, showTableFormatOptions: true, showAccessControlOptions: true, showDateFieldOptions: true, defaultQuery: query, addToDashboardButtonLabel: 'Add to dashboard', chartBuilderTitle: `Add to ${destinationDashboard ?? 'dashboard'}`,
|
|
125
|
+
: true, onRequestAddVirtualTable: onRequestAddVirtualTable })) : (_jsx(SQLEditor, { isAdminEnabled: true, showTableFormatOptions: true, showAccessControlOptions: true, showDateFieldOptions: true, defaultQuery: query, addToDashboardButtonLabel: 'Add to dashboard', chartBuilderTitle: `Add to ${destinationDashboard ?? 'dashboard'}`,
|
|
126
126
|
// report={state.activeQuery ? state.activeEditItem : undefined}
|
|
127
127
|
onAddToDashboardComplete: submitReport, onSaveQueryComplete: submitSavedQuery, containerStyle: {
|
|
128
128
|
height: '100%',
|
|
@@ -131,5 +131,5 @@ export default function ChartQueryBuilder({ activeComponent, onExit, containerSt
|
|
|
131
131
|
backgroundColor: 'white',
|
|
132
132
|
// paddingRight: 25,
|
|
133
133
|
// paddingTop: 25,
|
|
134
|
-
}, destinationDashboard: destinationDashboard }))] }) }));
|
|
134
|
+
}, destinationDashboard: destinationDashboard, onRequestAddVirtualTable: onRequestAddVirtualTable }))] }) }));
|
|
135
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateEnvironment.d.ts","sourceRoot":"","sources":["../../../src/public_components/CreateEnvironment.tsx"],"names":[],"mappings":"AACA,OAAc,EACZ,aAAa,EAOd,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"CreateEnvironment.d.ts","sourceRoot":"","sources":["../../../src/public_components/CreateEnvironment.tsx"],"names":[],"mappings":"AACA,OAAc,EACZ,aAAa,EAOd,MAAM,OAAO,CAAC;AAyBf,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,EACxC,iBAAiB,EACjB,cAAc,GACf,EAAE;IACD,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAC;IACxC,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAC1C,cAAc,CAAC,EAAE,aAAa,CAAC;CAChC,2CA6YA"}
|