test deleteMissing with schema changes
This commit is contained in:
Gani Georgiev
@@ -2,29 +2,28 @@
|
||||
import { createEventDispatcher } from "svelte";
|
||||
import ApiClient from "@/utils/ApiClient";
|
||||
import CommonHelper from "@/utils/CommonHelper";
|
||||
import OverlayPanel from "@/components/base/OverlayPanel.svelte";
|
||||
import { addSuccessToast } from "@/stores/toasts";
|
||||
import { confirm } from "@/stores/confirmation";
|
||||
import OverlayPanel from "@/components/base/OverlayPanel.svelte";
|
||||
import CollectionsDiffTable from "@/components/collections/CollectionsDiffTable.svelte";
|
||||
|
||||
const dispatch = createEventDispatcher();
|
||||
|
||||
let panel;
|
||||
let oldCollections = [];
|
||||
let newCollections = [];
|
||||
let changes = [];
|
||||
let pairs = [];
|
||||
let deleteMissing = false;
|
||||
let isImporting = false;
|
||||
|
||||
$: if (Array.isArray(oldCollections) && Array.isArray(newCollections)) {
|
||||
loadChanges();
|
||||
loadPairs();
|
||||
}
|
||||
|
||||
$: deletedCollections = oldCollections.filter((old) => {
|
||||
return !CommonHelper.findByKey(newCollections, "id", old.id)?.id;
|
||||
});
|
||||
|
||||
export function show(a, b) {
|
||||
oldCollections = a;
|
||||
newCollections = b;
|
||||
export function show(oldCollectionsArg, newCollectionsArg, deleteMissingArg = false) {
|
||||
oldCollections = oldCollectionsArg;
|
||||
newCollections = newCollectionsArg;
|
||||
deleteMissing = deleteMissingArg;
|
||||
|
||||
panel?.show();
|
||||
}
|
||||
@@ -33,25 +32,23 @@
|
||||
return panel?.hide();
|
||||
}
|
||||
|
||||
function loadChanges() {
|
||||
changes = [];
|
||||
function loadPairs() {
|
||||
pairs = [];
|
||||
|
||||
// add deleted and modified collections
|
||||
for (const oldCollection of oldCollections) {
|
||||
const newCollection = CommonHelper.findByKey(newCollections, "id", oldCollection.id) || null;
|
||||
if (!newCollection?.id || JSON.stringify(oldCollection) != JSON.stringify(newCollection)) {
|
||||
changes.push({
|
||||
old: oldCollection,
|
||||
new: newCollection,
|
||||
});
|
||||
}
|
||||
pairs.push({
|
||||
old: oldCollection,
|
||||
new: newCollection,
|
||||
});
|
||||
}
|
||||
|
||||
// add only new collections
|
||||
for (const newCollection of newCollections) {
|
||||
const oldCollection = CommonHelper.findByKey(oldCollections, "id", newCollection.id) || null;
|
||||
if (!oldCollection?.id) {
|
||||
changes.push({
|
||||
pairs.push({
|
||||
old: oldCollection,
|
||||
new: newCollection,
|
||||
});
|
||||
@@ -59,63 +56,32 @@
|
||||
}
|
||||
}
|
||||
|
||||
function diffsToHtml(diffs, ops = [window.DIFF_INSERT, window.DIFF_DELETE, window.DIFF_EQUAL]) {
|
||||
const html = [];
|
||||
const pattern_amp = /&/g;
|
||||
const pattern_lt = /</g;
|
||||
const pattern_gt = />/g;
|
||||
const pattern_para = /\n/g;
|
||||
|
||||
for (let i = 0; i < diffs.length; i++) {
|
||||
const op = diffs[i][0]; // operation (insert, delete, equal)
|
||||
|
||||
if (!ops.includes(op)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const text = diffs[i][1]
|
||||
.replace(pattern_amp, "&")
|
||||
.replace(pattern_lt, "<")
|
||||
.replace(pattern_gt, ">")
|
||||
.replace(pattern_para, "<br>");
|
||||
|
||||
switch (op) {
|
||||
case DIFF_INSERT:
|
||||
html[i] = '<ins class="block">' + text + "</ins>";
|
||||
break;
|
||||
case DIFF_DELETE:
|
||||
html[i] = '<del class="block">' + text + "</del>";
|
||||
break;
|
||||
case DIFF_EQUAL:
|
||||
html[i] = text;
|
||||
break;
|
||||
function submitWithConfirm() {
|
||||
// find deleted fields
|
||||
const deletedFieldNames = [];
|
||||
if (deleteMissing) {
|
||||
for (const old of oldCollections) {
|
||||
const imported = !CommonHelper.findByKey(newCollections, "id", old.id);
|
||||
if (!imported) {
|
||||
// add all fields
|
||||
deletedFieldNames.push(old.name + ".*");
|
||||
} else {
|
||||
// add only deleted fields
|
||||
const schema = Array.isArray(old.schema) ? old.schema : [];
|
||||
for (const field of schema) {
|
||||
if (!CommonHelper.findByKey(imported.schema, "id", field.id)) {
|
||||
deletedFieldNames.push(old.name + "." + field.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return html.join("");
|
||||
}
|
||||
|
||||
function diff(obj1, obj2, ops = [window.DIFF_INSERT, window.DIFF_DELETE, window.DIFF_EQUAL]) {
|
||||
const dmp = new diff_match_patch();
|
||||
const lines = dmp.diff_linesToChars_(
|
||||
obj1 ? JSON.stringify(obj1, null, 4) : "",
|
||||
obj2 ? JSON.stringify(obj2, null, 4) : ""
|
||||
);
|
||||
const diffs = dmp.diff_main(lines.chars1, lines.chars2, false);
|
||||
|
||||
dmp.diff_charsToLines_(diffs, lines.lineArray);
|
||||
|
||||
return diffsToHtml(diffs, ops);
|
||||
}
|
||||
|
||||
function submitWithConfirm() {
|
||||
if (deletedCollections.length) {
|
||||
const deletedNames = deletedCollections.map((c) => c.name);
|
||||
|
||||
if (deletedFieldNames.length) {
|
||||
confirm(
|
||||
`Do you really want to delete the following collections and their related records data:\n- ${deletedNames.join(
|
||||
`Do you really want to delete the following collection fields and their related records data:\n- ${deletedFieldNames.join(
|
||||
"\n- "
|
||||
)}?`,
|
||||
)}`,
|
||||
() => {
|
||||
submit();
|
||||
}
|
||||
@@ -133,8 +99,8 @@
|
||||
isImporting = true;
|
||||
|
||||
try {
|
||||
await ApiClient.collections.import(newCollections, true);
|
||||
addSuccessToast("Successfully imported the collections configuration.");
|
||||
await ApiClient.collections.import(newCollections, deleteMissing);
|
||||
addSuccessToast("Successfully imported collections configuration.");
|
||||
dispatch("submit");
|
||||
} catch (err) {
|
||||
ApiClient.errorResponseHandler(err);
|
||||
@@ -148,7 +114,7 @@
|
||||
|
||||
<OverlayPanel
|
||||
bind:this={panel}
|
||||
class="full-width-popup import-popup"
|
||||
class="full-width-popup import-popup"
|
||||
overlayClose={false}
|
||||
escClose={!isImporting}
|
||||
beforeHide={() => !isImporting}
|
||||
@@ -160,40 +126,9 @@
|
||||
<h4 class="center txt-break">Side-by-side diff</h4>
|
||||
</svelte:fragment>
|
||||
|
||||
<div class="grid grid-sm m-b-sm">
|
||||
{#each changes as pair (pair.old?.id + pair.new?.id)}
|
||||
<div class="col-12">
|
||||
<div class="flex flex-gap-10">
|
||||
{#if !pair.old?.id}
|
||||
<span class="label label-success">New</span>
|
||||
<strong>{pair.new?.name}</strong>
|
||||
{:else if !pair.new?.id}
|
||||
<span class="label label-danger">Deleted</span>
|
||||
<strong>{pair.old?.name}</strong>
|
||||
{:else}
|
||||
<span class="label label-warning">Modified</span>
|
||||
<div class="inline-flex fleg-gap-5">
|
||||
{#if pair.old.name !== pair.new.name}
|
||||
<strong class="txt-strikethrough txt-hint">{pair.old.name}</strong>
|
||||
<i class="ri-arrow-right-line txt-sm" />
|
||||
{/if}
|
||||
<strong class="txt">{pair.new.name}</strong>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6 p-b-10">
|
||||
<code class="code-block">
|
||||
{@html diff(pair.old, pair.new, [window.DIFF_DELETE, window.DIFF_EQUAL]) || "N/A"}
|
||||
</code>
|
||||
</div>
|
||||
<div class="col-6 p-b-10">
|
||||
<code class="code-block">
|
||||
{@html diff(pair.old, pair.new, [window.DIFF_INSERT, window.DIFF_EQUAL]) || "N/A"}
|
||||
</code>
|
||||
</div>
|
||||
{/each}
|
||||
</div>
|
||||
{#each pairs as pair}
|
||||
<CollectionsDiffTable collectionA={pair.old} collectionB={pair.new} {deleteMissing} />
|
||||
{/each}
|
||||
|
||||
<svelte:fragment slot="footer">
|
||||
<button type="button" class="btn btn-secondary" on:click={hide} disabled={isImporting}>Close</button>
|
||||
@@ -208,10 +143,3 @@
|
||||
</button>
|
||||
</svelte:fragment>
|
||||
</OverlayPanel>
|
||||
|
||||
<style>
|
||||
code {
|
||||
color: var(--txtHintColor);
|
||||
min-height: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user