From 95d93163d9a71f70fd50c6cf0e0f83c4cda1203f Mon Sep 17 00:00:00 2001 From: Murtaza Saadat Date: Mon, 28 Aug 2023 10:27:08 -0400 Subject: [PATCH 1/3] text input --- src/components/shared/panels/EditableLiveColumns.js | 2 +- src/components/shared/panels/NewTableBasicInputs.js | 2 +- src/components/shared/prompts/AddForeignKeyPrompt.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/shared/panels/EditableLiveColumns.js b/src/components/shared/panels/EditableLiveColumns.js index 8521c92..c9e60e1 100644 --- a/src/components/shared/panels/EditableLiveColumns.js +++ b/src/components/shared/panels/EditableLiveColumns.js @@ -1,6 +1,6 @@ import React, { useMemo, useRef, useCallback, useState, forwardRef, useImperativeHandle } from 'react' import { cn, getPCN } from '../../../utils/classes' -import TextInput from '../../shared/inputs/TextInput' +import { TextInput } from 'ui' import SelectInput from '../../shared/inputs/SelectInput' import { noop } from '../../../utils/nodash' import { camelToSnake, snakeToCamel, unique } from '../../../utils/formatters' diff --git a/src/components/shared/panels/NewTableBasicInputs.js b/src/components/shared/panels/NewTableBasicInputs.js index 9a84104..eea7a16 100644 --- a/src/components/shared/panels/NewTableBasicInputs.js +++ b/src/components/shared/panels/NewTableBasicInputs.js @@ -1,6 +1,6 @@ import React, { useState, useImperativeHandle, forwardRef } from 'react' import { getPCN } from '../../../utils/classes' -import TextInput from '../../shared/inputs/TextInput' +import { TextInput } from 'ui' import { noop } from '../../../utils/nodash' const className = 'new-table-basic-inputs' diff --git a/src/components/shared/prompts/AddForeignKeyPrompt.js b/src/components/shared/prompts/AddForeignKeyPrompt.js index 78c33db..4314921 100644 --- a/src/components/shared/prompts/AddForeignKeyPrompt.js +++ b/src/components/shared/prompts/AddForeignKeyPrompt.js @@ -3,7 +3,7 @@ import { getPCN, cn } from '../../../utils/classes' import { helpIcon, checkIcon, closeIcon, openArrowIcon } from '../../../svgs/icons' import { noop } from '../../../utils/nodash' import { camelToSnake } from '../../../utils/formatters' -import TextInput from '../inputs/TextInput' +import { TextInput } from 'ui' import SelectInput from '../inputs/SelectInput' import spinner from '../../../svgs/chasing-tail-spinner' From d9250552d6b12757656967fb6b767ef5879c715e Mon Sep 17 00:00:00 2001 From: Murtaza Saadat Date: Mon, 28 Aug 2023 10:28:25 -0400 Subject: [PATCH 2/3] new column drop down --- src/components/tables/TablesBody.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tables/TablesBody.js b/src/components/tables/TablesBody.js index 57566fb..84acb92 100644 --- a/src/components/tables/TablesBody.js +++ b/src/components/tables/TablesBody.js @@ -4,7 +4,7 @@ import { cn, getPCN } from '../../utils/classes' import Slider from '../shared/sliders/Slider' import NewLiveColumnPanel, { referrers } from '../shared/panels/NewLiveColumnPanel' import CountUp from 'react-countup' -import NewColumnDropdown from '../shared/dropdowns/NewColumnDropdown' +import { NewColumnDropdown } from 'ui' import pm from '../../managers/project/projectManager' import { selectTableRecords, selectTableCount } from '../../sql' import { sum } from '../../utils/math' From 3d9d8f486dde95c9b74f733b3626eb25358bbbcf Mon Sep 17 00:00:00 2001 From: Murtaza Saadat Date: Mon, 28 Aug 2023 10:33:11 -0400 Subject: [PATCH 3/3] select input --- src/components/shared/inputs/ColumnTypeInput.js | 2 +- src/components/shared/panels/EditColumnPanel.js | 2 +- src/components/shared/panels/EditableLiveColumns.js | 2 +- src/components/shared/panels/LiveColumnFilters.js | 2 +- src/components/shared/prompts/AddForeignKeyPrompt.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/shared/inputs/ColumnTypeInput.js b/src/components/shared/inputs/ColumnTypeInput.js index b584b5a..5a02a49 100644 --- a/src/components/shared/inputs/ColumnTypeInput.js +++ b/src/components/shared/inputs/ColumnTypeInput.js @@ -1,6 +1,6 @@ import { useCallback } from 'react' import { cn, getPCN } from '../../../utils/classes' -import SelectInput from './SelectInput' +import { SelectInput } from 'ui' import { INT2, INT4, diff --git a/src/components/shared/panels/EditColumnPanel.js b/src/components/shared/panels/EditColumnPanel.js index 28e2f48..54fbed8 100644 --- a/src/components/shared/panels/EditColumnPanel.js +++ b/src/components/shared/panels/EditColumnPanel.js @@ -1,6 +1,6 @@ import React, { useState, useCallback, useMemo, useRef, forwardRef, useImperativeHandle } from 'react' import { getPCN, cn } from '../../../utils/classes' -import SelectInput from '../inputs/SelectInput' +import { SelectInput } from 'ui' import { noop } from '../../../utils/nodash' import { keyIcon, modelRelationshipIcon, requiredIcon } from '../../../svgs/icons' import { cloneDeep } from 'lodash-es' diff --git a/src/components/shared/panels/EditableLiveColumns.js b/src/components/shared/panels/EditableLiveColumns.js index c9e60e1..eebc42a 100644 --- a/src/components/shared/panels/EditableLiveColumns.js +++ b/src/components/shared/panels/EditableLiveColumns.js @@ -1,7 +1,7 @@ import React, { useMemo, useRef, useCallback, useState, forwardRef, useImperativeHandle } from 'react' import { cn, getPCN } from '../../../utils/classes' import { TextInput } from 'ui' -import SelectInput from '../../shared/inputs/SelectInput' +import { SelectInput } from 'ui' import { noop } from '../../../utils/nodash' import { camelToSnake, snakeToCamel, unique } from '../../../utils/formatters' import { cloneDeep } from 'lodash-es' diff --git a/src/components/shared/panels/LiveColumnFilters.js b/src/components/shared/panels/LiveColumnFilters.js index 99565c5..5abb04e 100644 --- a/src/components/shared/panels/LiveColumnFilters.js +++ b/src/components/shared/panels/LiveColumnFilters.js @@ -1,7 +1,7 @@ import React, { useMemo, useRef, useCallback, useState, forwardRef, useImperativeHandle, useEffect } from 'react' import { getPCN, cn } from '../../../utils/classes' import $ from 'jquery' -import SelectInput from '../../shared/inputs/SelectInput' +import { SelectInput } from 'ui' import { columnOps, filterOptions, filterOps, multiValueOps } from '../../../utils/filters' import { propertyIsEnum, formatPropertyOptionsForSelection, resolvedPropertyType } from '../../../utils/liveObjects' import closeIcon from '../../../svgs/close' diff --git a/src/components/shared/prompts/AddForeignKeyPrompt.js b/src/components/shared/prompts/AddForeignKeyPrompt.js index 4314921..81d50c5 100644 --- a/src/components/shared/prompts/AddForeignKeyPrompt.js +++ b/src/components/shared/prompts/AddForeignKeyPrompt.js @@ -4,7 +4,7 @@ import { helpIcon, checkIcon, closeIcon, openArrowIcon } from '../../../svgs/ico import { noop } from '../../../utils/nodash' import { camelToSnake } from '../../../utils/formatters' import { TextInput } from 'ui' -import SelectInput from '../inputs/SelectInput' +import { SelectInput } from 'ui' import spinner from '../../../svgs/chasing-tail-spinner' const className = 'add-foreign-key-prompt'