From 3a12a6e58c28b1d5473ed075be78a3d1e3412797 Mon Sep 17 00:00:00 2001 From: JuanCarlos Date: Tue, 26 Mar 2019 10:13:54 +0100 Subject: [PATCH] Removed (at the moment) save tables status --- .../directives/wz-table/wz-table-directive.js | 10 +- public/directives/wz-table/wz-table.html | 855 ++++++++---------- 2 files changed, 400 insertions(+), 465 deletions(-) diff --git a/public/directives/wz-table/wz-table-directive.js b/public/directives/wz-table/wz-table-directive.js index b2bc9084c..f8b947c27 100644 --- a/public/directives/wz-table/wz-table-directive.js +++ b/public/directives/wz-table/wz-table-directive.js @@ -170,7 +170,7 @@ app.directive('wzTable', function () { if ($scope.customColumns) { setTimeout(() => { $scope.setColResizable(); - }, 10); + }, 100); } return; } catch (error) { @@ -268,8 +268,6 @@ app.directive('wzTable', function () { * On controller loads */ const init = async (skipFetching = false) => { - if (!skipFetching) - $scope.wazuh_table_resizing = true; await initTable( $scope, fetch, @@ -488,15 +486,11 @@ app.directive('wzTable', function () { }; $scope.setColResizable = () => { - setTimeout(() => { - $scope.wazuh_table_resizing = false; - }, 1); $(`#table${$scope.scapepath}`).colResizable({ liveDrag: true, minWidth: 78, partialRefresh: true, - draggingClass: false, - postbackSafe: true + draggingClass: false }); $scope.$applyAsync(); }; diff --git a/public/directives/wz-table/wz-table.html b/public/directives/wz-table/wz-table.html index ab7f7e4b2..a4b08d700 100644 --- a/public/directives/wz-table/wz-table.html +++ b/public/directives/wz-table/wz-table.html @@ -1,493 +1,434 @@ -
+
-
-
-
- -
- {{ keyEquivalence[key.key.value || key.key] }} -
- - +
+
+ +
+ {{ keyEquivalence[key.key.value || key.key] }}
+ + +
-
- - - -
- - {{ path === '/agents/groups' && (key.value || key) === 'count' ? 'Agents' : - keyEquivalence[key.value || - key] || key.value || key }} - - - + + + + - - - - - + + + + - - - + + - - - - + + + + - -
+ + {{ path === '/agents/groups' && (key.value || key) === 'count' ? 'Agents' : + keyEquivalence[key.value || + key] || key.value || key }} + + + - Actions -
-
- - {{ - parseValue(key,item) - }} - - - {{ parseValue(key,item) }} - -
- 		-
+
+ + {{ + parseValue(key,item) + }} -
+ 		+ + + + - - - - - + + + + + + -
-
- Group {{item.name}} will be - removed -
-
- Cancel - Confirm -
+
+
+ Group {{item.name}} will be + removed
-
- -
-
- Agent {{item.id}} will be removed - from - this group -
-
- Cancel - - Confirm -
+
+ Cancel + Confirm
-
- + +
+
+ Agent {{item.id}} will be removed + from + this group +
+
+ Cancel + + Confirm +
+
+ 		+ - -
-
- {{path === '/lists/files' ? 'List' - : 'File'}} {{path === '/lists/files' ? item.name - : item.file}} will be deleted -
-
- Cancel - Confirm -
+ + + +
+
+ {{path === '/lists/files' ? 'List' + : 'File'}} {{path === '/lists/files' ? item.name + : item.file}} will be deleted
-
+ Cancel + Confirm + + +
- {{ totalItems }} items ({{time | number: 2}} - seconds) -
- +
  • + Next » +
    • + + + + +
    +
    -
    - - - - - - - + + + + +
    - - {{ keyEquivalence[key.value || key] || key.value || key }} - - -
    -
    - - -

    -

       -     - {{ - parseValue(key,item) - }} +
    + + + + + + + - - - - - - - - -
    + + {{ keyEquivalence[key.value || key] || key.value || key }} + + +
    +
    + + +

    +

           - - {{ parseValue(key,item) }} - -
    -
    -
    - - -
    -
    -
    -

    Rationale

    -
    -

    {{item.rationale}}

    -
    -
    -
    -
    -
    -
    -

    Remediation

    -
    -

    {{item.remediation}}

    -
    -
    -
    -
    -
    -
    -

    Path(s)

    -
    -

    {{item.directory}}

    -
    -
    -
    -
    -
    -
    -

    Compliance

    -
    -

    {{c.key}}/{{c.value}} -

    -
    -
    -
    -
    -
    -     -     -
    -
    - {{ totalItems }} items ({{time | number: 2}} - seconds) -
    -
    - -
    - - - - - - - - - - + + - - - - - -
    - {{ - keyEquivalence[key.value || key] || key.value || key }} - - -
    -
    - - {{ - parseValue(key,item) - }} - - - {{ parseValue(key,item) }} - -
    -
    -
    - - -
    - - - - - - - -
    {{key}} - {{value}} -
    +
    +
    + + +
    +
    +
    +

    Rationale

    +
    +

    {{item.rationale}}

    +
    +
    +
    - - - -
    -
    - {{ totalItems }} items ({{time | number: 2}} - seconds) - + +
    -
    +
    + {{ totalItems }} items ({{time | number: 2}} + seconds) + +
    +
    + +
    + + + + + + + + + + + + + + + +
    + {{ + keyEquivalence[key.value || key] || key.value || key }} + + +
    +
    + + {{ + parseValue(key,item) + }} + + + {{ parseValue(key,item) }} + +
    +
    +
    + + +
    + + + + + + + +
    {{key}} + {{value}} +
    +
    + +     +     +
    +
    + {{ totalItems }} items ({{time | number: 2}} + seconds) + +
    +
    + +
    +
    +
    + + {{customEmptyResults}}
    +
    -
    -
    -
    - - {{error}} -
    +
    +
    +
    + + {{error}}
    +
    -
    - 0 items ({{time | number: 2}} seconds) -
    +
    + 0 items ({{time | number: 2}} seconds)
    \ No newline at end of file