Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'release/database-1.1.1' into bugfix/unable-to-edit-null-cell

Browse source
This commit is contained in:
Abd-Rahman-1999 2024-06-05 16:04:49 +05:30
commit 03d435d7b6
10 changed files with 58 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/JoinConstraint.jsx
View file

@ -486,7 +486,7 @@ const JoinOn = ({
emptyError={
<div className="dd-select-alert-error m-2 d-flex align-items-center">
<Information />
No table selected
No data found
</div>
}
value={leftFieldOptions.find((opt) => opt.value === leftFieldColumn)}
@ -529,7 +529,7 @@ const JoinOn = ({
emptyError={
<div className="dd-select-alert-error m-2 d-flex align-items-center">
<Information />
{rightFieldTable ? 'No columns of the same data type' : 'No table selected'}
{rightFieldTable ? 'No columns of the same data type' : 'No data found'}
</div>
}
darkMode={darkMode}

24
frontend/src/TooljetDatabase/Forms/ColumnForm.jsx
View file

@ -299,7 +299,7 @@ const ColumnForm = ({
emptyError={
<div className="dd-select-alert-error m-2 d-flex align-items-center">
<Information />
No data available
No data found
</div>
}
loader={
@ -490,28 +490,6 @@ const ColumnForm = ({
</div>
</div>
)}
<div className="row mb-3">
<div className="col-1">
<label className={`form-switch`}>
<input
className="form-check-input"
type="checkbox"
checked={isUniqueConstraint}
onChange={(e) => {
setIsUniqueConstraint(e.target.checked);
}}
disabled={dataType?.value === 'serial'}
/>
</label>
</div>
<div className="col d-flex flex-column">
<p className="m-0 p-0 fw-500 tj-switch-text">{isUniqueConstraint ? 'UNIQUE' : 'NOT UNIQUE'}</p>
<p className="fw-400 secondary-text tj-text-xsm tj-switch-text">
{isUniqueConstraint ? 'Unique value constraint is added' : 'Unique value constraint is not added'}
</p>
</div>
</div>
</div>
<DrawerFooter
fetching={fetching}

2
frontend/src/TooljetDatabase/Forms/EditColumnForm.jsx
View file

@ -538,7 +538,7 @@ const ColumnForm = ({
emptyError={
<div className="dd-select-alert-error m-2 d-flex align-items-center">
<Information />
No data available
No data found
</div>
}
loader={

2
frontend/src/TooljetDatabase/Forms/EditRowForm.jsx
View file

@ -293,7 +293,7 @@ const EditRowForm = ({
emptyError={
<div className="dd-select-alert-error m-2 d-flex align-items-center">
<Information />
No data available
No data found
</div>
}
loader={

2
frontend/src/TooljetDatabase/Forms/RowForm.jsx
View file

@ -303,7 +303,7 @@ const RowForm = ({
emptyError={
<div className="dd-select-alert-error m-2 d-flex align-items-center">
<Information />
No data available
No data found
</div>
}
loader={

2
frontend/src/TooljetDatabase/Forms/TableDetailsDropdown.jsx
View file

@ -54,7 +54,7 @@ function TableDetailsDropdown({
emptyError={
<div className="dd-select-alert-error m-2 d-flex align-items-center">
<Information />
No table selected
No data found
</div>
}
value={source ? tableList[0] : actions ? onUpdate : targetTable}

2
frontend/src/TooljetDatabase/Forms/TableSchema.jsx
View file

@ -298,7 +298,7 @@ function TableSchema({
emptyError={
<div className="dd-select-alert-error m-2 d-flex align-items-center">
<Information />
No data available
No data found
</div>
}
loader={

49
frontend/src/TooljetDatabase/Forms/styles.scss
View file

@ -4,36 +4,44 @@
}
}
.card-body-wrapper{
.card-body-wrapper {
width: 640px;
padding: 20px;
}
.card-body{
padding: 0;
.list-group-item{
padding: 0 !important;
.drawer-card-wrapper {
.card-body {
padding: 0;
.list-group-item {
padding: 0 !important;
}
}
}
.card-body.create-drawer-body,
.card-body.edit-row-body,
.card-body.edit-column-body{
.card-body.edit-column-body {
padding: 20px;
}
.form-label,
.card-sub-title,
.foreign-key-sub-title{
.foreign-key-sub-title {
font-size: 14px;
line-height: 20px;
font-weight: 500;
margin-bottom: 4px;
}
.card-sub-title-light{
.card-sub-title-light {
color: #000000 !important;
}
.card-title{
.card-title {
font-size: 18px;
line-height: 28px;
font-weight: 500;
@ -41,11 +49,11 @@
.form-label-light,
.card-title-light,
.foreign-key-sub-title-light{
.foreign-key-sub-title-light {
color: #11181C !important;
}
.add-text{
.add-text {
font-size: 12px;
line-height: 20px;
font-weight: 500;
@ -117,11 +125,12 @@
.tj-app-input,
.edit-row-container {
input{
input {
font-size: 12px;
line-height: 20px;
font-weight: 500;
}
input.primary-idKey-light {
gap: 16px !important;
background: #f4f6fa !important;
@ -531,6 +540,14 @@
border-radius: 100px !important;
margin-top: 10px !important;
}
.tj-base-btn {
&:disabled {
background: none !important;
color: var(--slate9) !important;
cursor: auto !important;
}
}
}
// common css for two form components
@ -711,11 +728,11 @@
}
}
.add-relation-text-dark{
.add-relation-text-dark {
color: #545B64;
}
.add-relation-text-enabled{
.add-relation-text-enabled {
color: #3E63DD !important;
}
@ -724,7 +741,7 @@
}
.tj-switch-text,
.tj-select-text{
.tj-select-text {
font-size: 12px;
line-height: 20px;
}
}

11
frontend/src/_styles/global-datasources.scss
View file

@ -42,7 +42,7 @@
.ds-delete-btn {
visibility: visible;
.disabled-button{
.disabled-button {
background-color: #FFFF;
width: 19px;
height: 19px;
@ -62,8 +62,8 @@
border: none;
background: none;
}
.tooltip-sampl-db{
.tooltip-sampl-db {
width: 10px;
}
}
@ -141,6 +141,7 @@
.datasource-inner-sidebar-wrap {
height: 100%;
.datasources-search {
width: 240px;
margin: 0 auto;
@ -178,6 +179,7 @@
.datasource-list-container {
overflow-y: auto;
max-height: calc(100vh - 64px);
.datasource-list {
width: 976px;
margin: 0 auto;
@ -226,6 +228,7 @@
.datasource-card {
height: 30px;
height: 122px !important;
button {
display: none;
padding: 5px 10px;
@ -297,4 +300,4 @@
border-radius: 6px;
margin: auto;
}
}
}

12
frontend/src/_ui/AppButton/AppButton.scss
View file

@ -22,7 +22,15 @@
}
&:disabled {
color: var(--slate8) !important;
background: var(--slate6) !important;
color: var(--slate9) !important;
cursor: auto !important;
svg {
path {
fill: var(--slate9) !important;
}
}
}
}
@ -213,7 +221,7 @@
color: var(--slate12);
border: none;
background: transparent;
&:hover {
background: var(--slate4, #ECEEF0) !important;
color: var(--slate11);