Skip to content

Commit

Permalink
Merge branch '2169-click-on-extensions-entire-row-selects-the-extensi…
Browse files Browse the repository at this point in the history 
…on' into 'main'

fix(ui): toggle collapse on click on entire extensions row

Closes #2169

See merge request ongresinc/stackgres!1401
  • Loading branch information
@lgarciaog
lgarciaog committed Jul 28, 2023
2 parents 9ca591a + fb7414b commit c799c48
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 16 deletions.
29 changes: 21 additions & 8 deletions stackgres-k8s/src/admin-ui/src/components/forms/CreateSGClusters.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,8 @@
v-if="( ( (extLicense == 'opensource') && (ext.name != 'timescaledb_tsl') ) || ( (extLicense == 'nonopensource') && (ext.name == 'timescaledb_tsl') ) ) && (!searchExtension.length || (ext.name+ext.description+ext.tags.toString()).includes(searchExtension)) && ext.versions.length"
class="extension"
:class="( (viewExtension == index) && 'show')">
<label>
<input type="checkbox" class="plain enableExtension" @change="setExtension(index)" :checked="(extIsSet(ext.name) !== -1)" :disabled="!ext.versions.length || !ext.selectedVersion.length" :data-field="'spec.postgres.extensions.' + ext.name" />
<label><input type="checkbox" class="plain enableExtension" @change="setExtension(index)" :checked="(extIsSet(ext.name) !== -1)" :disabled="!ext.versions.length || !ext.selectedVersion.length" :data-field="'spec.postgres.extensions.' + ext.name" /></label>
<span class="extInfo" @click.stop.prevent="viewExt(index)">
<span class="hasTooltip extName">
<span class="name">
<span>{{ ext.name }}</span>
Expand All @@ -307,8 +307,8 @@
<span>{{ ext.abstract }}</span>
</span>
</span>
</label>
<button type="button" class="textBtn anchor toggleExt" @click.stop.prevent="viewExt(index)">-</button>
<button type="button" class="textBtn anchor toggleExt">-</button>
</span>

<div v-if="(viewExtension == index)" class="extDetails">
<div class="header">
Expand Down Expand Up @@ -3755,9 +3755,19 @@
}
.extension > label {
font-weight: bold;
cursor: pointer;
width: calc(100% - 30px);
width: 68px;
display: inline-block;
}
.extInfo {
cursor: pointer;
width: calc(100% - 68px);
display: inline-block;
}
.extName {
font-weight: bold;
}
.extension > label input {
Expand Down Expand Up @@ -3844,9 +3854,11 @@
display: block;
}
li.extension.show > label:after {
li.extension.show .extInfo:after {
height: 1px;
width: calc(100% + 30px);
width: calc(100% + 68px);
left: -68px;
position: relative;
content: " ";
margin-top: 10px;
display: block;
Expand Down Expand Up @@ -3973,6 +3985,7 @@
text-overflow: ellipsis;
white-space: nowrap;
transform: translateY(3px);
width: calc(100% - 320px);
}
.extension a.newTab {
Expand Down
31 changes: 23 additions & 8 deletions stackgres-k8s/src/admin-ui/src/components/forms/CreateSGShardedClusters.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,9 @@
v-if="( ( (extLicense == 'opensource') && (ext.name != 'timescaledb_tsl') ) || ( (extLicense == 'nonopensource') && (ext.name == 'timescaledb_tsl') ) ) && (!searchExtension.length || (ext.name+ext.description+ext.tags.toString()).includes(searchExtension)) && ext.versions.length"
class="extension"
:class="( (viewExtension == index) && 'show')">
<label>
<input type="checkbox" class="plain enableExtension" @change="setExtension(index)" :checked="(extIsSet(ext.name) !== -1)" :disabled="!ext.versions.length || !ext.selectedVersion.length" :data-field="'spec.postgres.extensions.' + ext.name" />
<label><input type="checkbox" class="plain enableExtension" @change="setExtension(index)" :checked="(extIsSet(ext.name) !== -1)" :disabled="!ext.versions.length || !ext.selectedVersion.length" :data-field="'spec.postgres.extensions.' + ext.name" /></label>

<span class="extInfo" @click.stop.prevent="viewExt(index)">
<span class="hasTooltip extName">
<span class="name">
<span>{{ ext.name }}</span>
Expand All @@ -231,8 +232,9 @@
<span>{{ ext.abstract }}</span>
</span>
</span>
</label>
<button type="button" class="textBtn anchor toggleExt" @click.stop.prevent="viewExt(index)">-</button>

<button type="button" class="textBtn anchor toggleExt">-</button>
</span>

<div v-if="(viewExtension == index)" class="extDetails">
<div class="header">
Expand Down Expand Up @@ -5987,9 +5989,19 @@
}

.extension > label {
font-weight: bold;
cursor: pointer;
width: calc(100% - 30px);
width: 68px;
display: inline-block;
}

.extInfo {
cursor: pointer;
width: calc(100% - 68px);
display: inline-block;
}

.extName {
font-weight: bold;
}

.extension > label input {
Expand Down Expand Up @@ -6076,9 +6088,11 @@
display: block;
}

li.extension.show > label:after {
li.extension.show .extInfo:after {
height: 1px;
width: calc(100% + 30px);
width: calc(100% + 68px);
left: -68px;
position: relative;
content: " ";
margin-top: 10px;
display: block;
Expand Down Expand Up @@ -6205,6 +6219,7 @@
text-overflow: ellipsis;
white-space: nowrap;
transform: translateY(3px);
width: calc(100% - 320px);
}

.extension a.newTab {
Expand Down

0 comments on commit c799c48

Please sign in to comment.