Commit e0be4a8b authored by Azat Alimov's avatar Azat Alimov
Browse files

Merge branch 'no-demo-data' into 'main'

#80 Demo data needs to be split from mandatory data

See merge request !32
parents b08fb641 74beb23b
Pipeline #2827 failed with stage
......@@ -28,15 +28,15 @@
545A24AE2639ECAB00E0CC12 /* Authentication.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545A24AD2639ECAA00E0CC12 /* Authentication.swift */; };
545A24B62639EE2F00E0CC12 /* Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545A24B52639EE2F00E0CC12 /* Data.swift */; };
545FD29726205F1200F23F46 /* Dictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545FD29626205F1200F23F46 /* Dictionary.swift */; };
54663275267BDE56009D9B46 /* SettingsPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54663274267BDE56009D9B46 /* SettingsPane.swift */; };
54663245267B767F009D9B46 /* CustomRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54663244267B767F009D9B46 /* CustomRenderer.swift */; };
547780D5267A6545009DC45B /* PluginHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 547780D4267A6545009DC45B /* PluginHandler.swift */; };
54663275267BDE56009D9B46 /* SettingsPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54663274267BDE56009D9B46 /* SettingsPane.swift */; };
5478EDD92641A3FC000EB938 /* ItemRecord+Sync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5478EDD82641A3FC000EB938 /* ItemRecord+Sync.swift */; };
547B4FC726121723006A052E /* CVU_ActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 547B4FC626121723006A052E /* CVU_ActionButton.swift */; };
5482AA19262D769500149A68 /* ItemRecord+Properties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5482AA18262D769400149A68 /* ItemRecord+Properties.swift */; };
54842CDC26372842000A66A7 /* FilterPanelSortItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54842CDB26372842000A66A7 /* FilterPanelSortItemView.swift */; };
548B7947262EFE8F00511873 /* InflectorKit in Frameworks */ = {isa = PBXBuildFile; productRef = 548B7946262EFE8F00511873 /* InflectorKit */; };
54A61E3E265F9EEE005438D0 /* ContextualBottomBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54A61E3D265F9EEE005438D0 /* ContextualBottomBar.swift */; };
54D13BF926831AF9000DF13F /* default_database.json in Resources */ = {isa = PBXBuildFile; fileRef = 54D13BF826831AF9000DF13F /* default_database.json */; };
54D36B92266E6BB6003788F5 /* PubSubController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54D36B91266E6BB6003788F5 /* PubSubController.swift */; };
54E1CE492656CFB2009C7029 /* EdgeRecord+Sync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E1CE482656CFB2009C7029 /* EdgeRecord+Sync.swift */; };
A261AF3E267C9FD000D3B25F /* PermissionsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A261AF3D267C9FD000D3B25F /* PermissionsController.swift */; };
......@@ -264,15 +264,15 @@
545A24AD2639ECAA00E0CC12 /* Authentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Authentication.swift; sourceTree = "<group>"; };
545A24B52639EE2F00E0CC12 /* Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = "<group>"; };
545FD29626205F1200F23F46 /* Dictionary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dictionary.swift; sourceTree = "<group>"; };
54663274267BDE56009D9B46 /* SettingsPane.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPane.swift; sourceTree = "<group>"; };
54663244267B767F009D9B46 /* CustomRenderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomRenderer.swift; sourceTree = "<group>"; };
547780D4267A6545009DC45B /* PluginHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginHandler.swift; sourceTree = "<group>"; };
54663274267BDE56009D9B46 /* SettingsPane.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPane.swift; sourceTree = "<group>"; };
5478EDD82641A3FC000EB938 /* ItemRecord+Sync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ItemRecord+Sync.swift"; sourceTree = "<group>"; };
547B4FC626121723006A052E /* CVU_ActionButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CVU_ActionButton.swift; sourceTree = "<group>"; };
5482AA18262D769400149A68 /* ItemRecord+Properties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ItemRecord+Properties.swift"; sourceTree = "<group>"; };
54842CDB26372842000A66A7 /* FilterPanelSortItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterPanelSortItemView.swift; sourceTree = "<group>"; };
5485A6E19DEFD43D9AE69C85 /* Pods_Memri.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Memri.framework; sourceTree = BUILT_PRODUCTS_DIR; };
54A61E3D265F9EEE005438D0 /* ContextualBottomBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextualBottomBar.swift; sourceTree = "<group>"; };
54D13BF826831AF9000DF13F /* default_database.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = default_database.json; sourceTree = "<group>"; };
54D36B91266E6BB6003788F5 /* PubSubController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PubSubController.swift; sourceTree = "<group>"; };
54E1CE482656CFB2009C7029 /* EdgeRecord+Sync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EdgeRecord+Sync.swift"; sourceTree = "<group>"; };
92BAC70949EBE62C3C1877BD /* Pods_MemriPodAPITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MemriPodAPITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -759,6 +759,7 @@
D7E89C2A25A71FA8003AEFD8 /* LaunchScreen.storyboard */,
D7F136FD254E645E00881B25 /* Assets.xcassets */,
D73BA2482574C1220025C753 /* schema.json */,
54D13BF826831AF9000DF13F /* default_database.json */,
D73BA2572574CA460025C753 /* demo_database.json */,
);
path = Assets;
......@@ -905,7 +906,6 @@
D744F73C25BACB730002C8B7 /* NoteEditorRenderer.swift */,
D7CC3A0E25CE208B001EF34A /* GeneralEditorRenderer.swift */,
D744F74525BADE4A0002C8B7 /* LabelAnnotationRenderer.swift */,
5459E5922677499500312800 /* CustomRenderer.swift */,
);
path = Renderers;
sourceTree = "<group>";
......@@ -1299,6 +1299,7 @@
D7E89C2B25A71FA8003AEFD8 /* LaunchScreen.storyboard in Resources */,
D73BA2492574C1220025C753 /* schema.json in Resources */,
D7E89C2625A71F7A003AEFD8 /* demoAssets in Resources */,
54D13BF926831AF9000DF13F /* default_database.json in Resources */,
D7EBBC732586FE4F00A343E6 /* defaultCVU in Resources */,
D7E89CBD25A80B30003AEFD8 /* HTMLResources in Resources */,
D73BA2582574CA460025C753 /* demo_database.json in Resources */,
......
......@@ -66,7 +66,7 @@ Plugin {
}
Plugin > list {
onPress: runPlugin {
onPress: startPlugin {
name: {{.name}}
plugin: {{.}}
container: {{.container}}
......@@ -122,7 +122,7 @@ Plugin > list {
}
Plugin > grid {
onPress: runPlugin {
onPress: startPlugin {
name: {{.name}}
plugin: {{.}}
container: {{.container}}
......
[session = all-importer-instances] {
[session = all-plugin-instances] {
[view] {
title: "All ImporterRuns"
title: "All StartPlugin"
[datasource = pod] {
query: "ImporterRun"
query: "StartPlugin"
}
}
}
ImporterRun {
title: "{.name} importer run"
StartPlugin {
title: "{.name} start plugin"
defaultRenderer: generalEditor
editActionButton: toggleEditMode
filterButtons: [
......@@ -44,7 +44,7 @@ ImporterRun {
navigate: [
openView {
title: "Timeline of this importer run"
title: "Timeline of this start plugin"
view: {
defaultRenderer: timeline
......@@ -60,15 +60,15 @@ ImporterRun {
}
}
openViewByName {
title: "Starred importer runs"
title: "Starred start plugins"
viewName: "filter-starred"
viewArguments: {
include: "all-notes"
}
}
openSessionByName {
title: "All importer runs"
viewName: "all-importer-instances"
title: "All start plugins"
viewName: "all-plugin-instances"
}
]
}
......@@ -95,9 +95,9 @@ ImporterRun {
Image {
padding: 8 0 8 0
alignment: center
show: {{.importer.icon or .importer.bundleImage}}
systemName: {{.importer.icon}}
bundleImage: {{.importer.bundleImage}}
show: {{.plugin.icon or .plugin.bundleImage}}
systemName: {{.plugin.icon}}
bundleImage: {{.plugin.bundleImage}}
resizable: true
color: #2480d6
width: 30
......@@ -122,27 +122,12 @@ ImporterRun {
readOnly: true
padding: 0 10
background: secondaryBackground
Button {
onPress: runImporter {
importer: {{.}}
}
Text {
text: "START RUN"
font: 16 semibold
color: #fff
padding: 5 8 5 8
cornerRadius: 5
background: #70ba6c
}
}
}
Divider
EditorRow {
Text {
text: {{.importer.itemDescription}}
text: {{.plugin.itemDescription}}
font: 14 regular
color: #555
padding: 8 36 8 0
......@@ -150,65 +135,27 @@ ImporterRun {
}
}
}
/* run {*/
/* showTitle: false*/
/* */
/* VStack {*/
/* HStack {*/
/* align: left*/
/* background: #f9f9f9*/
/* */
/* Button {*/
/* margin: 5 5 5 35*/
/* */
/* onPress: runImporter {*/
/* importer: {{.}}*/
/* }*/
/* */
/* Text {*/
/* text: "START RUN"*/
/* font: 16 semibold*/
/* color: #fff*/
/* padding: 5 8 5 8*/
/* cornerRadius: 5*/
/* background: #70ba6c*/
/* }*/
/* }*/
/* }*/
/* Divider*/
/* }*/
/* }*/
}
}
.allImporterRuns {
name: "all-importer-instances"
title: "All ImporterRuns"
emptyResultText: "There are no ImporterRuns"
.allStartPlugins {
name: "all-plugin-instances"
title: "All StartPlugins"
emptyResultText: "There are no StartPlugins"
defaultRenderer: list
sortFields: datatype dateModified dateAccessed dateCreated
[datasource = pod] {
query: "ImporterRun"
query: "StartPlugin"
sortProperty: dateModified
sortAscending: false
}
actionButton:
addItem {
template {
_type: ImporterRunInstance
name: {{.name}}
}
}
editActionButton: toggleEditMode
filterButtons: showStarred toggleFilterPanel
}
ImporterRun > list {
StartPlugin > list {
onPress: openView {
renderer: generaleditor
}
......@@ -216,9 +163,9 @@ ImporterRun > list {
alignment: left
spacing: 10
Image {
show: {{.importer.icon or .importer.bundleImage}}
systemName: {{.importer.icon}}
bundleImage: {{.importer.bundleImage}}
show: {{.plugin.icon or .plugin.bundleImage}}
systemName: {{.plugin.icon}}
bundleImage: {{.plugin.bundleImage}}
resizable: true
color: #2480d6
width: 30
......
This diff is collapsed.
This diff is collapsed.
......@@ -416,8 +416,6 @@
"value_type": "string"
},
{
"item_type": "EmailMessage",
"property": "title",
......@@ -515,7 +513,6 @@
"value_type": "string"
},
{
"item_type": "ExercisePlan",
"property": "title",
......@@ -557,7 +554,6 @@
"value_type": "string"
},
{
"item_type": "ExercisePlan",
"property": "duration",
......@@ -706,82 +702,7 @@
"value_type": "string"
},
{
"item_type": "Importer",
"property": "name",
"value_type": "string"
},
{
"item_type": "Importer",
"property": "repository",
"value_type": "string"
},
{
"item_type": "Importer",
"property": "dataType",
"value_type": "string"
},
{
"item_type": "Importer",
"property": "icon",
"value_type": "string"
},
{
"item_type": "Importer",
"property": "bundleImage",
"value_type": "string"
},
{
"item_type": "Importer",
"property": "itemDescription",
"value_type": "string"
},
{
"item_type": "ImporterRun",
"property": "name",
"value_type": "string"
},
{
"item_type": "ImporterRun",
"property": "repository",
"value_type": "string"
},
{
"item_type": "ImporterRun",
"property": "progress",
"value_type": "double"
},
{
"item_type": "ImporterRun",
"property": "dataType",
"value_type": "string"
},
{
"item_type": "ImporterRun",
"property": "username",
"value_type": "string"
},
{
"item_type": "ImporterRun",
"property": "password",
"value_type": "string"
},
{
"item_type": "ImporterRun",
"property": "runStatus",
"value_type": "string"
},
{
"item_type": "ImporterRun",
"property": "errorMessage",
"value_type": "string"
},
{
"item_type": "ImporterRun",
"property": "progressMessage",
"value_type": "string"
},
{
"item_type": "Indexer",
"property": "name",
......@@ -1043,7 +964,6 @@
"value_type": "string"
},
{
"item_type": "Message",
"property": "subject",
......@@ -1065,8 +985,6 @@
"value_type": "string"
},
{
"item_type": "Message",
"property": "externalId",
......@@ -1089,7 +1007,6 @@
"value_type": "bool"
},
{
"item_type": "MessageChannel",
"property": "externalId",
......@@ -1210,9 +1127,6 @@
"value_type": "bool"
},
{
"item_type": "Note",
"property": "starred",
......@@ -1260,15 +1174,12 @@
"value_type": "string"
},
{
"item_type": "NoteList",
"property": "category",
"value_type": "string"
},
{
"item_type": "Organization",
"property": "name",
......@@ -1290,8 +1201,6 @@
"value_type": "string"
},
{
"item_type": "PerformingArt",
"property": "title",
......@@ -1467,7 +1376,17 @@
"property": "itemDescription",
"value_type": "string"
},
{
"item_type": "Plugin",
"property": "pluginType",
"value_type": "string"
},
{
"item_type": "Plugin",
"property": "dataType",
"value_type": "string"
},
{
"item_type": "Product",
"property": "audience",
......@@ -1519,7 +1438,6 @@
"value_type": "string"
},
{
"item_type": "ProductCode",
"property": "productCodeType",
......@@ -1587,7 +1505,6 @@
"value_type": "string"
},
{
"item_type": "Recipe",
"property": "duration",
......@@ -1599,7 +1516,6 @@
"value_type": "string"
},
{
"item_type": "Recording",
"property": "title",
......@@ -1651,8 +1567,6 @@
"value_type": "string"
},
{
"item_type": "Resource",
"property": "url",
......@@ -1793,8 +1707,6 @@
"value_type": "datetime"
},
{
"item_type": "Trip",
"property": "startTime",
......@@ -1806,7 +1718,6 @@
"value_type": "datetime"
},
{
"item_type": "Unit",
"property": "symbol",
......@@ -2062,7 +1973,6 @@
"target_type": "AuditItem"
},
{
"source_type": "VisualArt",
"edge": "audio",
......@@ -2109,7 +2019,6 @@
"target_type": "Review"
},
{
"source_type": "WrittenWork",
"edge": "audio",
......@@ -2156,8 +2065,6 @@
"target_type": "Review"
},
{
"source_type": "Audio",
"edge": "file",
......@@ -2211,9 +2118,6 @@
"target_type": "Review"
},
{
"source_type": "Country",
"edge": "flag",
......@@ -2225,7 +2129,6 @@
"target_type": "Location"
},
{
"source_type": "CreativeWork",
"edge": "audio",
......@@ -2272,16 +2175,12 @@
"target_type": "Review"
},
{
"source_type": "CryptoKey",
"edge": "owner",
"target_type": "Person"
},
{
"source_type": "Diet",
"edge": "audio",
......@@ -2339,7 +2238,6 @@
"target_type": "Product"
},
{
"source_type": "EmailMessage",
"edge": "audio",
......@@ -2386,9 +2284,6 @@
"target_type": "Review"
},
{
"source_type": "EmailMessage",
"edge": "messageChannel",
......@@ -2420,9 +2315,6 @@
"target_type": "Account"
},
{
"source_type": "Event",
"edge": "location",
......@@ -2444,7 +2336,6 @@
"target_type": "Measure"
},
{
"source_type": "ExercisePlan",
"edge": "audio",
......@@ -2491,7 +2382,6 @@
"target_type": "Review"
},
{
"source_type": "ExercisePlan",
"edge": "workload",
......@@ -2503,10 +2393,6 @@
"target_type": "Frequency"
},
{
"source_type": "File",
"edge": "resource",
......@@ -2559,11 +2445,6 @@
"target_type": "Review"
},
{
"source_type": "HowTo",
"edge": "audio",
......@@ -2610,23 +2491,6 @@
"target_type": "Review"
},
{
"source_type": "Importer",
"edge": "importerRun",
"target_type": "ImporterRun"
},
{
"source_type": "ImporterRun",
"edge": "importer",