Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix activity list options scrolling in FireFox #6253

Merged
merged 2 commits into from Jul 10, 2020
Merged

Fix activity list options scrolling in FireFox #6253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e865c7f
Fix activity list options wrapping in FireFox
ProTip Jul 9, 2020
74919a3
Fix scope issue on npm ci order
ProTip Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rundeckapp/grails-spa/packages/ui-trellis/.storybook/main.js
View file
Open in desktop
Expand Up @@ -68,7 +68,7 @@ module.exports = {

config.plugins.unshift(new webpack.NormalModuleReplacementPlugin( /index.less/, function(resource) {
if (resource.resource) {
resource.resource = resource.resource.replace(/node_modules\/ant-design-vue\/es\/style\/index\.less/, 'src/components/execution-log/antScope.less')
resource.resource = resource.resource.replace(/node_modules\/ant-design-vue\/es\/style\/index\.less/, 'src/antScope.less')
}
}))

Expand Down
0 ...rc/components/execution-log/antScope.less → ...spa/packages/ui-trellis/src/antScope.less
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions rundeckapp/grails-spa/packages/ui/src/antScope.less
View file
Open in desktop
@@ -0,0 +1 @@
#antd { @import '~ant-design-vue/lib/style/core/index.less'; @import '~ant-design-vue/lib/style/themes/default.less'; }
22 changes: 17 additions & 5 deletions rundeckapp/grails-spa/packages/ui/src/components/activity/activityList.vue
View file
Open in desktop
Expand Up @@ -216,8 +216,8 @@
{{exec.job.name}}
</td>

<td class="eventargs argstring-scrollable" v-if="exec.job">
<span v-if="exec.job.options">
<td class="activity-list__eventargs" v-if="exec.job">
<span v-if="exec.job.options" class="activity-list__eventargs-string">
<span v-for="(value,key) in exec.job.options" :key="key">
<span class="optkey">{{key}}</span>
<code class="optvalue">{{value}}</code>
Expand Down Expand Up @@ -306,16 +306,16 @@
<span class="exec-status-text custom-status" >{{rpt.execution.status}}</span>
</span>
</td>
<td class="eventargs argstring-scrollable" >
<td class="activity-list__eventargs" >

<span v-if="rpt.execution.jobArguments">
<span v-if="rpt.execution.jobArguments" class="activity-list__eventargs-string">
<span v-for="(value,key) in rpt.execution.jobArguments" :key="key">
{{key}}:
<code class="optvalue">{{value}}</code>
</span>
</span>

<span v-if="!rpt.execution.jobArguments">{{rpt.execution.argString}}</span>
<span v-if="!rpt.execution.jobArguments" class="activity-list__eventargs-string">{{rpt.execution.argString}}</span>


</td>
Expand Down Expand Up @@ -848,6 +848,18 @@ export default Vue.extend({
.activity-list .table{
margin-bottom:0;
}

.activity-list__eventargs {
max-width: 250px;
}

.activity-list__eventargs-string {
display: inline-block;
overflow-x: auto;
max-width: 100%;
white-space: nowrap;
}

.loading-area{
padding: 50px;
background: #efefefef;
Expand Down
4 changes: 3 additions & 1 deletion rundeckapp/grails-spa/packages/ui/vue.config.js
View file
Open in desktop
Expand Up @@ -61,7 +61,9 @@ module.exports = {
externals: {'vue': 'Vue'},
plugins: [
new webpack.NormalModuleReplacementPlugin( /node_modules\/ant-design-vue\/es\/style\/index\.less/, function(resource) {
resource.request = resource.request.replace(/node_modules\/ant-design-vue\/es\/style\/index\.less/, 'src/components/execution-log/antScope.less')
if (resource.resource) {
resource.resource = resource.resource.replace(/node_modules\/ant-design-vue\/es\/style\/index\.less/, 'src/antScope.less')
}
})
]
}
Expand Down