Commit 4aaca884 authored by Fernando's avatar Fernando

Refactor security rule rows part I

* Move rows into seperate table
parent bb319f74
...@@ -165,48 +165,51 @@ export default { ...@@ -165,48 +165,51 @@ export default {
</script> </script>
<template> <template>
<rules :rules="rules"> <div>
<template #thead="{ name, members, approvalsRequired, branches }"> <rules :rules="rules">
<tr class="d-none d-sm-table-row"> <template #thead="{ name, members, approvalsRequired, branches }">
<th class="w-25">{{ hasNamedRule ? name : members }}</th> <tr class="d-none d-sm-table-row">
<th :class="settings.allowMultiRule ? 'w-50 d-none d-sm-table-cell' : 'w-75'"> <th class="w-25">{{ hasNamedRule ? name : members }}</th>
<span v-if="hasNamedRule">{{ members }}</span> <th :class="settings.allowMultiRule ? 'w-50 d-none d-sm-table-cell' : 'w-75'">
</th> <span v-if="hasNamedRule">{{ members }}</span>
<th v-if="settings.allowMultiRule">{{ branches }}</th> </th>
<th>{{ approvalsRequired }}</th> <th v-if="settings.allowMultiRule">{{ branches }}</th>
<th></th> <th>{{ approvalsRequired }}</th>
</tr> <th></th>
</template>
<template #tbody="{ rules }">
<template v-for="(rule, index) in rules">
<empty-rule
v-if="rule.ruleType === 'any_approver'"
:key="index"
:rule="rule"
:allow-multi-rule="settings.allowMultiRule"
:is-mr-edit="false"
:eligible-approvers-docs-path="settings.eligibleApproversDocsPath"
:can-edit="canEdit(rule)"
/>
<tr v-else :key="index">
<td class="js-name">{{ rule.name }}</td>
<td class="js-members" :class="settings.allowMultiRule ? 'd-none d-sm-table-cell' : null">
<user-avatar-list :items="rule.approvers" :img-size="24" empty-text="" />
</td>
<td v-if="settings.allowMultiRule" class="js-branches">
<rule-branches :rule="rule" />
</td>
<td class="js-approvals-required">
<rule-input :rule="rule" />
</td>
<td class="text-nowrap px-2 w-0 js-controls">
<rule-controls v-if="canEdit(rule)" :rule="rule" />
</td>
</tr> </tr>
</template> </template>
<template #tbody="{ rules }">
<!-- TODO: Remove feature flag in https://gitlab.com/gitlab-org/gitlab/-/issues/235114 --> <template v-for="(rule, index) in rules">
<template v-if="glFeatures.approvalSuggestions"> <empty-rule
v-if="rule.ruleType === 'any_approver'"
:key="index"
:rule="rule"
:allow-multi-rule="settings.allowMultiRule"
:is-mr-edit="false"
:eligible-approvers-docs-path="settings.eligibleApproversDocsPath"
:can-edit="canEdit(rule)"
/>
<tr v-else :key="index">
<td class="js-name">{{ rule.name }}</td>
<td class="js-members" :class="settings.allowMultiRule ? 'd-none d-sm-table-cell' : null">
<user-avatar-list :items="rule.approvers" :img-size="24" empty-text="" />
</td>
<td v-if="settings.allowMultiRule" class="js-branches">
<rule-branches :rule="rule" />
</td>
<td class="js-approvals-required">
<rule-input :rule="rule" />
</td>
<td class="text-nowrap px-2 w-0 js-controls">
<rule-controls v-if="canEdit(rule)" :rule="rule" />
</td>
</tr>
</template>
</template>
</rules>
<!-- TODO: Remove feature flag in https://gitlab.com/gitlab-org/gitlab/-/issues/235114 -->
<table class="table m-0" v-if="glFeatures.approvalSuggestions">
<tbody>
<unconfigured-security-rule <unconfigured-security-rule
v-for="securityRule in securityRules" v-for="securityRule in securityRules"
:key="securityRule.name" :key="securityRule.name"
...@@ -216,7 +219,7 @@ export default { ...@@ -216,7 +219,7 @@ export default {
:match-rule="securityRule" :match-rule="securityRule"
@enable="openCreateModal({ defaultRuleName: securityRule.name })" @enable="openCreateModal({ defaultRuleName: securityRule.name })"
/> />
</template> </tbody>
</template> </table>
</rules> </div>
</template> </template>
...@@ -94,7 +94,7 @@ export default { ...@@ -94,7 +94,7 @@ export default {
</td> </td>
</template> </template>
<td v-else class="js-name" colspan="3"> <td v-else class="js-name" colspan="5">
<div>{{ matchRule.name }}</div> <div>{{ matchRule.name }}</div>
<div class="gl-text-gray-500"> <div class="gl-text-gray-500">
<gl-sprintf :message="matchRule.description"> <gl-sprintf :message="matchRule.description">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment