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

merge prod to master #236

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

merge prod to master #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
62c073d
Release to Production (#201)
tonytlwu Oct 26, 2022
6f5631b
Merge branch 'master' into production
squallstar Nov 9, 2022
f9f08bf
Revert "XOR-563[FIX] Ensure create record automation copies records i…
squallstar Nov 9, 2022
1d337ac
Merge branch 'master' into production
squallstar Nov 23, 2022
eccc7ca
Release to Production (#203)
tonytlwu Dec 14, 2022
2c08824
XOR-203 fixes for editing rules with "allow" settings
squallstar Dec 21, 2022
cd441f1
ID-2791 [Fix] Fix issue with positioning of editing cells (#205)
tonytlwu Dec 21, 2022
4469293
[Maintenance] Updates information based on latest DS versioning chang…
tonytlwu Dec 15, 2022
58b589e
Release to production (#209)
squallstar Jan 18, 2023
bbbae16
ID-2830 [Chore] Fetch api tokens from all apps to populate tokens dro…
squallstar Jan 18, 2023
9ef431f
ID-2830 [Fix] Fixes an invalid logic to do with custom security rules…
squallstar Jan 19, 2023
7ef0d49
Release to production (#215)
squallstar Jan 25, 2023
4d7e679
XOR-848 [FIX] Ensure DS message hidden for error scenarios (#213)
NikitaJadhavXoriant Jan 25, 2023
fa4eff6
ID-2827 [Fix] Do not allow the first row to be moved (#211)
tonytlwu Feb 16, 2023
52c6a56
ID-2897 [Fix] Managing security rule saving states and errors (#216)
tonytlwu Feb 23, 2023
973ab19
XOR-948 [FEAT] Added schema for data source (#218)
anerib May 22, 2023
7784541
Release to Production (#222)
tonytlwu Jun 28, 2023
b905c0d
ID-3560 [FIX] Reset all the existing security rules after deleting sp…
armine-fliplet Sep 14, 2023
0f062f2
release/PS-116 - fix rows height (#235)
dwfliplet Aug 12, 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
8 changes: 6 additions & 2 deletions css/interface.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ body {
}

.ht_clone_top .wtHolder {
overflow-x: hidden !important;
overflow-x: visible !important;
}

.ht_clone_left .wtHolder {
overflow-y: hidden !important;
overflow-y: visible !important;
}

.controls-wrapper {
Expand Down Expand Up @@ -852,3 +852,7 @@ td.data-source-apps {
.data-source-name {
word-break: break-all;
}

.handsontable :is(th, td){
height: unset !important;
}
220 changes: 124 additions & 96 deletions interface.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ <h3>No results found</h3>
<br />
<div id="versions-details">
<div class="callout callout-primary">
<p>When changes are made to the data source, Fliplet will store a version of every change. Fliplet stores:</p>
<p>When changes are made to the data source, Fliplet will store a version of every change. Entries larger than 50KB are excluded from each version snapshot. Fliplet stores:</p>
<ul>
<li>The most recent 100 versions; then</li>
<li>Every 5 minutes for up to 3 hours; then</li>
<li>Every 15 minutes for up to 3 hours; then</li>
<li>Every hour for up to 300 versions</li>
</ul>
</div>
Expand All @@ -256,6 +256,9 @@ <h4>System generated data source</h4>
<ul class="dropdown-menu preconfigured-rules" aria-labelledby="add-rules-dropdown">
<li><a href="#" id="add-rule">Create my own rule</a></li>
<li role="separator" class="divider"></li>
<li class="dropdown-header">Advanced</li>
<li><a href="#" id="add-custom-rule">Create a custom rule using JavaScript</a></li>
<li role="separator" class="divider"></li>
<li class="dropdown-header">Pre-configured rules</li>
</ul>
</div>
Expand Down Expand Up @@ -298,117 +301,142 @@ <h4 class="modal-title"></h4>
</div>
<div class="modal-body">
<form class="form">
<div class="row">
<div class="col-md-4">
<h5>Allow</h5>
<p>Specify users affected by this rule.</p>
</div>
<div class="col-md-8 side vertical token-align-item">
<div class="row">
<button data-allow="all" type="button" class="btn btn-default selected"><i class="fa fa-globe fa-fw"></i> All users</button>
<button data-allow="loggedIn" type="button" class="btn btn-default"><i class="fa fa-lock fa-fw"></i> Logged in users</button>
<button data-allow="filter" type="button" class="btn btn-default"><i class="fa fa-filter fa-fw"></i> Specific users</button>
<button data-allow="tokens" type="button" class="btn btn-default">Specific token</button>
</div>
<div class="users-filter hidden">
<div class="filters"></div>
<button data-add-user-filter type="button" class="btn btn-default"><i class="fa fa-plus fa-fw"></i> Add condition</button>
<div data-rule-standard>
<div class="row">
<div class="col-md-4">
<h5>Allow</h5>
<p>Specify users affected by this rule.</p>
</div>
<div class="row tokens-list hidden form-group">
<div class="col-md-8 side vertical token-align-item">
<div class="row">
<button data-allow="all" type="button" class="btn btn-default selected"><i class="fa fa-globe fa-fw"></i> All users</button>
<button data-allow="loggedIn" type="button" class="btn btn-default"><i class="fa fa-lock fa-fw"></i> Logged in users</button>
<button data-allow="filter" type="button" class="btn btn-default"><i class="fa fa-filter fa-fw"></i> Specific users</button>
<button data-allow="tokens" type="button" class="btn btn-default">Specific token</button>
</div>
<div class="users-filter hidden">
<div class="filters"></div>
<button data-add-user-filter type="button" class="btn btn-default"><i class="fa fa-plus fa-fw"></i> Add condition</button>
</div>
<div class="row tokens-list hidden form-group">
</div>
</div>
</div>
</div>
<hr />
<div class="row">
<div class="col-md-4">
<h5>Users can</h5>
<p>Select operations the specified users can perform.</p>
</div>
<div class="col-md-8 side">
<div class="checkbox checkbox-icon">
<input name="type" type="checkbox" id="chk-select" value="select">
<label for="chk-select">
<span class="check"><i class="fa fa-check"></i></span> Read
</label>
<hr />
<div class="row">
<div class="col-md-4">
<h5>Users can</h5>
<p>Select operations the specified users can perform.</p>
</div>
<div class="checkbox checkbox-icon">
<input name="type" type="checkbox" id="chk-insert" value="insert">
<label for="chk-insert">
<span class="check"><i class="fa fa-check"></i></span> Write
</label>
<div class="col-md-8 side">
<div class="checkbox checkbox-icon">
<input name="type" type="checkbox" id="chk-select" value="select">
<label for="chk-select">
<span class="check"><i class="fa fa-check"></i></span> Read
</label>
</div>
<div class="checkbox checkbox-icon">
<input name="type" type="checkbox" id="chk-insert" value="insert">
<label for="chk-insert">
<span class="check"><i class="fa fa-check"></i></span> Write
</label>
</div>
<div class="checkbox checkbox-icon">
<input name="type" type="checkbox" id="chk-update" value="update">
<label for="chk-update">
<span class="check"><i class="fa fa-check"></i></span> Update
</label>
</div>
<div class="checkbox checkbox-icon">
<input name="type" type="checkbox" id="chk-delete" value="delete">
<label for="chk-delete">
<span class="check"><i class="fa fa-check"></i></span> Delete
</label>
</div>
</div>
<div class="checkbox checkbox-icon">
<input name="type" type="checkbox" id="chk-update" value="update">
<label for="chk-update">
<span class="check"><i class="fa fa-check"></i></span> Update
</label>
</div>
<hr />
<div class="row">
<div class="col-md-4">
<h5>Applies to</h5>
<p>Select apps affected by this rule.</p>
</div>
<div class="checkbox checkbox-icon">
<input name="type" type="checkbox" id="chk-delete" value="delete">
<label for="chk-delete">
<span class="check"><i class="fa fa-check"></i></span> Delete
</label>
<div class="col-md-8 side vertical">
<div>
<button data-apps="all" type="button" class="btn btn-default selected">All apps</button>
<button data-apps="filter" type="button" class="btn btn-default"><i class="fa fa-filter fa-fw"></i> Specific apps</button>
</div>
<div class="apps-list"></div>
</div>
</div>
</div>
<hr />
<div class="row">
<div class="col-md-4">
<h5>Applies to</h5>
<p>Select apps affected by this rule.</p>
</div>
<div class="col-md-8 side vertical">
<div>
<button data-apps="all" type="button" class="btn btn-default selected">All apps</button>
<button data-apps="filter" type="button" class="btn btn-default"><i class="fa fa-filter fa-fw"></i> Specific apps</button>
<hr />
<div class="row">
<div class="col-md-4">
<h5>Include or exclude columns</h5>
<p data-exclude-description></p>
</div>
<div class="apps-list"></div>
</div>
</div>
<hr />
<div class="row">
<div class="col-md-4">
<h5>Include or exclude columns</h5>
<p data-exclude-description></p>
</div>
<div class="col-md-8 side">
<div class="tokenfield-ui">
<div class="row">
<div class="col-md-3">
<div class="radio radio-icon">
<input type="radio" id="exclude" name="columns-list-mode" value="exclude">
<label for="exclude">
<span class="check"><i class="fa fa-circle"></i></span> Exclude
</label>
<div class="col-md-8 side">
<div class="tokenfield-ui">
<div class="row">
<div class="col-md-3">
<div class="radio radio-icon">
<input type="radio" id="exclude" name="columns-list-mode" value="exclude">
<label for="exclude">
<span class="check"><i class="fa fa-circle"></i></span> Exclude
</label>
</div>
</div>
</div>
<div class="col-md-9">
<div class="radio radio-icon">
<input type="radio" id="include" name="columns-list-mode" value="include" checked>
<label for="include">
<span class="check"><i class="fa fa-circle"></i></span>Include
</label>
<div class="col-md-9">
<div class="radio radio-icon">
<input type="radio" id="include" name="columns-list-mode" value="include" checked>
<label for="include">
<span class="check"><i class="fa fa-circle"></i></span>Include
</label>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<input type="text" class="form-control" name="exclude" value=""
placeholder="Type the column name and press return">
<div class="row">
<div class="col-md-12">
<input type="text" class="form-control" name="exclude" value=""
placeholder="Type the column name and press return">
</div>
</div>
</div>
</div>
</div>
<hr />
<div class="row">
<div class="col-md-4">
<h5>Request data requirements</h5>
<p>Specify rules that data must follow.</p>
</div>
<div class="col-md-8 side vertical">
<div class="required-fields"></div>
<button data-add-filter type="button" class="btn btn-default"><i class="fa fa-plus fa-fw"></i> Add data requirement</button>
</div>
</div>
</div>
<hr />
<div class="row">
<div class="col-md-4">
<h5>Request data requirements</h5>
<p>Specify rules that data must follow.</p>
<div data-rule-custom>
<div class="row">
<div class="col-md-4">
<h5>Security rule name</h5>
<p>Use a name to describe the security rule.</p>
</div>
<div class="col-md-8 side vertical">
<input type="text" class="form-control" maxlength="128" name="name" placeholder="Name of your rule" />
</div>
</div>
<div class="col-md-8 side vertical">
<div class="required-fields"></div>
<button data-add-filter type="button" class="btn btn-default"><i class="fa fa-plus fa-fw"></i> Add data requirement</button>
<hr />
<div class="row">
<div class="col-md-4">
<h5>Custom definition</h5>
<p>Write your custom rule using JavaScript. See <a href="https://developers.fliplet.com/Data-source-security.html#custom-security-rules" target="_blank">documentation</a> to learn more.</p>
</div>
<div class="col-md-8 side vertical">
<div style="width:100%">
<textarea id="custom-rule"></textarea>
</div>
</div>
</div>
</div>
</form>
Expand All @@ -419,4 +447,4 @@ <h5>Request data requirements</h5>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
</div><!-- /.modal -->
Loading