Skip to content

Feature/sqle issue 2561 #404

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

Merged
merged 5 commits into from
Aug 30, 2024
Merged

Feature/sqle issue 2561 #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ea78a5
[chore]: build API
LZS911 Aug 27, 2024
381ae5b
[feature]: (SqlManagement) implement quick review functionality from …
LZS911 Aug 27, 2024
1e22547
[chore]: (SqlManagementConf) replace deprecated API interface
LZS911 Aug 27, 2024
2d062b5
[fix]: resolve ci error
LZS911 Aug 27, 2024
32921e6
[revert]: (SqlManagementConf)restore old interface replaced by a depr…
LZS911 Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/shared/lib/api/sqle/service/common.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2225,7 +2225,7 @@ export interface IScheduledTaskDefaultOptionV1Rsp {
export interface ISource {
sql_source_desc?: string;

sql_source_id?: string;
sql_source_ids?: string[];

sql_source_type?: string;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/sqle/src/page/SqlAudit/List/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ describe('sqle/SqlAudit/List', () => {
fuzzy_search_tags: 'test',
page_index: 1,
page_size: 20,
filter_sql_audit_record_ids: ''
filter_sql_audit_record_ids: undefined
});
});

Expand Down
4 changes: 2 additions & 2 deletions packages/sqle/src/page/SqlAudit/List/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
const searchStr = new URLSearchParams(location.search);
if (searchStr.has(SQLAuditRecordListUrlParamsKey.SQLAuditRecordID)) {
return (
searchStr.get(SQLAuditRecordListUrlParamsKey.SQLAuditRecordID) ?? ''
searchStr.get(SQLAuditRecordListUrlParamsKey.SQLAuditRecordID) ??
undefined

Check warning on line 61 in packages/sqle/src/page/SqlAudit/List/index.tsx

View workflow job for this annotation

GitHub Actions / Coverage annotations (🧪 jest-coverage-report-action)

🌿 Branch is not covered 

Warning! Not covered branch
);
}
return '';
}, [location.search]);
const [filterStatus, setFilterStatus] = useState<
getSQLAuditRecordsV1FilterSqlAuditStatusEnum | 'all'
Expand Down
329 changes: 326 additions & 3 deletions packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3505,7 +3505,8 @@ exports[`page/SqlManagement/SQLEEIndex render table data 1`] = `
class="ant-table-cell"
>
<a
href="/sqle/project/700300/sql-management-conf/123?active=mysql_slow_log"
href="/sqle/project/700300/sql-management-conf/123"
target="_blank"
>
慢日志
</a>
Expand Down Expand Up @@ -3896,7 +3897,8 @@ exports[`page/SqlManagement/SQLEEIndex render table data 1`] = `
class="ant-table-cell"
>
<a
href="/sqle/project/700300/sql-management-conf/123?active=mysql_slow_log"
href="/sqle/project/700300/sql-management-conf/123"
target="_blank"
>
慢日志
</a>
Expand Down Expand Up @@ -4256,7 +4258,8 @@ exports[`page/SqlManagement/SQLEEIndex render table data 1`] = `
class="ant-table-cell"
>
<a
href="/sqle/project/700300/sql-management-conf/123?active=mysql_slow_log"
href="/sqle/project/700300/sql-management-conf/123"
target="_blank"
>
慢日志
</a>
Expand Down Expand Up @@ -4422,6 +4425,326 @@ exports[`page/SqlManagement/SQLEEIndex render table data 1`] = `
</div>
</td>
</tr>
<tr
class="ant-table-row ant-table-row-level-0"
data-row-key="1150087"
>
<td
class="ant-table-cell ant-table-selection-column"
>
<label
class="ant-checkbox-wrapper css-dev-only-do-not-override-bj9uhl"
>
<span
class="ant-checkbox css-dev-only-do-not-override-bj9uhl"
>
<input
class="ant-checkbox-input"
type="checkbox"
/>
<span
class="ant-checkbox-inner"
/>
</span>
</label>
</td>
<td
class="ant-table-cell ellipsis-column-width"
>
<div
class="actiontech-sql-snippet-renderer-wrapper css-dz7fl9"
>
<div
class="ant-typography ant-typography-ellipsis ant-typography-ellipsis-multiple-line margin-bottom-0 css-dev-only-do-not-override-bj9uhl"
>
<span>
<span
class="hljs-keyword"
>
SELECT
</span>
?
</span>
</div>
<div
class="actiontech-copy-icon actiontech-sql-renderer-copy-icon css-1s8kb8e"
>
<span
aria-label="copy"
class="anticon anticon-copy"
role="img"
>
<svg
aria-hidden="true"
data-icon="copy"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M832 64H296c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h496v688c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8V96c0-17.7-14.3-32-32-32zM704 192H192c-17.7 0-32 14.3-32 32v530.7c0 8.5 3.4 16.6 9.4 22.6l173.3 173.3c2.2 2.2 4.7 4 7.4 5.5v1.9h4.2c3.5 1.3 7.2 2 11 2H704c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32zM350 856.2L263.9 770H350v86.2zM664 888H414V746c0-22.1-17.9-40-40-40H232V264h432v624z"
/>
</svg>
</span>
</div>
</div>
</td>
<td
class="ant-table-cell ellipsis-column-width"
>
<div
class="actiontech-sql-snippet-renderer-wrapper css-dz7fl9"
>
<div
class="ant-typography ant-typography-ellipsis ant-typography-ellipsis-multiple-line margin-bottom-0 css-dev-only-do-not-override-bj9uhl"
>
<span>
<span
class="hljs-keyword"
>
SELECT
</span>

<span
class="hljs-number"
>
1
</span>
;
</span>
</div>
<div
class="actiontech-copy-icon actiontech-sql-renderer-copy-icon css-1s8kb8e"
>
<span
aria-label="copy"
class="anticon anticon-copy"
role="img"
>
<svg
aria-hidden="true"
data-icon="copy"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M832 64H296c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h496v688c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8V96c0-17.7-14.3-32-32-32zM704 192H192c-17.7 0-32 14.3-32 32v530.7c0 8.5 3.4 16.6 9.4 22.6l173.3 173.3c2.2 2.2 4.7 4 7.4 5.5v1.9h4.2c3.5 1.3 7.2 2 11 2H704c17.7 0 32-14.3 32-32V224c0-17.7-14.3-32-32-32zM350 856.2L263.9 770H350v86.2zM664 888H414V746c0-22.1-17.9-40-40-40H232V264h432v624z"
/>
</svg>
</span>
</div>
</div>
</td>
<td
class="ant-table-cell"
>
<a
href="/sqle/project/700300/sql-audit?SQLAuditRecordID=123"
target="_blank"
>
SQL审核
</a>
</td>
<td
class="ant-table-cell"
>
<div
class="audit-result-wrapper"
>
<div
class=" css-1v03opz"
>
<div
class="css-1avyf41"
>
<span
class="icon-wrapper"
>
<svg
height="20"
viewBox="0 0 20 20"
width="20"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M10 18.333a8.333 8.333 0 1 1 0-16.666 8.333 8.333 0 1 1 0 16.666m-.83-5 5.89-5.892-1.177-1.178-4.714 4.714-2.357-2.358-1.179 1.179z"
fill="#41BF9A"
/>
</svg>
</span>
<span
class="text-wrapper"
>
白名单
</span>
</div>
</div>
</div>
</td>
<td
class="ant-table-cell"
>
MYSQL_3307
</td>
<td
class="ant-table-cell"
>
db1
</td>
<td
class="ant-table-cell"
>
-
</td>
<td
class="ant-table-cell"
>
<div
class="ant-avatar-group css-dev-only-do-not-override-bj9uhl"
>
<div
class="ant-space css-dev-only-do-not-override-bj9uhl ant-space-horizontal ant-space-align-center basic-tooltips-wrapper css-4jbtl9"
>
<div
class="ant-space-item"
>
<span
class="ant-avatar ant-avatar-circle action-avatar css-1wq79dc css-dev-only-do-not-override-bj9uhl"
>
<span
class="ant-avatar-string"
style="transform: scale(1) translateX(-50%);"
>
T
</span>
</span>
</div>
</div>
<div
class="ant-space css-dev-only-do-not-override-bj9uhl ant-space-horizontal ant-space-align-center basic-tooltips-wrapper css-4jbtl9"
>
<div
class="ant-space-item"
>
<span
class="ant-avatar ant-avatar-circle action-avatar css-1wq79dc css-dev-only-do-not-override-bj9uhl"
>
<span
class="ant-avatar-string"
style="transform: scale(1) translateX(-50%);"
>
T
</span>
</span>
</div>
</div>
</div>
</td>
<td
class="ant-table-cell"
>
-
</td>
<td
class="ant-table-cell"
>
<span
class="ant-tag ant-tag-red basic-tag-wrapper basic-small-tag-wrapper css-xyvxme css-dev-only-do-not-override-bj9uhl"
>
未处理
</span>
</td>
<td
class="ant-table-cell ellipsis-column-width"
>
<button
class="ant-btn css-dev-only-do-not-override-9n8g17 ant-btn-default ant-btn-sm ant-btn-icon-only has-icon-primary basic-button-wrapper css-geipcv"
type="button"
>
<span
class="ant-btn-icon"
>
<svg
class="custom-icon"
color="currentColor"
height="16"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M6.162 12.667H14V14H2v-2.829l6.6-6.6 2.828 2.83zm3.38-9.038 1.415-1.414a.667.667 0 0 1 .942 0L13.785 4.1a.667.667 0 0 1 0 .942l-1.414 1.414z"
fill="currentColor"
/>
</svg>
</span>
</button>
</td>
<td
class="ant-table-cell actiontech-table-actions-column ant-table-cell-fix-right ant-table-cell-fix-right-first"
style="position: sticky; right: 0px;"
>
<div
class="css-new95e"
>
<div
class="ant-space css-dev-only-do-not-override-bj9uhl ant-space-horizontal ant-space-align-center"
>
<div
class="ant-space-item"
style="margin-right: 8px;"
>
<button
class="ant-btn css-dev-only-do-not-override-9n8g17 ant-btn-default ant-btn-sm actiontech-table-actions-button basic-button-wrapper css-geipcv"
type="button"
>
<span>
指派负责人
</span>
</button>
</div>
<div
class="ant-space-item"
>
<button
class="ant-btn css-dev-only-do-not-override-9n8g17 ant-btn-default ant-btn-sm actiontech-table-actions-button basic-button-wrapper css-geipcv"
type="button"
>
<span>
变更状态
</span>
</button>
</div>
</div>
<button
class="ant-btn css-dev-only-do-not-override-9n8g17 ant-btn-default ant-btn-sm ant-btn-icon-only actiontech-table-actions-button actiontech-table-actions-more-button basic-button-wrapper css-geipcv"
type="button"
>
<span
class="ant-btn-icon"
>
<svg
color="currentColor"
height="16"
viewBox="0 0 16 16"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M3.333 6.667C2.6 6.667 2 7.267 2 8s.6 1.333 1.333 1.333c.734 0 1.334-.6 1.334-1.333s-.6-1.333-1.334-1.333m9.334 0c-.734 0-1.334.6-1.334 1.333s.6 1.333 1.334 1.333C13.4 9.333 14 8.733 14 8s-.6-1.333-1.333-1.333M8 6.667c-.733 0-1.333.6-1.333 1.333S7.267 9.333 8 9.333 9.333 8.733 9.333 8 8.733 6.667 8 6.667"
fill="currentColor"
/>
</svg>
</span>
</button>
</div>
</td>
</tr>
</tbody>
</table>
</div>
Expand Down
Loading
Loading