From 40873285bc0c72e2544905492bf26e280fdcecee Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Wed, 29 May 2019 14:40:09 -0700 Subject: [PATCH 01/18] re consultations-prj #27, adds a workflow step template for adding reference numbers --- .../components/workflows/add-ref-number-step.htm | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 arches/app/templates/views/components/workflows/add-ref-number-step.htm diff --git a/arches/app/templates/views/components/workflows/add-ref-number-step.htm b/arches/app/templates/views/components/workflows/add-ref-number-step.htm new file mode 100644 index 00000000000..d523a34d67c --- /dev/null +++ b/arches/app/templates/views/components/workflows/add-ref-number-step.htm @@ -0,0 +1,13 @@ + +
+ From d4267de11121889591d5cf4154527533c7f4c79e Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Wed, 29 May 2019 15:15:51 -0700 Subject: [PATCH 02/18] re consultations-prj #27, adds a ref-number workflow step viewmodel --- .../workflows/add-ref-number-step.js | 161 ++++++++++++++++++ .../workflows/add-ref-number-step.htm | 1 + 2 files changed, 162 insertions(+) create mode 100644 arches/app/media/js/views/components/workflows/add-ref-number-step.js diff --git a/arches/app/media/js/views/components/workflows/add-ref-number-step.js b/arches/app/media/js/views/components/workflows/add-ref-number-step.js new file mode 100644 index 00000000000..4e667607add --- /dev/null +++ b/arches/app/media/js/views/components/workflows/add-ref-number-step.js @@ -0,0 +1,161 @@ +define([ + 'underscore', + 'jquery', + 'arches', + 'knockout', + 'models/graph', + 'viewmodels/card', + 'viewmodels/provisional-tile', + 'viewmodels/alert' +], function(_, $, arches, ko, GraphModel, CardViewModel, ProvisionalTileViewModel, AlertViewModel) { + function viewModel(params) { + var self = this; + var url = arches.urls.api_card + (ko.unwrap(params.resourceid) || ko.unwrap(params.graphid)); + + this.card = ko.observable(); + this.tile = ko.observable(); + this.loading = params.loading || ko.observable(false); + this.alert = params.alert || ko.observable(null); + this.resourceId = params.resourceid; + this.complete = params.complete || ko.observable(); + + this.loading(true); + + $.getJSON(url, function(data) { + var handlers = { + 'after-update': [], + 'tile-reset': [] + }; + var displayname = ko.observable(data.displayname); + var createLookup = function(list, idKey) { + return _.reduce(list, function(lookup, item) { + lookup[item[idKey]] = item; + return lookup; + }, {}); + }; + var flattenTree = function(parents, flatList) { + _.each(ko.unwrap(parents), function(parent) { + flatList.push(parent); + var childrenKey = parent.tiles ? 'tiles' : 'cards'; + flattenTree( + ko.unwrap(parent[childrenKey]), + flatList + ); + }); + return flatList; + }; + + self.reviewer = data.userisreviewer; + self.provisionalTileViewModel = new ProvisionalTileViewModel({ + tile: self.tile, + reviewer: data.userisreviewer + }); + + var graphModel = new GraphModel({ + data: { + nodes: data.nodes, + nodegroups: data.nodegroups, + edges: [] + }, + datatypes: data.datatypes + }); + + var topCards = _.filter(data.cards, function(card) { + var nodegroup = _.find(data.nodegroups, function(group) { + return group.nodegroupid === card.nodegroup_id; + }); + return !nodegroup || !nodegroup.parentnodegroup_id; + }).map(function(card) { + params.nodegroupid = params.nodegroupid || card.nodegroup_id; + return new CardViewModel({ + card: card, + graphModel: graphModel, + tile: null, + resourceId: self.resourceId, + displayname: displayname, + handlers: handlers, + cards: data.cards, + tiles: data.tiles, + provisionalTileViewModel: self.provisionalTileViewModel, + cardwidgets: data.cardwidgets, + userisreviewer: data.userisreviewer, + loading: self.loading + }); + }); + + topCards.forEach(function(topCard) { + topCard.topCards = topCards; + }); + + self.widgetLookup = createLookup( + data.widgets, + 'widgetid' + ); + self.cardComponentLookup = createLookup( + data['card_components'], + 'componentid' + ); + self.nodeLookup = createLookup( + graphModel.get('nodes')(), + 'nodeid' + ); + self.on = function(eventName, handler) { + if (handlers[eventName]) { + handlers[eventName].push(handler); + } + }; + + flattenTree(topCards, []).forEach(function(item) { + if (item.constructor.name === 'CardViewModel' && item.nodegroupid === ko.unwrap(params.nodegroupid)) { + if (ko.unwrap(params.parenttileid) && item.parent && ko.unwrap(params.parenttileid) !== item.parent.tileid) { + return; + } + self.card(item); + if (ko.unwrap(params.tileid)) { + ko.unwrap(item.tiles).forEach(function(tile) { + if (tile.tileid === ko.unwrap(params.tileid)) { + self.tile(tile); + } + }); + } else { + self.tile(item.getNewTile()); + } + } + }); + self.loading(false); + self.complete(!!ko.unwrap(params.tileid)); + }); + + self.saveTile = function(tile, callback) { + self.loading(true); + tile.save(function(response) { + self.loading(false); + self.alert( + new AlertViewModel( + 'ep-alert-red', + response.responseJSON.message[0], + response.responseJSON.message[1], + null, + function(){ return; } + ) + ); + }, function(tile) { + params.resourceid(tile.resourceinstance_id); + params.tileid(tile.tileid); + self.resourceId(tile.resourceinstance_id); + self.complete(true); + if (typeof callback === 'function') { + callback.apply(null, arguments); + } + self.loading(false); + }); + }; + } + ko.components.register('add-ref-number-step', { + viewModel: viewModel, + template: { + require: 'text!templates/views/components/workflows/add-ref-number-step.htm' + } + }); + return viewModel; +}); diff --git a/arches/app/templates/views/components/workflows/add-ref-number-step.htm b/arches/app/templates/views/components/workflows/add-ref-number-step.htm index d523a34d67c..39832508d01 100644 --- a/arches/app/templates/views/components/workflows/add-ref-number-step.htm +++ b/arches/app/templates/views/components/workflows/add-ref-number-step.htm @@ -1,4 +1,5 @@ +
We got to the Core Arches workflow step
Add Reference Number
-
We got to the Core Arches workflow step
+
Click to console card
+
Click to console tile
+
CLICK FOR DATA
+ +
+

Agency:

+
+
Identifier:
+
+ From be897d83f24523e71541ba5e05dc11e5de126715 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Wed, 5 Jun 2019 22:47:08 -0700 Subject: [PATCH 04/18] sets basic styling for consultations-prj #27 --- .DS_Store | Bin 0 -> 6148 bytes arches/.DS_Store | Bin 0 -> 6148 bytes arches/app/.DS_Store | Bin 0 -> 6148 bytes arches/app/media/.DS_Store | Bin 0 -> 6148 bytes arches/app/media/css/.DS_Store | Bin 0 -> 6148 bytes arches/app/media/css/arches.css | 9 +++- arches/app/media/css/plugins/.DS_Store | Bin 0 -> 6148 bytes arches/app/media/img/.DS_Store | Bin 0 -> 6148 bytes arches/app/media/img/icons/.DS_Store | Bin 0 -> 6148 bytes arches/app/media/img/landing/.DS_Store | Bin 0 -> 6148 bytes arches/app/media/img/sliders/.DS_Store | Bin 0 -> 6148 bytes arches/app/media/js/.DS_Store | Bin 0 -> 6148 bytes .../app/media/js/viewmodels/card-component.js | 2 + arches/app/media/js/views/.DS_Store | Bin 0 -> 6148 bytes .../workflows/add-ref-number-step.js | 40 +++++++++++--- arches/app/media/plugins/.DS_Store | Bin 0 -> 6148 bytes .../media/plugins/cube-portfolio/.DS_Store | Bin 0 -> 6148 bytes .../app/media/plugins/layer_slider/.DS_Store | Bin 0 -> 6148 bytes arches/app/media/plugins/line-icons/.DS_Store | Bin 0 -> 6148 bytes .../media/plugins/revolution-slider/.DS_Store | Bin 0 -> 6148 bytes arches/app/models/.DS_Store | Bin 0 -> 6148 bytes arches/app/templates/.DS_Store | Bin 0 -> 6148 bytes arches/app/templates/views/.DS_Store | Bin 0 -> 6148 bytes .../app/templates/views/components/.DS_Store | Bin 0 -> 6148 bytes .../workflows/add-ref-number-step.htm | 49 ++++++++++-------- arches/app/templates/views/graph/.DS_Store | Bin 0 -> 6148 bytes arches/app/templates/views/rdm/.DS_Store | Bin 0 -> 6148 bytes arches/app/templates/views/resource/.DS_Store | Bin 0 -> 6148 bytes arches/app/utils/.DS_Store | Bin 0 -> 6148 bytes arches/app/utils/data_management/.DS_Store | Bin 0 -> 6148 bytes .../utils/data_management/resources/.DS_Store | Bin 0 -> 6148 bytes arches/db/.DS_Store | Bin 0 -> 6148 bytes arches/db/graphs/.DS_Store | Bin 0 -> 6148 bytes arches/db/ontologies/.DS_Store | Bin 0 -> 6148 bytes arches/install/.DS_Store | Bin 0 -> 6148 bytes arches/install/arches-templates/.DS_Store | Bin 0 -> 6148 bytes .../arches-templates/project_name/.DS_Store | Bin 0 -> 6148 bytes .../project_name/management/.DS_Store | Bin 0 -> 6148 bytes .../project_name/media/.DS_Store | Bin 0 -> 6148 bytes .../project_name/templates/.DS_Store | Bin 0 -> 6148 bytes arches/management/.DS_Store | Bin 0 -> 6148 bytes arches/management/commands/.DS_Store | Bin 0 -> 6148 bytes cypress/.DS_Store | Bin 0 -> 6148 bytes tests/.DS_Store | Bin 0 -> 6148 bytes tests/fixtures/.DS_Store | Bin 0 -> 6148 bytes tests/fixtures/data/.DS_Store | Bin 0 -> 6148 bytes tests/fixtures/data/csv/.DS_Store | Bin 0 -> 6148 bytes tests/fixtures/data/json/.DS_Store | Bin 0 -> 6148 bytes tests/fixtures/v3migration-pkg/.DS_Store | Bin 0 -> 6148 bytes .../v3migration-pkg/business_data/.DS_Store | Bin 0 -> 6148 bytes .../v3migration-pkg/extensions/.DS_Store | Bin 0 -> 6148 bytes .../fixtures/v3migration-pkg/graphs/.DS_Store | Bin 0 -> 6148 bytes .../v3migration-pkg/map_layers/.DS_Store | Bin 0 -> 6148 bytes .../map_layers/mapbox_spec_json/.DS_Store | Bin 0 -> 6148 bytes .../map_layers/tile_server/.DS_Store | Bin 0 -> 6148 bytes .../v3migration-pkg/reference_data/.DS_Store | Bin 0 -> 6148 bytes .../fixtures/v3migration-pkg/v3data/.DS_Store | Bin 0 -> 6148 bytes tests/ui/.DS_Store | Bin 0 -> 6148 bytes virtualenv/.DS_Store | Bin 0 -> 6148 bytes 59 files changed, 71 insertions(+), 29 deletions(-) create mode 100644 .DS_Store create mode 100644 arches/.DS_Store create mode 100644 arches/app/.DS_Store create mode 100644 arches/app/media/.DS_Store create mode 100644 arches/app/media/css/.DS_Store create mode 100644 arches/app/media/css/plugins/.DS_Store create mode 100644 arches/app/media/img/.DS_Store create mode 100644 arches/app/media/img/icons/.DS_Store create mode 100644 arches/app/media/img/landing/.DS_Store create mode 100644 arches/app/media/img/sliders/.DS_Store create mode 100644 arches/app/media/js/.DS_Store create mode 100644 arches/app/media/js/views/.DS_Store create mode 100644 arches/app/media/plugins/.DS_Store create mode 100644 arches/app/media/plugins/cube-portfolio/.DS_Store create mode 100644 arches/app/media/plugins/layer_slider/.DS_Store create mode 100644 arches/app/media/plugins/line-icons/.DS_Store create mode 100644 arches/app/media/plugins/revolution-slider/.DS_Store create mode 100644 arches/app/models/.DS_Store create mode 100644 arches/app/templates/.DS_Store create mode 100644 arches/app/templates/views/.DS_Store create mode 100644 arches/app/templates/views/components/.DS_Store create mode 100644 arches/app/templates/views/graph/.DS_Store create mode 100644 arches/app/templates/views/rdm/.DS_Store create mode 100644 arches/app/templates/views/resource/.DS_Store create mode 100644 arches/app/utils/.DS_Store create mode 100644 arches/app/utils/data_management/.DS_Store create mode 100644 arches/app/utils/data_management/resources/.DS_Store create mode 100644 arches/db/.DS_Store create mode 100644 arches/db/graphs/.DS_Store create mode 100644 arches/db/ontologies/.DS_Store create mode 100644 arches/install/.DS_Store create mode 100644 arches/install/arches-templates/.DS_Store create mode 100644 arches/install/arches-templates/project_name/.DS_Store create mode 100644 arches/install/arches-templates/project_name/management/.DS_Store create mode 100644 arches/install/arches-templates/project_name/media/.DS_Store create mode 100644 arches/install/arches-templates/project_name/templates/.DS_Store create mode 100644 arches/management/.DS_Store create mode 100644 arches/management/commands/.DS_Store create mode 100644 cypress/.DS_Store create mode 100644 tests/.DS_Store create mode 100644 tests/fixtures/.DS_Store create mode 100644 tests/fixtures/data/.DS_Store create mode 100644 tests/fixtures/data/csv/.DS_Store create mode 100644 tests/fixtures/data/json/.DS_Store create mode 100644 tests/fixtures/v3migration-pkg/.DS_Store create mode 100644 tests/fixtures/v3migration-pkg/business_data/.DS_Store create mode 100644 tests/fixtures/v3migration-pkg/extensions/.DS_Store create mode 100644 tests/fixtures/v3migration-pkg/graphs/.DS_Store create mode 100644 tests/fixtures/v3migration-pkg/map_layers/.DS_Store create mode 100644 tests/fixtures/v3migration-pkg/map_layers/mapbox_spec_json/.DS_Store create mode 100644 tests/fixtures/v3migration-pkg/map_layers/tile_server/.DS_Store create mode 100644 tests/fixtures/v3migration-pkg/reference_data/.DS_Store create mode 100644 tests/fixtures/v3migration-pkg/v3data/.DS_Store create mode 100644 tests/ui/.DS_Store create mode 100644 virtualenv/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c914e5e6541aabd4a1ea67827cfc1d47731953fd GIT binary patch literal 6148 zcmeHKOHRW;41H7D5n(in5uJD329#OWBdV~dPItt`%^D)zY;+^T4y8CjBk)x#hm9DBCbI$A~ zoh#hqEzWAD-Mh6UrWEs>iT9i%e29s<^E#el%R8)St{Ek zT8yCKw5PT%Gi($!9Ko88U^@rvP(s|D`O~-@Ayahi3^)T_29ES{BK80F=l;JNNIik>>%7mC1Hj1=R{EtAS L!Id-crwn`nM=MK5 literal 0 HcmV?d00001 diff --git a/arches/.DS_Store b/arches/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..032dae8eda8a427380c051ab981ccb637616c9f7 GIT binary patch literal 6148 zcmeHKOHRWu5Pd@!9Xw& z3!K=+5lp;$X+!?Ja7D))S1MRO7A+Dm9oa;zP*Aw3lF z7C}5!yu}bpr$2dI?U)TM9pW8^_><4giGP6zo zG$mHSKrryn7?5i7yjk<3{A~U4d3x3+ju#FUjmxS~s822dT);>J`-u)fMWo{|YUY1&&PkG>piYzhcyZ5wabn zakx&W8~BlKi8n4?;eEWy9J%&AIRnmsGvEx&g8{zTBI_$d@0|f>z!^9*AooLL6U-C# zhI)0d(-MHVpjw4vsU;*PCd?D|hO|(Eg%T|^q!J@oIQ234Qc`Qs3uIRnnXKVu*)c6Yli50&25U&oWTHnQEb siHKh>0}98Zp8!te9=TSd*`ti>#bL}Jq=%XbBC5LM*_T%gdRst_nr)O~hbyWlMP*C&B(^7? zS;R2_S)Fzdz!E@1SH!o5scBt(VzbEH5Jj)C?Ou+@PP6kUT?FOMu|@p()CLvaxh0TB=Z5%@0z*t6YM7frQ_fCz}d7Xg1i6uN6o z9h=6hgG-D6)Q;gWUdJp!EgqoO)UhceG;5{QR%$t7SSx3|WL`}jo3?UT4j+~$TTUnz zr}O?L(qXl!RuK?^DFL6oX>0HQ*Yt(?-*aRlAOe4sfOXrO?S>DRy><4O-fIi}mi}qX ojdU*2imB0x`NLcB<+r@z*W9nEW78;SJj$v15O6Ls5%>)PAC|2jdH?_b literal 0 HcmV?d00001 diff --git a/arches/app/media/css/arches.css b/arches/app/media/css/arches.css index 88db7f4e07e..8c15482d040 100644 --- a/arches/app/media/css/arches.css +++ b/arches/app/media/css/arches.css @@ -442,10 +442,15 @@ input[type="checkbox"] { background-color: white; } -.workflow-step-icon { - border-radius: 50%; +.workflowstep-nav.workflow-step-icon { display: block; margin: 0 auto; +} + +.workflow-step-icon { + border-radius: 50%; + /* display: block; + margin: 0 auto; */ height: 56px; line-height: 56px; text-align: center; diff --git a/arches/app/media/css/plugins/.DS_Store b/arches/app/media/css/plugins/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1da97fe816bf4d5c62e97b0d6f9683cb384f3664 GIT binary patch literal 6148 zcmeHKyH3ME5S)b+kpL-W%KL#7{J|+ozJMRd!$A}gmPkVFF2Bv}1LVkxl!^j&t=;jh zckbjVyj}n@KQ+(51i+ZCh_i;F>2vjg-9<)GY>x&rY;eMn*KMZUCvrZp#yk4_mg_@v z*zPxNyVuPg@rD+k*s*xV_{wXCEsp)7+fL1@R3H^d1yX@j;QuPXo~<^1aLkwrqynkH zj{^FAD0Iad*g4v#gTY1s;)rQ8-rFoeESezJz|N5wnmCo{REZHooX&iSx*FIyIvrvs zbDua_VnPu+o%v$rkm{H*6-Wgx6}b21MEn1eer5i@B;_gEarTr=&gg7 w(_UNXEBd#w*2)>I6%(x$bD^zx+N&#i&*wF;b2K{hMknTvfa;Q#3jBrwUuVM|-v9sr literal 0 HcmV?d00001 diff --git a/arches/app/media/img/.DS_Store b/arches/app/media/img/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4ed92f36d2cba57aa534140b5a1e09fd38cd62eb GIT binary patch literal 6148 zcmeHKOHRWu5PhaW1XV&^vh)R5aD%8SC*T4kO;jqAljssvQu`7WN^J3lY5jfO zZ`-QtS}8l{hGc6ed{Q3KOpO^{(V)d?s=UUYDaAKQbVI)~@Uy4fO(PaK(3B*(QxzWY z!8HcXDn^w|-TqG7Q?+N64eLx+%ox{;db-vn{uEY|F<=ZB1IECa7~q{PEng~{GzN?T zW8jAYIUhW`U=eXt3`Yk=cmfbJszc*g-VzeyBNh=yMOxULh7vW@#V3Z-aO!>ZD{cM9j;I`X$%+xDFX|guH^oI;$LR=k)MXx%os2R{uu)<+dOa9 z+*G_<|7=h0TF?H%E=~MK8L)Ajd<1YJ=g569s@=<&enrGlQL>0WgcI#UAP{207&rq1 EU%T5yO#lD@ literal 0 HcmV?d00001 diff --git a/arches/app/media/img/icons/.DS_Store b/arches/app/media/img/icons/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0d0411424a8044cd39848a416b35afcc55543396 GIT binary patch literal 6148 zcmeH~K~BR!3`M`8RF&9t$#Sm14MtTt0T%$;f{-EwDe68uuFbc{RH>qDS)gyp^HYyK zqr6321F+rs_y}wPZ0N4|_GNCq?>@7ejNDQ!&KQovp?mB5ZkD?g@Y*}Pqr)pca8?icvMDhe;)14#&?i3lRlU&Xt48Z)+q5}hCw4H}=kv+MQj z>ZUlK&CHkYyIZq`nGJBFeQ=l>_vsUxRfOm~V|zI485``Swk`s>GuztJ?)b1jnb)rToAO)nrw*ve=G&r#rj*0Qo=Fv+48w0>zI3^+j^P~ck>eXU+(h+Z!*9*tQq?^ahIHzv*>QFpxN4!P4c~8_R z1*E{a0#~_Qu>Rk{f9U_uNm@w(De$ip@cHU~wZtn`ZJoRvYi)zC;mrAj(=ZPThA79t iD92c^9N$Dz<~7c--wVgYpd%i1pne9Zi%bgqwE|zUpctG0 literal 0 HcmV?d00001 diff --git a/arches/app/media/img/sliders/.DS_Store b/arches/app/media/img/sliders/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f064ceec0b4cc288758adb51a26e32082e6e6c98 GIT binary patch literal 6148 zcmeHKJ8r^I5ZnbKq0mrLzANMgPl%i#7YKLgzsE`5fp=eJDu7n%D>Wrvt@T0N@O54_x~$0W8)4*2F##9fXDy7*fp@Lqm>!NnTCt14AyF z%ZKKZH8&LXr{n&`>7q4|l@8E>O9yQCMl5aqKO%qG|Bb_-19ae@I-s-7(`JpA%h@`5 xO`Ej^`HcJyaGj3gqZsI;7(Z+juLitg*Ep|*2~uiDnm zFvAO4n%3C*!Ft0L_Ehd@+~aL%n&L>+=4-??-l<&U#%uXK*Q<(`s(WFQ$x z2L3Jse6v-m8^`REfn*>VI5D92Lt#^_13O2%I@nnWK%7u*!m-v88dC!6z|N5tig+l| zLnTTK@o?%(_|<`(qlZJH_>fq+FJ8n}XZ~XDklHc(WFQ$BGH~hBxxWAR{A5Op{9#DW zl7VF4pD`el<->BpL&e+r?Rfgu7Pdz=74_?MK;d}s6TpeyBe!OBd(kod>cGxXv#8#} PiTNX7gk+Zt`~m}?YPB;* literal 0 HcmV?d00001 diff --git a/arches/app/media/js/viewmodels/card-component.js b/arches/app/media/js/viewmodels/card-component.js index 5aa3fdc6117..469e1be5d00 100644 --- a/arches/app/media/js/viewmodels/card-component.js +++ b/arches/app/media/js/viewmodels/card-component.js @@ -29,6 +29,8 @@ define([ this.tile = this.card.newTile; } this.form = params.form; + console.log("in card component, now form.tile()..."); + // console.log(self.form.tile()); this.provisionalTileViewModel = params.provisionalTileViewModel; this.reviewer = params.reviewer; this.expanded = ko.observable(true); diff --git a/arches/app/media/js/views/.DS_Store b/arches/app/media/js/views/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c7a667281f635033116ba821000678f41bdd6932 GIT binary patch literal 6148 zcmeHKOHRWu5PhblieS?X5=&ozMQ>nLX8(fH5$C2KZ)6D{d8SGzN?TW8lJo+z*~zFl6i% z)78Ntl>o#g)u~aIT0&xc#*ndBq=n6CC{aUQE-{>jQ}451$k;1tI9x71TweL7cyVcU z=J&}RE-2b)3>X7r1{OM9%lrSxPiC^nABWh?7%&F@83S&)d)jSzsQkA6I-b0>p8c6! rn)vl1uu&fU1aKnv$bB-Z-HS}Wkg->kETT{0MEem)gxFvV`~d^s*hn_$ literal 0 HcmV?d00001 diff --git a/arches/app/media/js/views/components/workflows/add-ref-number-step.js b/arches/app/media/js/views/components/workflows/add-ref-number-step.js index 258d4b9f079..2a1d972b988 100644 --- a/arches/app/media/js/views/components/workflows/add-ref-number-step.js +++ b/arches/app/media/js/views/components/workflows/add-ref-number-step.js @@ -5,6 +5,7 @@ define([ 'knockout', 'models/graph', 'viewmodels/card', + // 'viewmodels/card-component', 'viewmodels/provisional-tile', 'viewmodels/alert' ], function(_, $, arches, ko, GraphModel, CardViewModel, ProvisionalTileViewModel, AlertViewModel) { @@ -14,11 +15,14 @@ define([ this.card = ko.observable(); this.tile = ko.observable(); - this.tiles = ko.observableArray([]); + // this.tiles = ko.observableArray([]); this.loading = params.loading || ko.observable(false); this.alert = params.alert || ko.observable(null); this.resourceId = params.resourceid; this.complete = params.complete || ko.observable(); + this.agencyName = ko.computed({ + // + }); this.loading(true); @@ -128,8 +132,19 @@ define([ }); self.saveTile = function(tile, callback) { - self.loading(true); - tile.save(function(response) { + // console.log("params passed to saveTile"); + // console.log(params); + // console.log("tile ?"); + // console.log(tile); + console.log("self.card ?"); + console.log(self.card()); + console.log("self.card.selected ?"); + console.log(self.card().selected()); + console.log("self.card.tiles ?"); + console.log(self.card().tiles()); + + self.loading(true); + tile.save(function(response) { //onFail, onSuccess self.loading(false); self.alert( new AlertViewModel( @@ -140,9 +155,15 @@ define([ function(){ return; } ) ); - }, function(tile) { - self.tiles.push(tile); - console.log(params); + }, function(tile) { //onSuccess + // console.log(params); + + // self.tiles.push(tile); + self.card().tiles().push(tile); + console.log(self.card().tiles()); + // console.log(params); + // console.log("params in saveTile else {}:") + // console.log(params); params.resourceid(tile.resourceinstance_id); params.tileid(tile.tileid); self.resourceId(tile.resourceinstance_id); @@ -150,7 +171,14 @@ define([ if (typeof callback === 'function') { callback.apply(null, arguments); } + // console.log("here's the tile"); + // console.log(tile); + // self.tile.reset(); self.loading(false); + + // console.log("pre-reset"); + // console.log(self.tile()); + // console.log(self.tile()._tileData()); }); }; } diff --git a/arches/app/media/plugins/.DS_Store b/arches/app/media/plugins/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..28699a500ad314b988b679110ee57a9d7c33efee GIT binary patch literal 6148 zcmeHK%Sr<=6g|-{ii*^o%ltqW{=rb{7x)2cI~58;Bb`=oH=pjg4`l|&tyH-el9Sw5 zG6yEf1&|iU`VN=@n6e2b8H|XiM@?t$JRv5{F~=(k_Bh~WB+)6VWbfBlg|q09WI ze5c4->?s%s27-ZL;4d@4J6mLWX&8Ml5DWwZUku3kkl6$)$IeiX4t81s5ak)I!m-p6 z5|bS($Ig%zO0rO*g(fdCl7&;B-LG=&3@seVi;v_he-+hLT0}8cvLdfD#g2Fz^cud;r%gFU|k} literal 0 HcmV?d00001 diff --git a/arches/app/media/plugins/cube-portfolio/.DS_Store b/arches/app/media/plugins/cube-portfolio/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..06096595da585d1d6b97c6322cb077b40204b610 GIT binary patch literal 6148 zcmeHK%WA_w3>-B%1WF*s9`_ge2TMr5pg)j@8z{JOX_~ul{q2k%Eee%;<{v(q(LVu0FE6h$xEP@s183_{5%gn`!PGJDjk^3x@eEUePtj zUAyhNRxg{Q;k8PABlW;C8#+li3~9I3O;#$93Zw$5Kq~NG6=2U+o83F+nhK->slbl{ z`h6&L#TwW<+NXnyjR3?c!)AQ8S%O$JK&*kiBO^5NRHCO!j2PnSjF;fmz~0f*Ay%39 zL}iHyMXWmG#psagm}@GK3S25M@$EwU{}cVn{C}C0yHp?*_)`kVboIPi@|B{uj$TfC vZK1E}-$t&{xmYVES}W#8Tk*qySM-_ZHL!QIbjB^6m_GulOIj-M8w#8Ot+pQ^ literal 0 HcmV?d00001 diff --git a/arches/app/media/plugins/layer_slider/.DS_Store b/arches/app/media/plugins/layer_slider/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..37024914c060533b47b24076230dddc2f1ac4ab2 GIT binary patch literal 6148 zcmeHKyJ`bL3>^7|A&twF`wRYq#W)`j@&h4u3O}&Hhl_OA<+n3>B;0WXcPU~Cq`B2< zZn-H=D*&>(ZkNCUz?`m#PYpxUef5EjA~PY1zGHKIJD-o5oyFEoQ0^ETG-$R>m%qm| zu6V}ZflWoCT>sDv%1K0;#~AD!`ttHh*x;m;AvM`mc^RH9QQMhtN}^CjwPVC(2~NDLnmCreBy zVyE-{#mXVoF=Hx_3iK5i`*NZE|B3#~{NE?#Diuft{*?kUS--4T{G{lugOAf*Tj;O! qZ)2^MGgvDoS}W#4Tk&J3uIMxOYhdeWbmomt%!`2Pl9memg#urPQ6YQ) literal 0 HcmV?d00001 diff --git a/arches/app/media/plugins/line-icons/.DS_Store b/arches/app/media/plugins/line-icons/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9cece3944ce42846b18a2667737eb7dabc6f9943 GIT binary patch literal 6148 zcmeH~JqiLr422VaK(Mj2oW=uqgF*BJUO-f=#4Xf*j_%73f~&QNyg>41GKsQZv9l2o zUEPmMk(r20;HI*$&@;t;EGOyYA~(4nuZQ!#>&{*^$Xcs`<2PQ<^O!;cBtQZrKmsK2 zLj>&JhE1lSj3ht;B=96)?}q|6t*I^4UmXZO0zgMdyJ79K1hiNJT2osnGBAx+Xtb)2 zA(r=cXvw;o+CrmUG=~q(e^#4fU>fbB1sj-F7X}g_fgXWj>}PiWZ{VNi|6U8XBtQax zMnFgF?RtfW%DeUL@hrc~tgRay>g5P89|73dRXm5g;k?)aT2osnGBAD!I0gn1_$q-1 D9xM}~ literal 0 HcmV?d00001 diff --git a/arches/app/media/plugins/revolution-slider/.DS_Store b/arches/app/media/plugins/revolution-slider/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..24bf0428d9fe21d9920ad9d6cb7dfc7fc6f27b72 GIT binary patch literal 6148 zcmeHK%Sr=55Ukc5B3^RLaelyqe=vmP3;Y4mfC!5bL+*R>yZp3NKM=zv7r~2ELwC*e zcI_~A*xm+UtHbslSOA#Q9r5X5YX01PVpo+hBAxFTaKH;*@wVMhs?R5!dxH<`afkPx z{O93mw;Rrrl$8QfKnh3!DIf)Yt$_Dl+WaC5X)v#9lZiGDEYZ5|e5*Vp!6dZ&lX|$Hb(=YWT1^*=j?0&UZZE11}ixhTWw4bi%n;cqQu@??3sQ z-P87Q7`CTr%1Qw#AO)m=6p#YHRKR;LZGN4oC*bB$R_;fJD2tb@M z9maLc62#^SVlNyMnW0%yiAl8@F)ZoKx2o%fV`9=_HGEi|Y&D@+oX+>RD2Me#MJXT! zjup7f?ZW&2E&a^=e@xO&3P^!}rGU-Wck30eRK0a_Iq$WNeoyzB1Ko}5pfE%`CPq8v g#@q2Sin6Zxn$LUTm>6{CgHF`Xfa@ZY0)MT*7aTqnwEzGB literal 0 HcmV?d00001 diff --git a/arches/app/templates/.DS_Store b/arches/app/templates/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6dd7c4e178a147c0feaa51baeb97ad818570992f GIT binary patch literal 6148 zcmeHKOHRWu5Pbt_R0$Scvh)?WK~%LT-~zO?f=HpM8YtTwoj0BVB_eB7(75uv@%(H* zsdfxNmhZcJU;$vxt|+QZG&N7Ut~|ITO0LoDx~FE_w#`JD%QWfQXV~Kv8`K!BzohxZ zU(4PNH&)<G_<=7kMqk|$p0f+_7xlz}*gytm2%CR@3 zhfOS%XsO~)46$_DlgCw#y`iN;{P7_^^Vj1=^6adiayXgdr17ilRZMe|;f6c$l zr57A;mIJ+Xy`~K^qsnyw;Rrp0p7c7%Bi86 z-p~&FS9E!`YnqCazMvOOwQ%XC<~@whhY%cN%kD~#B*{6 zoB?Oxw;4dqW=U=oy>$kh0cT)ffWHqB%9t7Uit_0|BUb?63T6@X`7XgR(J(XY6)^(| z8Vc0VU{{Qw;jl;Z%M5!(4X0q2k6CAc!l0(iYLc5YZ_O55+ zj1)TyKvw7G5m*A4vnh%WMoitKp_{z8B1+0}Y>wORHO6iv%`{!Q_d9H{!6zCN`(Mzp z!6~&X4rqtr9nSb5_k=e@jt1;K8Ij@0JT21~;fe`6^7rHpm=!K`HVm~)U9c7mMW%Yk zj_k-;5uT>RzAIP26>tSyfr%-=J6mmjZ|J=%;0m|`KMLsi5ZDy!jJ;txI@qNWfH|s% zfl`56n=bYKf8r-ITI81$pSc3Az&}$!X6xtmiZ7M#)?crucWq#MVN=s}y$)y`7e4`< h=sEI`f))=t=DIp#Z>U++pXfyY5lDh~=L-CR0$Add Reference Number -
Click to console card
Click to console tile
-
-
CLICK FOR DATA
- -
-

Agency:

-
-
Identifier:
-
+
+ +
+

Add Reference Number

+
+
+
+ +
+
+

Agency:

+
+
Identifier:
+
+
+ +
- +
diff --git a/arches/app/templates/views/graph/.DS_Store b/arches/app/templates/views/graph/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..88dfe0da45c01ebca49c9760918550653ef96442 GIT binary patch literal 6148 zcmeHKK~BRk5S)b~RRW=?CyxFA2YwJ$f2siAY%SAs!)QZ+P#_feP(bg8#Hv_2 zc82-tV3Sh-;)Ld0*w3p3{6x-u(7n9D|mxJ^aNhO&z37&i2YWc%cJ@7L6Fr(u#p!?-b^NMmVL!$ zBOG@qz9l!`dkb-j0FZj{24G^XjI_W3OoSgO%;~_ literal 0 HcmV?d00001 diff --git a/arches/app/templates/views/resource/.DS_Store b/arches/app/templates/views/resource/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1bc6e7d85955a0ed87a618eee2a8df282b33b569 GIT binary patch literal 6148 zcmeHKF-`+P3>-s*BGH77az8-94^~ll0UrQz6i6qXlq3Ch`8H#FL4*qh4F!xPdv<5- z+uRiA7=W$!-7T;Ju%tWU;9+il?mn}##yDC$W5BK(xBb&F^t0^Kgx6l+8695miZAt7 z*zu^xBab}gCiWxK_FQerjX%8Z^p6lL1*Cu!kOETRA1T0|?Y6v3RFnczKni>);NOQr zcdQMk#Q1bD#0WrKkPhQIW(i_(f>;|)iDYP&rNk_?Hey(olP@i=Hk=Z(92Ph8Iqha^ z6N<&{CV>exStv?4Nx8_KsWQ?q;Xi9KXQfpFA#l@D3VC;WYqeK}yMT!2w3Kn17(6`%rC;3fsE_rm6nfn2Eo6`%sY3fT9dzzu8S80eo4 zEItAN8-(4k_gMm1EC8&DV;~|h4Jt6Gnj?k=9r2QRHE|3Kx@Zm`nori8P}HA}`o+^l zYamxDKn2bfn8mTR{{IZWGXI~Gc%lMS;9n`AP508R@JiWRCogBcw!q)umh%HQ!`>-a myd49*9phl_ca;(5S$@6*vK%iWg`A literal 0 HcmV?d00001 diff --git a/arches/app/utils/data_management/.DS_Store b/arches/app/utils/data_management/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..cfac782ba1731b1524c2736d0647b5b0ff51d06e GIT binary patch literal 6148 zcmeHKOHRWu5PgO&f>@9xOJ9K-L{&Kf2jJ5nK&nWZP}V*=Z$3dp%^FqJjAXyD=M(!$ zu{{9N`q171HGqmuFp07tGQDWJaOV{(!B~GBKHJX6YF>V2>TM^wc_h;{z?T4)a{6$W^Q< z7zhS}fneY~7~q{PQe7KH9}ENo!N4yAaz11>!N#!|>e0bYO8}xgqgAL&Eg>=4v2iSh zv`~_T5-l`&iIFUv^V$6x$6{#VNM3v-|MFD4B>g(`XLUzv45JSQf`K^$mo}{B{=erh zvsmQMLt+#R1OsQrKw51cHfwIm@7AO3$z7Y-p4ddhuZTjSK6?akAm_-f8qJ-rwBBe>0a({t8SViFr@&iDkR6!>Z=&$0t_%y~3A)*TvN`uCdJ-a^7 zt#*p@8GxEeL3OWI~*|J6)!*e z!|^gfSt%d|q<|EV0#e{l3V83O%@>J^Qa}nwfo}!;`_Sl)y>Lv7PX|Mc0K^&7VO+;7 zL2RBN_QEld8JZ=Pm{h9~!;;Q?tGZq|CMF$L!-v($RuhWF>3n~Sa#&APlmb%VT!Gu% zF1`Oh(0`f#&q>-z0V(jW6tLN5yIJ!})mtZ*^IqHNk94p3q`Pq)6ozQW#AwIdcspK2 cQPwqI^LZ~E6NAot(24pPa9w0l;Mxj&0l|nBq5uE@ literal 0 HcmV?d00001 diff --git a/arches/db/.DS_Store b/arches/db/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6fa43bf8019e018cf1815ac6950b86d3f82e77e3 GIT binary patch literal 6148 zcmeHKOK!q25PdGFpmtFfU3BRy^ac^4C+GoaOCpMt64ZnRyBxi5JVS+P)(BN&$@3=j z^W-7y7(kfs%V%H)V9F^NL>U-j9(3JU@Prto#;X2knp&*4=DK>2-bX0$g}Q7{`(NW5 z@7UoJ?Wtpe4Yp{}(OKs?k1Vo*=5^E>1}-Ugs8X$?Evt8z!aB;DbIr8se8Cngc2TkV znd^al98xdhTvDspmn^eorEHn2{~f$RXTTY72AqM*F~Boh#`Ip%r8D3RI0L^7$o>#H z1q;JoF>M_b=?Xv`)0_r%xl2e+G%O5zMS3`brV=$Z*cBsaI_=To3d3Ge(-G|Q5p3n- z-bU38(PKx4@}Ua!5@ zPH{d1D4XMO53B)nR6~5(vJ^WvUC32>42$2<;|;Gk42OQdh`#Kw+zvZ@;sqa=(*QcI2)CDQ4y8P^i0z(_~&%Dg8l zmz+?FSEs*vI7$oDDh9;BIRn?RU0eTup#C!dpC@T22E@R>VxX+HkJ}BOl)ZKFIP0~Q t`b<3uV?CUUw_>8VVs5Mz-_7Ex**tHFQ=q5Q@99MS2pBICG4K}*d;=}$9%cXl literal 0 HcmV?d00001 diff --git a/arches/db/ontologies/.DS_Store b/arches/db/ontologies/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..45479fb9ef73e53856e771c971ae390220a74e1d GIT binary patch literal 6148 zcmeHKJ8Hu~5S?*U*rZXJaHQ^ z_E`d0ECH;EQy?-h4Jt6Gnj?k=9r==VHE{|Ix@Zm`nkQ>cDC(!<{l&{gYak;PpaOFR z9%9>C|3AThnE&S_?x+A2_*V*Ob9_D?aHZ_6i_2NBE$~;k)!g7_SUUy5+cD7FF*eqY epS&pQimmayCQgA)N8af`{tTEdG%E1d3fut{9TjH) literal 0 HcmV?d00001 diff --git a/arches/install/.DS_Store b/arches/install/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..834bfb8125306904af03c27a7f1f1b4ffea46c5d GIT binary patch literal 6148 zcmeHKyH3ME5S)V)5i~9-?*}OO11kz&zz6V1B7t-eghTI+-)8m!Bywme(5$pOzP+70 zc?z!=Kv}%6uYeA~oNkB@3sbXw^NF2g#<2Jq8w|L_4jVjAs*fj(+uSmBYpAO0&E z^LEy-9#-vPyKQ#F84I6qOMhYUjwKCkzu@>i%1Qw#AO)m=6p#X;0DHFC{5()m3P=Gd z@U4J-A1d9jPaFgN)4|{)0CC2&8=rlaAXZBd`@}Jj8CnS{F{mX+j1qL_Yu5FNV_?ux z{AQk$HzB^>UOxP*DmPNtIkx7BSP~a0&86Iu` literal 0 HcmV?d00001 diff --git a/arches/install/arches-templates/.DS_Store b/arches/install/arches-templates/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..199877981542009d0bf03a8469e536a5430370a3 GIT binary patch literal 6148 zcmeHKIZgvX5Ud6VmLPCQIA7ogBg?#i2XNRzc3mycdp%L1#YbMEwl7E;1?b*9v?A<|P(Q literal 0 HcmV?d00001 diff --git a/arches/install/arches-templates/project_name/.DS_Store b/arches/install/arches-templates/project_name/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5d60b391ac41d99bf056231c213abfa11fb01ba7 GIT binary patch literal 6148 zcmeHK!A`?441IwjRyeRD$Na+npqj=P@BuK^F(GyBq;^8w`sqA7W?P}>X+n)QuWTF1S23KcFRrEi*~f z3$-tCKG@Q!)|HQw{=p%m^;v;9k8Te-mglzG= zm~&HhxBl6l+_jPNN|7dhy(nzd2Oj|($T{+;lW9JRPQSviPbjO1UBij~A)thK=M0>I Ffp6=1MD+jw literal 0 HcmV?d00001 diff --git a/arches/install/arches-templates/project_name/management/.DS_Store b/arches/install/arches-templates/project_name/management/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d6d56cf25c633dbbd4e32d8cc0f60e7970894fdf GIT binary patch literal 6148 zcmeHKJ5Iw;5S%3`EYYN-d{^KGPf<8QE&#+O;3A@T#kn{dvmYTMI}!~InzeT4z4gws zJcZW_!1nLsJ+K2X&>ivNVQGHfePK71F(RF3JmC!^&g1#?vZ!89ICsDa6JB}!;6G2( zZ_ijiSy?F{1*Cu!kOER*O#$z{wBa^UQ3^-_De$d;e;*p%u@}yX@#$cQ5rDX5I*jX> zC5X)v#9lZjGDEYZ5|e5*Vp!6dZ&lX|=ftGLYWT2vvekrQ@pPWwq8!!}6{Ua_xKv=1 z+nx9S2l|!y|B|Gg6p#Y{N&(v*j)y&8se0?;<-FH6`Xk+IKIv{;2ZbTpF)`XPH{Oo# dqA2T{uX(>0&WS;1KIlaK47e^bDe%_{d;tyE6@~x+ literal 0 HcmV?d00001 diff --git a/arches/install/arches-templates/project_name/media/.DS_Store b/arches/install/arches-templates/project_name/media/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f4636617fb7770a57452b94eb231413725f2f010 GIT binary patch literal 6148 zcmeH~JqiLr422WjLa^D=avBfd4F=H@cmYu>S+EfMIl3=Dh_2Qm@&d`rWF{>86+0Ud z(e>@L66r-`1~-+Zg^?-N6FJNEbUhA-%Vl`lpJZ-l;Ju9YpN=vm0TLhq5+DH*_z?nj zZ^LHuP(~6U0TOr+uYok-9|52p%5KPgmVg#3Kx=9XMFpnO3XN9vF~sWL z4lQ}Ernb;%7tP^A^T}#c3{0b4v|s_#>cT(*BrqZ{jdgGL{}%pf{vWk)NdhGBX9Tp{ z>^5t>RNk#`uV?jrRxNLEs2@jo`3bq+X#TU>6a&*}7cJPpw7M{m010#m^kYA<`+o)hH2-&6xFrD+ z_%i}JSgw}~JXGGTZ;xmBO=fM~;7~6|c=-sx#;)Qi+zsc&7SNj7LXm;-L%=aGkib_7 FJOF)`6QuwE literal 0 HcmV?d00001 diff --git a/arches/management/.DS_Store b/arches/management/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d6d56cf25c633dbbd4e32d8cc0f60e7970894fdf GIT binary patch literal 6148 zcmeHKJ5Iw;5S%3`EYYN-d{^KGPf<8QE&#+O;3A@T#kn{dvmYTMI}!~InzeT4z4gws zJcZW_!1nLsJ+K2X&>ivNVQGHfePK71F(RF3JmC!^&g1#?vZ!89ICsDa6JB}!;6G2( zZ_ijiSy?F{1*Cu!kOER*O#$z{wBa^UQ3^-_De$d;e;*p%u@}yX@#$cQ5rDX5I*jX> zC5X)v#9lZjGDEYZ5|e5*Vp!6dZ&lX|=ftGLYWT2vvekrQ@pPWwq8!!}6{Ua_xKv=1 z+nx9S2l|!y|B|Gg6p#Y{N&(v*j)y&8se0?;<-FH6`Xk+IKIv{;2ZbTpF)`XPH{Oo# dqA2T{uX(>0&WS;1KIlaK47e^bDe%_{d;tyE6@~x+ literal 0 HcmV?d00001 diff --git a/arches/management/commands/.DS_Store b/arches/management/commands/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b7a408845461bc8c0753ca41210b2e0d2c2955ee GIT binary patch literal 6148 zcmeHK%Sr=55Ukc50wUz-ael!+7()C4Kfp&KA}&OTx$nvE^3$w-AS@dX9=u33bk|I8 z*A7#M?QHIO2U)eLCUXOT3Y}#p{Is zf&qu!VLLqT_rqzjvQj__NC7Dz1*E{Q74Y6mTV5n8N&zV#1-=#V??as*@T%h@sPzW~kv-c|J%F+7tAz++r3fYt=klu`} z=V9K$vP4ANpTk;YB_a#Bp`0zu&7Paj>?tz}gyS7Y`IN1E%ZCiJ>e~t9E>Yiu^*-VE zhp+urSL}sY~6`%rCfC^B7KPh0n7q(aiGExC5Kn1P}*!Q8p4Qt{U=${S*9|3?3 z(r#G$ECDQ*0M^7Y5E+;T6&O^_5krHHe95|+I0gn?G=~q(lQkz4_0#eG;^m?>kdX>d zfvEz|v0YjJe}&(f|EDDGr~noCR|;s;ZMqg$%HBG=ob}oQe}h}i1#X75QxLoz1HBz% gW9|6Gi=wXB8qaIu80d85oet#BfayY`0*_YU7uVPp6#xJL literal 0 HcmV?d00001 diff --git a/tests/.DS_Store b/tests/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ac3c099b0e9e236b59246b2def3b4f65805f17d5 GIT binary patch literal 6148 zcmeHKOHRWu5PdGC3hJgymc9bw0#;Q{zy&BxfJlX)CM_&;bl!Lj#1OVsg=QrC+4Hmg zs@fRV z#fyupGry1Sa6!>}W55{5893AFLf-!y{$)ms{5-^F#(**K&lqsi)$MA@L#4O%*YV`7 w^=x-+BI4J}fWmS15x|MuBbU*rb}wW4g@nDLWD$J~C)$TVB*Z#n;0O$S0F$~z@c;k- literal 0 HcmV?d00001 diff --git a/tests/fixtures/.DS_Store b/tests/fixtures/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f6f89f789de317a5996c0477f02ea36e06567b00 GIT binary patch literal 6148 zcmeHKOHRWu5PgOSRj{B-mbm~6#08?NoPYyB+n_XR+Mp&yVwa=y#xtO#%^E5+Q`v7a zKRZvVodFPLhx`GU0+?_J22n;t%%iRg3%()-sgXCUYFXFSNRe|j$=(y>SfItCzyE90 z*wI*{;wVt!4NX7b7JD(#d7!qU{=%?5E4^cV9NN&lrK5^r%NVv}()zS&gHKj%>DaPj zLu~mgxtZd)>IWVfRNAr|Ov3_Hbmba09-05PFC3U%ovBque@3_C@7C_z(+ni{Od2%1iNYH^uir>N-& z)_eq8`MY@uadp;DV>m*l=(9863=A2#)W@mZ|4;nOj5hhh6n}CCoPmGFKuG4#^BG^t z?$(pnle;$Mc;yh0xK0!b^}$B~ALJali%#{YqBAZt>=dPn*kd};KLjEnJ~;!wz`z%Y C)j*2? literal 0 HcmV?d00001 diff --git a/tests/fixtures/data/.DS_Store b/tests/fixtures/data/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..cc4d7fffba7035d7679ec0687674c59c4e9a1c3f GIT binary patch literal 6148 zcmeHKF=_)r43uIQhBPiy?ic)n#W*j>2SV)17++zM`l`GuPs@xXjLi|QN@GT#on5VF zmz(0WGBe+P9yVrcGh4xl_RV2x+^0|MsUk$@8T-@6Fq{}&*48YLyRf}o?CWs3X}7}B^gq}(gy28(e{-~-r-l_DTw@TW+p%IEUY{N_VI$RU**^9E+# z?(Do3dWA+KBDy%WZz3}hnZga_Y+-D6Za%W7%qS3!JHF&w8tH(?QT6SFap$rHYcK79 z|08SM@+k+zHO?Af(;l|n$8Oi%zKmHaKn17(6`%rC;9mu-_rj(xfs9mu3Q&Px1?>A! z;D$A^5A;t5f{y^e3DRy@`z!%0mH^hoJ`fq01{D}o%@IR`j(o|wn%D;hT{MRe%_nP4 zDC$qg{l&{gYak;PpaMe$o?|<+{{IgDWBwnKxT6A8;Gq=I$#S(^;FYqsj$Y1sZGms# uR&#-yVeJ$IZ^uAy$Jkgqe)XcLE4IdYP3!}mj=a->{24G^XjI_d3S0pfuo@x& literal 0 HcmV?d00001 diff --git a/tests/fixtures/data/json/.DS_Store b/tests/fixtures/data/json/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..13d12d3c7cf9dda29579b2b38d5f6fa87f24c5bf GIT binary patch literal 6148 zcmeHKJ8Hu~5S>X}7}B^gq}(gy28(e{-~-r-l_DTw@TW+p%IEUY{N_VI$RU**^9E+# z?(Do3dWA+KBDy%WZz3}hnZga_Y+-D6Za%W7%qS3!JHF&w8tH(?QT6SFap$rHYcK79 z|08SM@+k+zHO?Af(;l|n$8Oi%zKmHaKn17(6`%rC;9mu-_rj(xfs9mu3Q&Px1?>A! z;D$A^5A;t5f{y^e3DRy@`z!%0mH^hoJ`fq01{D}o%@IR`j(o|wn%D;hT{MRe%_nP4 zDC$qg{l&{gYak;PpaMe$o?|<+{{IgDWBwnKxT6A8;Gq=I$#S(^;FYqsj$Y1sZGms# uR&#-yVeJ$IZ^uAy$Jkgqe)XcLE4IdYP3!}mj=a->{24G^XjI_d3S0pfuo@x& literal 0 HcmV?d00001 diff --git a/tests/fixtures/v3migration-pkg/.DS_Store b/tests/fixtures/v3migration-pkg/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..74b1ff20cc63c1b993c4784dfc0b589085d1672f GIT binary patch literal 6148 zcmeHKQBK1!41F2XG=^aN{_fRWAVC@{ryE3jkB9;OLUg36XixfsBGhCY|PZLx!5aHPV5%8P1UbIlF6YaNw!E zqI-S`_DIrtn{Uc8m#xouxL-78bQ9-Nu^_Ro`LGn2P3{ zX$##)!g0g*sKy8K?jkqp_^df(CtLR9bsKDV&e(=38!j|c#{OQj@A}J6@QM3VInMFK zY){63F<=b*o&nZuk?EC3YmEV8z!*3(Am4|GDi{ZBJ?f`}ja~tWW13aim%D_-L;>S~ ztw+vKoDU`XP#3Nk&WF<;1;038>(Ph9h0BKvE4y$*ak@J5N9qn2d$iUVFb4VzT=?Na z>i@&f_y2y7jf??f;9oJ|#;eEGl8+Q>>)_#})<)DPs)+ct9*-gHXep+zl;T^e3hj|} Vh;hKyBP|sBBcL=`V+{N$1K;Y5OzHpt literal 0 HcmV?d00001 diff --git a/tests/fixtures/v3migration-pkg/business_data/.DS_Store b/tests/fixtures/v3migration-pkg/business_data/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a2f7d7b8864b4294ae58ad70e74de0161ec260d3 GIT binary patch literal 6148 zcmeHK%Sr=L3_YLa^|%#0}ZjBelUny0pHM%<}{_Fm!{FKBSUp#KU- zrW!orjpY`v!}7J2I~Gnn?MS`HJBbH;42e@$XFe531yX@jAQkwR3UFqtEtZZMQ-M?< z75G*_zYm43SOa@U`*bka3P7AQZN{_h62zhjVh!vanW2fd61`Po#Sm|2z67rZ_Kw~T ziRDA$W{C|&>~=oC7#&g_Go}Kmz)%6*y=g0*|9A9>{a-n0sX!|5M-`CyX1iJQj|M$n@kV_dqHDkAs#kbNi{I<-uttXu zY};+KdF=a*Zs?LhD;l+Za+~Wz_Y-!^YUq9;2i?$pfj!MFo|$(r@o}&fs|*H$fnXpQ zI0XiHXRA!F3_}M4!9XzZ!+@R-iA^y(7Q=dUP}LHEsL$vs>}xHdImt0Q7DIX{VyQ$+ z6)!Qw(rHf~mmQ0tr9-^<5dZRb@gnu>oIllYNHz=|3S-CQF~1% P#zUYI5-J$@2L`?X!1XI5 literal 0 HcmV?d00001 diff --git a/tests/fixtures/v3migration-pkg/graphs/.DS_Store b/tests/fixtures/v3migration-pkg/graphs/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..74a546dde4b552e76191119a5c3d645c10213689 GIT binary patch literal 6148 zcmeHKyG{c^44j1&CsB}+a({t8SViFr_y8bxNECsSh|*ujZ!>-bU38(PKx4@}Ua!5@ zPH{d1D4XMO53B)nR6~5(vJ^WvUC32>42$2<;|;Gk42OQdh`#Kw+zvZ@;sqa=(*QcI2)CDQ4y8P^i0z(_~&%Dg8l zmz+?FSEs*vI7$oDDh9;BIRn?RU0eTup#C!dpC@T22E@R>VxX+HkJ}BOl)ZKFIP0~Q t`b<3uV?CUUw_>8VVs5Mz-_7Ex**tHFQ=q5Q@99MS2pBICG4K}*d;=}$9%cXl literal 0 HcmV?d00001 diff --git a/tests/fixtures/v3migration-pkg/map_layers/.DS_Store b/tests/fixtures/v3migration-pkg/map_layers/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a29dbf732f7aea084afdda3bc2d6f5e15705cc7f GIT binary patch literal 6148 zcmeHKOHRX33>-rjmAc82<+}nmh^le|4p8W40SW|BKwW0XwHezFlqzM*0*xhm^8EZ! zW)a5#Z27*s1{wf!sv|z#OvUeACvs6ejutg~9I?g$FW66_&pSM~!4vM8v%xrj%Sw-| z)#G`0*mj$~@4UnUZ+Jk*2Ht3oSA4h~hn(*uuNV*mVn7Ut0WshVaAv#A7m2cBKn#e1 z9|rvUP^gY=#UU|19W=255NC9U@Hut~VsQtttvDpoL$ORHW~$W{!!n)zQsdf+Lt>`G zqBHB%&Q>=Ri|+K72#2+avSL6CoHB5k$HwRX4fU7(|1?P_F(3y16$3U~-L95=r8-+D yFXywiQ17VU!q^C>iBU|9QOtvn;;T_y@n_z*6^Fz~r$5q(`VnwmBx2w%82AEx*B@*E literal 0 HcmV?d00001 diff --git a/tests/fixtures/v3migration-pkg/map_layers/mapbox_spec_json/.DS_Store b/tests/fixtures/v3migration-pkg/map_layers/mapbox_spec_json/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a994bffb6978700d89e0614e4382c9a739e0b9b8 GIT binary patch literal 6148 zcmeHKyH3ME5S)b+mS|F@ykFoCtSEc|KR`n0f{d_0qI1V@Gy4cipjcf$}h zIt=*a(K`-I`pV+R!^<@ll>$;g3P=GdAO)@~z@F{a-6d+30#ZN<{3_tzhemho3#Y{R zba06gfVf~djL$Jk5Ss^xec_bI2+fj8Osdt0VM%AaRbF2>B_pjcf$}h zIt=*a(K`-I`pV+R!^<@ll>$;g3P=GdAO)@~z@F{a-6d+30#ZN<{3_tzhemho3#Y{R zba06gfVf~djL$Jk5Ss^xec_bI2+fj8Osdt0VM%AaRbF2>B_7#%BBGBb#N$Q2mUP9OPHNrIYihdOBg;C0L!b_`UKk$IGGJ zcU^15#!JqKC;7n@gU#uanWX|$fC^9nDnJFM6hO~5YnFkGRDcRlfu{oYeJF6ln%D>W zrvt%90N?^?H$3|+0W6jP*2F##8JGqY7*x#>LxYZd$-0`@2L@f#Z^k)!v*v`NemnBT z%SCG-BNd#>1^z;TJMu~#2mk;8 literal 0 HcmV?d00001 diff --git a/tests/fixtures/v3migration-pkg/v3data/.DS_Store b/tests/fixtures/v3migration-pkg/v3data/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..878c075942a405e82941196c30086b606df7a3f3 GIT binary patch literal 6148 zcmeHK%TB{U3>-rb6$sQL$NdHVU{$qW&<}vLDG#Y?5vBLs_-)1yP|=nv2e2c160awl z%pr~e$n?tr!!xo zt_BW{PKU(sA+fW>gd(;(?_aDOQXMm<0;#}v1$6eNO|<{d=|9Z>T9cLvqym3b0U6B} zvngLLdTaBV+G`8_p8jd9wQ>e)#YAhxywFyBb5vLKoa;4ka5OseMknTvfa;Q#3jBrw E9|i*^f&c&j literal 0 HcmV?d00001 diff --git a/tests/ui/.DS_Store b/tests/ui/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fccb272874d28f1447f1d35c91eee2a77386b863 GIT binary patch literal 6148 zcmeHK%Sr=55Ukb+fgt4Qael!+SVH^)KfqVS%W8zg``+@~RzD0`79l4OQVrd;)6+G> z)?s@afUUkZx4;s>obHH&hpG9#`@}9P<7jcl176Y7-|6R>bFcAnH2a71-=2&6B}0m literal 0 HcmV?d00001 diff --git a/virtualenv/.DS_Store b/virtualenv/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d1f5665778c3e302692ef2bed1b92ee5b4128c3e GIT binary patch literal 6148 zcmeHKJ5Iw;5S)b+k!T_+%6A2BU`62sIRL*7+MW0I z?L5mnoqhL q*Fj;3c1(t0>C4=4+mJg=1pSnGZTqe+FC^nH2bI1-<}upBYI2 literal 0 HcmV?d00001 From 1a2e2c6e26b27cc93436b1e57b7ec51e924390b8 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 6 Jun 2019 17:15:42 -0700 Subject: [PATCH 05/18] save generates new TileViewModel instead of TileModel, re#27 --- arches/app/media/js/viewmodels/card.js | 5 ++ .../workflows/add-ref-number-step.js | 84 +++++++++++++------ .../workflows/add-ref-number-step.htm | 22 +++-- 3 files changed, 77 insertions(+), 34 deletions(-) diff --git a/arches/app/media/js/viewmodels/card.js b/arches/app/media/js/viewmodels/card.js index 212ff3faa0c..17495e5ad2c 100644 --- a/arches/app/media/js/viewmodels/card.js +++ b/arches/app/media/js/viewmodels/card.js @@ -30,6 +30,7 @@ define([ ko.unwrap(parent.widgets) ); } + if(!children) {console.log(parent);} children.forEach(function(child) { if (child.selected && child.selected() || isChildSelected(child)) { childSelected = true; @@ -374,6 +375,10 @@ define([ this.isChildSelected = ko.computed(function() { return isChildSelected(this); }, this); + // this.isChildSelected = ko.computed({ + // read: function() {return isChildSelected(this);}, + // write: function(bool) { return isChildSelected(bool);} + // }, this); this.doesChildHaveProvisionalEdits = ko.computed(function() { return doesChildHaveProvisionalEdits(this); }, this); diff --git a/arches/app/media/js/views/components/workflows/add-ref-number-step.js b/arches/app/media/js/views/components/workflows/add-ref-number-step.js index 2a1d972b988..00ef2d67215 100644 --- a/arches/app/media/js/views/components/workflows/add-ref-number-step.js +++ b/arches/app/media/js/views/components/workflows/add-ref-number-step.js @@ -5,24 +5,32 @@ define([ 'knockout', 'models/graph', 'viewmodels/card', + 'viewmodels/tile', // 'viewmodels/card-component', 'viewmodels/provisional-tile', 'viewmodels/alert' -], function(_, $, arches, ko, GraphModel, CardViewModel, ProvisionalTileViewModel, AlertViewModel) { +], function(_, $, arches, ko, GraphModel, CardViewModel, TileViewModel, ProvisionalTileViewModel, AlertViewModel) { function viewModel(params) { var self = this; var url = arches.urls.api_card + (ko.unwrap(params.resourceid) || ko.unwrap(params.graphid)); this.card = ko.observable(); this.tile = ko.observable(); - // this.tiles = ko.observableArray([]); + this.tileArr = ko.observableArray(); this.loading = params.loading || ko.observable(false); this.alert = params.alert || ko.observable(null); this.resourceId = params.resourceid; this.complete = params.complete || ko.observable(); - this.agencyName = ko.computed({ - // - }); + + this.remove = function(tile) { + // self.tileArr(tile); + var idx = self.card().tiles().indexOf(tile); + console.log(self.card().tiles()); + self.card().tiles().splice(idx, 1); + console.log("removed"); + console.log(self.card().tiles()); + }; + // this.agencyName = ko.computed({}); this.loading(true); @@ -131,19 +139,22 @@ define([ self.complete(!!ko.unwrap(params.tileid)); }); + this.tileArr = ko.observableArray(); + self.saveTile = function(tile, callback) { - // console.log("params passed to saveTile"); - // console.log(params); - // console.log("tile ?"); - // console.log(tile); - console.log("self.card ?"); + // self.tile() is the TileViewModel + // self.card().tile() is not a thing + + self.loading(true); + console.log("here's self.tile"); + console.log(self.tile()); + console.log("and self.card()"); console.log(self.card()); - console.log("self.card.selected ?"); - console.log(self.card().selected()); - console.log("self.card.tiles ?"); - console.log(self.card().tiles()); - self.loading(true); + var tilesub = self.card().tiles.subscribe(function(val){ + return (val); + }); + tile.save(function(response) { //onFail, onSuccess self.loading(false); self.alert( @@ -156,14 +167,37 @@ define([ ) ); }, function(tile) { //onSuccess - // console.log(params); + + console.log(params); + console.log(tile); + + var newTile = new TileViewModel({ + tile: tile, + card: self.card, + graphModel: params.graphModel, + resourceId: params.resourceId, + displayname: params.displayname, + handlers: params.handlers, + userisreviewer: params.userisreviewer, + cards: self.tile.cards, + tiles: [], + provisionalTileViewModel: params.provisionalTileViewModel, + selection: ko.observable(false), + scrollTo: ko.observable(), + loading: ko.observable(), + filter: ko.observable(), + cardwidgets: params.cardwidgets, + }); + + console.log("newTile"); + console.log(newTile); // self.tiles.push(tile); - self.card().tiles().push(tile); + self.card().tiles().push(newTile); //do I need to do this? + // self.tileArr.push + // self.tilesArr.push(tile); console.log(self.card().tiles()); - // console.log(params); - // console.log("params in saveTile else {}:") - // console.log(params); + params.resourceid(tile.resourceinstance_id); params.tileid(tile.tileid); self.resourceId(tile.resourceinstance_id); @@ -171,14 +205,10 @@ define([ if (typeof callback === 'function') { callback.apply(null, arguments); } - // console.log("here's the tile"); - // console.log(tile); - // self.tile.reset(); + self.tile(self.card().getNewTile()); //this appears to be working + // console.log(self.card().isChildSelected()); + self.loading(false); - - // console.log("pre-reset"); - // console.log(self.tile()); - // console.log(self.tile()._tileData()); }); }; } diff --git a/arches/app/templates/views/components/workflows/add-ref-number-step.htm b/arches/app/templates/views/components/workflows/add-ref-number-step.htm index 983e57512a3..1f46a49ce47 100644 --- a/arches/app/templates/views/components/workflows/add-ref-number-step.htm +++ b/arches/app/templates/views/components/workflows/add-ref-number-step.htm @@ -1,5 +1,5 @@
Click to console card
-
Click to console tile
+
Click to console Card tiles
@@ -17,13 +17,21 @@

Add Reference Number

}">
- +
-
-

Agency:

-
-
Identifier:
-
+
+
+
+

Agency:

+
+
Identifier:
+
+
+
+
+

Remove

+

Edit

+
From c5842169dadb1dc857545a1004850fd4e0ee6a14 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Mon, 10 Jun 2019 10:21:20 -0700 Subject: [PATCH 06/18] adds parallel array mostly for testing, re #27 --- .../workflows/add-ref-number-step.js | 27 +++++++++++-------- .../workflows/add-ref-number-step.htm | 6 ++--- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/arches/app/media/js/views/components/workflows/add-ref-number-step.js b/arches/app/media/js/views/components/workflows/add-ref-number-step.js index 00ef2d67215..1c2a9cc661c 100644 --- a/arches/app/media/js/views/components/workflows/add-ref-number-step.js +++ b/arches/app/media/js/views/components/workflows/add-ref-number-step.js @@ -24,12 +24,18 @@ define([ this.remove = function(tile) { // self.tileArr(tile); - var idx = self.card().tiles().indexOf(tile); - console.log(self.card().tiles()); - self.card().tiles().splice(idx, 1); + var tilesIdx = self.card().tiles().indexOf(tile); + var arrIdx = self.tileArr.indexOf(tile); + // console.log(self.card().tiles()); + self.card().tiles().splice(tilesIdx, 1); + self.tileArr.splice(arrIdx, 1); console.log("removed"); console.log(self.card().tiles()); }; + + this.edit = function(tile) { + // + } // this.agencyName = ko.computed({}); this.loading(true); @@ -151,9 +157,9 @@ define([ console.log("and self.card()"); console.log(self.card()); - var tilesub = self.card().tiles.subscribe(function(val){ - return (val); - }); + // self.tileArr = self.card().tiles.subscribe(function(list){ + // return (list); + // }); tile.save(function(response) { //onFail, onSuccess self.loading(false); @@ -188,14 +194,13 @@ define([ filter: ko.observable(), cardwidgets: params.cardwidgets, }); + + self.tileArr.push(newTile); - console.log("newTile"); - console.log(newTile); + // console.log("newTile"); + // console.log(newTile); - // self.tiles.push(tile); - self.card().tiles().push(newTile); //do I need to do this? // self.tileArr.push - // self.tilesArr.push(tile); console.log(self.card().tiles()); params.resourceid(tile.resourceinstance_id); diff --git a/arches/app/templates/views/components/workflows/add-ref-number-step.htm b/arches/app/templates/views/components/workflows/add-ref-number-step.htm index 1f46a49ce47..34f518d7627 100644 --- a/arches/app/templates/views/components/workflows/add-ref-number-step.htm +++ b/arches/app/templates/views/components/workflows/add-ref-number-step.htm @@ -17,15 +17,15 @@

Add Reference Number

}">
- +

Agency:

-
+
Identifier:
-
+
From 1350e7b1cc03da08a86a0fa9587d48be9c6d75b2 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Tue, 11 Jun 2019 11:54:39 -0700 Subject: [PATCH 07/18] adds selectedTile computed, re #27 --- arches/app/media/js/viewmodels/tile.js | 2 +- .../workflows/add-ref-number-step.js | 65 +++++++++++++++---- .../views/components/cards/default.htm | 2 +- .../workflows/add-ref-number-step.htm | 14 ++-- 4 files changed, 62 insertions(+), 21 deletions(-) diff --git a/arches/app/media/js/viewmodels/tile.js b/arches/app/media/js/viewmodels/tile.js index f1448b86afd..f8d933c0695 100644 --- a/arches/app/media/js/viewmodels/tile.js +++ b/arches/app/media/js/viewmodels/tile.js @@ -241,7 +241,7 @@ define([ if (selected) this.expanded(true); }, this); this.expanded.subscribe(function(expanded) { - if (expanded && this.parent) this.parent.expanded(true); + if (expanded && this.parent && typeof this.parent != "function") this.parent.expanded(true); }, this); this.isChildSelected = ko.pureComputed(function() { return isChildSelected(this); diff --git a/arches/app/media/js/views/components/workflows/add-ref-number-step.js b/arches/app/media/js/views/components/workflows/add-ref-number-step.js index 1c2a9cc661c..9d3bcdb325a 100644 --- a/arches/app/media/js/views/components/workflows/add-ref-number-step.js +++ b/arches/app/media/js/views/components/workflows/add-ref-number-step.js @@ -22,21 +22,46 @@ define([ this.resourceId = params.resourceid; this.complete = params.complete || ko.observable(); + this.selectedTile = ko.computed(function() { + //if card is undefined, return self.tile(getNewTile) + //else, do below + var item; + if(!self.card()) { + return self.card().getNewTile(); + } else { + item = self.card.selection(); + if (item && typeof item !== 'string') { + if (item.tileid) { + return item; + } + return item.getNewTile(); + } + } + }); + this.remove = function(tile) { - // self.tileArr(tile); var tilesIdx = self.card().tiles().indexOf(tile); var arrIdx = self.tileArr.indexOf(tile); // console.log(self.card().tiles()); - self.card().tiles().splice(tilesIdx, 1); - self.tileArr.splice(arrIdx, 1); + self.card().tiles().splice(tilesIdx, 1); //card.tiles arr + self.tileArr.splice(arrIdx, 1); //dummy observ arr console.log("removed"); console.log(self.card().tiles()); }; this.edit = function(tile) { - // + if(!self.card().selection) { + self.card().selection = ko.observable(tile); + } else { + self.card().selection(tile); + } + tile.selected(true); + console.log(tile.parent()); + // self.card().selection(tile); + // console.log(self.card().selection()); + console.log("edited"); } - // this.agencyName = ko.computed({}); + // this.agencyName = ko.computed({}); //need to key off node_id this.loading(true); @@ -64,6 +89,16 @@ define([ return flatList; }; + // var selectedTile = ko.computed(function() { + // var item = self.card.selection(); + // if (item && typeof item !== 'string') { + // if (item.tileid) { + // return item; + // } + // return item.getNewTile(); + // } + // }); + self.reviewer = data.userisreviewer; self.provisionalTileViewModel = new ProvisionalTileViewModel({ tile: self.tile, @@ -124,6 +159,16 @@ define([ } }; + self.selectedTile = ko.computed(function() { + var item = ko.unwrap(self.card.selection); + if (item && typeof item !== 'string') { + if (item.tileid) { + return item; + } + return item.getNewTile(); + } + }); + flattenTree(topCards, []).forEach(function(item) { if (item.constructor.name === 'CardViewModel' && item.nodegroupid === ko.unwrap(params.nodegroupid)) { if (ko.unwrap(params.parenttileid) && item.parent && ko.unwrap(params.parenttileid) !== item.parent.tileid) { @@ -156,6 +201,7 @@ define([ console.log(self.tile()); console.log("and self.card()"); console.log(self.card()); + // self.card().selection() // self.tileArr = self.card().tiles.subscribe(function(list){ // return (list); @@ -174,8 +220,8 @@ define([ ); }, function(tile) { //onSuccess - console.log(params); - console.log(tile); + // console.log(params); + // console.log(tile); var newTile = new TileViewModel({ tile: tile, @@ -188,7 +234,6 @@ define([ cards: self.tile.cards, tiles: [], provisionalTileViewModel: params.provisionalTileViewModel, - selection: ko.observable(false), scrollTo: ko.observable(), loading: ko.observable(), filter: ko.observable(), @@ -196,9 +241,6 @@ define([ }); self.tileArr.push(newTile); - - // console.log("newTile"); - // console.log(newTile); // self.tileArr.push console.log(self.card().tiles()); @@ -211,7 +253,6 @@ define([ callback.apply(null, arguments); } self.tile(self.card().getNewTile()); //this appears to be working - // console.log(self.card().isChildSelected()); self.loading(false); }); diff --git a/arches/app/templates/views/components/cards/default.htm b/arches/app/templates/views/components/cards/default.htm index b03ad52e86b..02bde05e9ee 100644 --- a/arches/app/templates/views/components/cards/default.htm +++ b/arches/app/templates/views/components/cards/default.htm @@ -33,7 +33,7 @@ }">
  • - + {% block editor_tree_node_content %} diff --git a/arches/app/templates/views/components/workflows/add-ref-number-step.htm b/arches/app/templates/views/components/workflows/add-ref-number-step.htm index 34f518d7627..9c7e53f4797 100644 --- a/arches/app/templates/views/components/workflows/add-ref-number-step.htm +++ b/arches/app/templates/views/components/workflows/add-ref-number-step.htm @@ -8,7 +8,7 @@

    Add Reference Number

    name: cardComponentLookup[card().model.component_id()].componentname, params: { card: card(), - tile: tile(), + tile: selectedTile(), provisionalTileViewModel: provisionalTileViewModel, reviewer: reviewer, loading: loading, @@ -22,15 +22,15 @@

    Add Reference Number

    -

    Agency:

    -
    -
    Identifier:
    -
    + +

    + +

    -

    Remove

    -

    Edit

    +
    Remove
    +
    Edit
  • From 8dba301c3e2f5c092645f8a14741bc01f1248f8b Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Tue, 11 Jun 2019 16:14:33 -0700 Subject: [PATCH 08/18] adds additional conditional for provisionalTileViewModel, improves functionality of the wf-step viewmodel edit() method, extends new-tile-step to reduce redundancy, re consultations-prj #27 --- arches/app/media/js/viewmodels/tile.js | 2 +- .../workflows/add-ref-number-step.js | 85 ++----------------- .../views/components/cards/default.htm | 4 +- .../workflows/add-ref-number-step.htm | 2 +- 4 files changed, 11 insertions(+), 82 deletions(-) diff --git a/arches/app/media/js/viewmodels/tile.js b/arches/app/media/js/viewmodels/tile.js index f8d933c0695..c7a4691cca5 100644 --- a/arches/app/media/js/viewmodels/tile.js +++ b/arches/app/media/js/viewmodels/tile.js @@ -157,7 +157,7 @@ define([ save: function(onFail, onSuccess) { loading(true); delete self.formData.data; - if (params.provisionalTileViewModel.selectedProvisionalEdit()) { + if (params.provisionalTileViewModel && params.provisionalTileViewModel.selectedProvisionalEdit()) { self.formData.append('accepted_provisional', JSON.stringify(params.provisionalTileViewModel.selectedProvisionalEdit())); params.provisionalTileViewModel.acceptProvisionalEdit(); } diff --git a/arches/app/media/js/views/components/workflows/add-ref-number-step.js b/arches/app/media/js/views/components/workflows/add-ref-number-step.js index 9d3bcdb325a..854398d3877 100644 --- a/arches/app/media/js/views/components/workflows/add-ref-number-step.js +++ b/arches/app/media/js/views/components/workflows/add-ref-number-step.js @@ -6,38 +6,16 @@ define([ 'models/graph', 'viewmodels/card', 'viewmodels/tile', - // 'viewmodels/card-component', + 'views/components/workflows/new-tile-step', 'viewmodels/provisional-tile', 'viewmodels/alert' -], function(_, $, arches, ko, GraphModel, CardViewModel, TileViewModel, ProvisionalTileViewModel, AlertViewModel) { +], function(_, $, arches, ko, GraphModel, CardViewModel, TileViewModel, NewTileStepViewModel, ProvisionalTileViewModel, AlertViewModel) { function viewModel(params) { + NewTileStepViewModel.apply(this, [params]); var self = this; var url = arches.urls.api_card + (ko.unwrap(params.resourceid) || ko.unwrap(params.graphid)); - this.card = ko.observable(); - this.tile = ko.observable(); this.tileArr = ko.observableArray(); - this.loading = params.loading || ko.observable(false); - this.alert = params.alert || ko.observable(null); - this.resourceId = params.resourceid; - this.complete = params.complete || ko.observable(); - - this.selectedTile = ko.computed(function() { - //if card is undefined, return self.tile(getNewTile) - //else, do below - var item; - if(!self.card()) { - return self.card().getNewTile(); - } else { - item = self.card.selection(); - if (item && typeof item !== 'string') { - if (item.tileid) { - return item; - } - return item.getNewTile(); - } - } - }); this.remove = function(tile) { var tilesIdx = self.card().tiles().indexOf(tile); @@ -45,20 +23,11 @@ define([ // console.log(self.card().tiles()); self.card().tiles().splice(tilesIdx, 1); //card.tiles arr self.tileArr.splice(arrIdx, 1); //dummy observ arr - console.log("removed"); - console.log(self.card().tiles()); }; this.edit = function(tile) { - if(!self.card().selection) { - self.card().selection = ko.observable(tile); - } else { - self.card().selection(tile); - } - tile.selected(true); + self.tile(tile); console.log(tile.parent()); - // self.card().selection(tile); - // console.log(self.card().selection()); console.log("edited"); } // this.agencyName = ko.computed({}); //need to key off node_id @@ -89,16 +58,6 @@ define([ return flatList; }; - // var selectedTile = ko.computed(function() { - // var item = self.card.selection(); - // if (item && typeof item !== 'string') { - // if (item.tileid) { - // return item; - // } - // return item.getNewTile(); - // } - // }); - self.reviewer = data.userisreviewer; self.provisionalTileViewModel = new ProvisionalTileViewModel({ tile: self.tile, @@ -159,16 +118,6 @@ define([ } }; - self.selectedTile = ko.computed(function() { - var item = ko.unwrap(self.card.selection); - if (item && typeof item !== 'string') { - if (item.tileid) { - return item; - } - return item.getNewTile(); - } - }); - flattenTree(topCards, []).forEach(function(item) { if (item.constructor.name === 'CardViewModel' && item.nodegroupid === ko.unwrap(params.nodegroupid)) { if (ko.unwrap(params.parenttileid) && item.parent && ko.unwrap(params.parenttileid) !== item.parent.tileid) { @@ -193,21 +142,8 @@ define([ this.tileArr = ko.observableArray(); self.saveTile = function(tile, callback) { - // self.tile() is the TileViewModel - // self.card().tile() is not a thing - self.loading(true); - console.log("here's self.tile"); - console.log(self.tile()); - console.log("and self.card()"); - console.log(self.card()); - // self.card().selection() - - // self.tileArr = self.card().tiles.subscribe(function(list){ - // return (list); - // }); - - tile.save(function(response) { //onFail, onSuccess + tile.save(function(response) { self.loading(false); self.alert( new AlertViewModel( @@ -218,11 +154,9 @@ define([ function(){ return; } ) ); - }, function(tile) { //onSuccess - + }, function(tile) { // console.log(params); // console.log(tile); - var newTile = new TileViewModel({ tile: tile, card: self.card, @@ -239,12 +173,8 @@ define([ filter: ko.observable(), cardwidgets: params.cardwidgets, }); - self.tileArr.push(newTile); - - // self.tileArr.push console.log(self.card().tiles()); - params.resourceid(tile.resourceinstance_id); params.tileid(tile.tileid); self.resourceId(tile.resourceinstance_id); @@ -252,8 +182,7 @@ define([ if (typeof callback === 'function') { callback.apply(null, arguments); } - self.tile(self.card().getNewTile()); //this appears to be working - + self.tile(self.card().getNewTile()); self.loading(false); }); }; diff --git a/arches/app/templates/views/components/cards/default.htm b/arches/app/templates/views/components/cards/default.htm index 02bde05e9ee..c2a506229e8 100644 --- a/arches/app/templates/views/components/cards/default.htm +++ b/arches/app/templates/views/components/cards/default.htm @@ -360,11 +360,11 @@

    - + - +

    {% endblock form_buttons %} diff --git a/arches/app/templates/views/components/workflows/add-ref-number-step.htm b/arches/app/templates/views/components/workflows/add-ref-number-step.htm index 9c7e53f4797..f0af409b250 100644 --- a/arches/app/templates/views/components/workflows/add-ref-number-step.htm +++ b/arches/app/templates/views/components/workflows/add-ref-number-step.htm @@ -8,7 +8,7 @@

    Add Reference Number

    name: cardComponentLookup[card().model.component_id()].componentname, params: { card: card(), - tile: selectedTile(), + tile: tile(), provisionalTileViewModel: provisionalTileViewModel, reviewer: reviewer, loading: loading, From 26434d35c40af76942983a4b4887558c7600cc83 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Tue, 11 Jun 2019 16:24:15 -0700 Subject: [PATCH 09/18] saving additional merge changes --- .../app/media/js/viewmodels/resource-instance-select.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/arches/app/media/js/viewmodels/resource-instance-select.js b/arches/app/media/js/viewmodels/resource-instance-select.js index 20dccbff64c..9198d8d81af 100644 --- a/arches/app/media/js/viewmodels/resource-instance-select.js +++ b/arches/app/media/js/viewmodels/resource-instance-select.js @@ -81,14 +81,6 @@ define([ updateName(); var relatedResourceModels = ko.computed(function() { -<<<<<<< HEAD - var ids = params.node.config.graphid(); - return arches.resources.filter(function(graph) { - return ids == null || ids.indexOf(graph.graphid) >= 0; - }).map(function(g) { - return {name: g.name, _id: g.graphid, isGraph: true}; - }); -======= if (params.node) { var res = []; var ids = ko.unwrap(params.node.config.graphid); @@ -105,7 +97,6 @@ define([ } return res; } ->>>>>>> master }, this); From c45e1c5be2916bb376705cb364cfef15dcd17474 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 13 Jun 2019 15:06:24 -0700 Subject: [PATCH 10/18] updates multi-tile template to adapt to any/all widgets using card component, re consultations-prj #27 --- .../app/media/js/viewmodels/card-component.js | 2 - .../workflows/add-ref-number-step.js | 197 ------------------ .../workflows/new-multi-tile-step.js | 84 ++++++++ .../components/workflows/new-tile-step.js | 25 ++- .../views/components/cards/default.htm | 2 +- .../workflows/add-ref-number-step.htm | 39 ---- .../workflows/new-multi-tile-step.htm | 52 +++++ 7 files changed, 152 insertions(+), 249 deletions(-) delete mode 100644 arches/app/media/js/views/components/workflows/add-ref-number-step.js create mode 100644 arches/app/media/js/views/components/workflows/new-multi-tile-step.js delete mode 100644 arches/app/templates/views/components/workflows/add-ref-number-step.htm create mode 100644 arches/app/templates/views/components/workflows/new-multi-tile-step.htm diff --git a/arches/app/media/js/viewmodels/card-component.js b/arches/app/media/js/viewmodels/card-component.js index 469e1be5d00..5aa3fdc6117 100644 --- a/arches/app/media/js/viewmodels/card-component.js +++ b/arches/app/media/js/viewmodels/card-component.js @@ -29,8 +29,6 @@ define([ this.tile = this.card.newTile; } this.form = params.form; - console.log("in card component, now form.tile()..."); - // console.log(self.form.tile()); this.provisionalTileViewModel = params.provisionalTileViewModel; this.reviewer = params.reviewer; this.expanded = ko.observable(true); diff --git a/arches/app/media/js/views/components/workflows/add-ref-number-step.js b/arches/app/media/js/views/components/workflows/add-ref-number-step.js deleted file mode 100644 index 854398d3877..00000000000 --- a/arches/app/media/js/views/components/workflows/add-ref-number-step.js +++ /dev/null @@ -1,197 +0,0 @@ -define([ - 'underscore', - 'jquery', - 'arches', - 'knockout', - 'models/graph', - 'viewmodels/card', - 'viewmodels/tile', - 'views/components/workflows/new-tile-step', - 'viewmodels/provisional-tile', - 'viewmodels/alert' -], function(_, $, arches, ko, GraphModel, CardViewModel, TileViewModel, NewTileStepViewModel, ProvisionalTileViewModel, AlertViewModel) { - function viewModel(params) { - NewTileStepViewModel.apply(this, [params]); - var self = this; - var url = arches.urls.api_card + (ko.unwrap(params.resourceid) || ko.unwrap(params.graphid)); - - this.tileArr = ko.observableArray(); - - this.remove = function(tile) { - var tilesIdx = self.card().tiles().indexOf(tile); - var arrIdx = self.tileArr.indexOf(tile); - // console.log(self.card().tiles()); - self.card().tiles().splice(tilesIdx, 1); //card.tiles arr - self.tileArr.splice(arrIdx, 1); //dummy observ arr - }; - - this.edit = function(tile) { - self.tile(tile); - console.log(tile.parent()); - console.log("edited"); - } - // this.agencyName = ko.computed({}); //need to key off node_id - - this.loading(true); - - $.getJSON(url, function(data) { - var handlers = { - 'after-update': [], - 'tile-reset': [] - }; - var displayname = ko.observable(data.displayname); - var createLookup = function(list, idKey) { - return _.reduce(list, function(lookup, item) { - lookup[item[idKey]] = item; - return lookup; - }, {}); - }; - var flattenTree = function(parents, flatList) { - _.each(ko.unwrap(parents), function(parent) { - flatList.push(parent); - var childrenKey = parent.tiles ? 'tiles' : 'cards'; - flattenTree( - ko.unwrap(parent[childrenKey]), - flatList - ); - }); - return flatList; - }; - - self.reviewer = data.userisreviewer; - self.provisionalTileViewModel = new ProvisionalTileViewModel({ - tile: self.tile, - reviewer: data.userisreviewer - }); - - var graphModel = new GraphModel({ - data: { - nodes: data.nodes, - nodegroups: data.nodegroups, - edges: [] - }, - datatypes: data.datatypes - }); - - var topCards = _.filter(data.cards, function(card) { - var nodegroup = _.find(data.nodegroups, function(group) { - return group.nodegroupid === card.nodegroup_id; - }); - return !nodegroup || !nodegroup.parentnodegroup_id; - }).map(function(card) { - params.nodegroupid = params.nodegroupid || card.nodegroup_id; - return new CardViewModel({ - card: card, - graphModel: graphModel, - tile: null, - resourceId: self.resourceId, - displayname: displayname, - handlers: handlers, - cards: data.cards, - tiles: data.tiles, - provisionalTileViewModel: self.provisionalTileViewModel, - cardwidgets: data.cardwidgets, - userisreviewer: data.userisreviewer, - loading: self.loading - }); - }); - - topCards.forEach(function(topCard) { - topCard.topCards = topCards; - }); - - self.widgetLookup = createLookup( - data.widgets, - 'widgetid' - ); - self.cardComponentLookup = createLookup( - data['card_components'], - 'componentid' - ); - self.nodeLookup = createLookup( - graphModel.get('nodes')(), - 'nodeid' - ); - self.on = function(eventName, handler) { - if (handlers[eventName]) { - handlers[eventName].push(handler); - } - }; - - flattenTree(topCards, []).forEach(function(item) { - if (item.constructor.name === 'CardViewModel' && item.nodegroupid === ko.unwrap(params.nodegroupid)) { - if (ko.unwrap(params.parenttileid) && item.parent && ko.unwrap(params.parenttileid) !== item.parent.tileid) { - return; - } - self.card(item); - if (ko.unwrap(params.tileid)) { - ko.unwrap(item.tiles).forEach(function(tile) { - if (tile.tileid === ko.unwrap(params.tileid)) { - self.tile(tile); - } - }); - } else { - self.tile(item.getNewTile()); - } - } - }); - self.loading(false); - self.complete(!!ko.unwrap(params.tileid)); - }); - - this.tileArr = ko.observableArray(); - - self.saveTile = function(tile, callback) { - self.loading(true); - tile.save(function(response) { - self.loading(false); - self.alert( - new AlertViewModel( - 'ep-alert-red', - response.responseJSON.message[0], - response.responseJSON.message[1], - null, - function(){ return; } - ) - ); - }, function(tile) { - // console.log(params); - // console.log(tile); - var newTile = new TileViewModel({ - tile: tile, - card: self.card, - graphModel: params.graphModel, - resourceId: params.resourceId, - displayname: params.displayname, - handlers: params.handlers, - userisreviewer: params.userisreviewer, - cards: self.tile.cards, - tiles: [], - provisionalTileViewModel: params.provisionalTileViewModel, - scrollTo: ko.observable(), - loading: ko.observable(), - filter: ko.observable(), - cardwidgets: params.cardwidgets, - }); - self.tileArr.push(newTile); - console.log(self.card().tiles()); - params.resourceid(tile.resourceinstance_id); - params.tileid(tile.tileid); - self.resourceId(tile.resourceinstance_id); - self.complete(true); - if (typeof callback === 'function') { - callback.apply(null, arguments); - } - self.tile(self.card().getNewTile()); - self.loading(false); - }); - }; - } - ko.components.register('add-ref-number-step', { - viewModel: viewModel, - template: { - require: 'text!templates/views/components/workflows/add-ref-number-step.htm' - } - }); - return viewModel; -}); diff --git a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js new file mode 100644 index 00000000000..512821d4170 --- /dev/null +++ b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js @@ -0,0 +1,84 @@ +define([ + 'underscore', + 'jquery', + 'arches', + 'knockout', + 'models/graph', + 'viewmodels/card', + 'viewmodels/tile', + 'views/components/workflows/new-tile-step', + 'viewmodels/provisional-tile', + 'viewmodels/alert' +], function(_, $, arches, ko, GraphModel, CardViewModel, TileViewModel, NewTileStepViewModel, ProvisionalTileViewModel, AlertViewModel) { + + /** + * A generic viewmodel for workflow steps that can add multiple tiles + * @name NewMultiTileStepViewModel + **/ + + function NewMultiTileStepViewModel(params) { + NewTileStepViewModel.apply(this, [params]); + var self = this; + + this.remove = function(tile) { + self.card().tiles.remove(tile); + }; + + this.edit = function(tile) { + console.log(self.tile()._tileData()); + self.tile(tile); + } + + self.saveTile = function(tile, callback) { + self.loading(true); + tile.save(function(response) { + console.log("failed"); + self.loading(false); + self.alert( + new AlertViewModel( + 'ep-alert-red', + response.responseJSON.message[0], + response.responseJSON.message[1], + null, + function(){ return; } + ) + ); + }, function(tile) { + console.log(tile); + var newTile = new TileViewModel({ + tile: tile, + card: self.card, + graphModel: params.graphModel, + resourceId: self.resourceId, + displayname: self.displayname, + handlers: self.handlers, + userisreviewer: params.userisreviewer, + cards: self.tile.cards, + tiles: [], + provisionalTileViewModel: params.provisionalTileViewModel, + scrollTo: ko.observable(), + loading: ko.observable(), + filter: ko.observable(), + cardwidgets: params.cardwidgets, + }); + params.resourceid(tile.resourceinstance_id); + params.tileid(tile.tileid); + self.resourceId(tile.resourceinstance_id); + self.complete(true); + if (typeof callback === 'function') { + callback.apply(null, arguments); + } + self.tile(self.card().getNewTile()); + self.tile().reset(); + self.loading(false); + }); + }; + } + ko.components.register('new-multi-tile-step', { + viewModel: NewMultiTileStepViewModel, + template: { + require: 'text!templates/views/components/workflows/new-multi-tile-step.htm' + } + }); + return NewMultiTileStepViewModel; +}); diff --git a/arches/app/media/js/views/components/workflows/new-tile-step.js b/arches/app/media/js/views/components/workflows/new-tile-step.js index c6212b85898..00cc1b0cf9e 100644 --- a/arches/app/media/js/views/components/workflows/new-tile-step.js +++ b/arches/app/media/js/views/components/workflows/new-tile-step.js @@ -17,17 +17,22 @@ define([ this.tile = ko.observable(); this.loading = params.loading || ko.observable(false); this.alert = params.alert || ko.observable(null); - this.resourceId = params.resourceid; + this.resourceId = params.resourceid || ko.observable(); this.complete = params.complete || ko.observable(); this.loading(true); + this.handlers = { + 'after-update': [], + 'tile-reset': [] + }; + this.displayname = ko.observable(); $.getJSON(url, function(data) { - var handlers = { - 'after-update': [], - 'tile-reset': [] - }; - var displayname = ko.observable(data.displayname); + // var handlers = { + // 'after-update': [], + // 'tile-reset': [] + // }; + self.displayname(data.displayname); var createLookup = function(list, idKey) { return _.reduce(list, function(lookup, item) { lookup[item[idKey]] = item; @@ -73,8 +78,8 @@ define([ graphModel: graphModel, tile: null, resourceId: self.resourceId, - displayname: displayname, - handlers: handlers, + displayname: self.displayname, + handlers: self.handlers, cards: data.cards, tiles: data.tiles, provisionalTileViewModel: self.provisionalTileViewModel, @@ -101,8 +106,8 @@ define([ 'nodeid' ); self.on = function(eventName, handler) { - if (handlers[eventName]) { - handlers[eventName].push(handler); + if (self.handlers[eventName]) { + self.handlers[eventName].push(handler); } }; diff --git a/arches/app/templates/views/components/cards/default.htm b/arches/app/templates/views/components/cards/default.htm index c2a506229e8..095dd552e8f 100644 --- a/arches/app/templates/views/components/cards/default.htm +++ b/arches/app/templates/views/components/cards/default.htm @@ -364,7 +364,7 @@

    - +

    {% endblock form_buttons %} diff --git a/arches/app/templates/views/components/workflows/add-ref-number-step.htm b/arches/app/templates/views/components/workflows/add-ref-number-step.htm deleted file mode 100644 index f0af409b250..00000000000 --- a/arches/app/templates/views/components/workflows/add-ref-number-step.htm +++ /dev/null @@ -1,39 +0,0 @@ -
    Click to console card
    -
    Click to console Card tiles
    -
    - -
    -

    Add Reference Number

    -
    -
    -
    - -
    -
    -
    -
    - -

    - -

    -
    -
    -
    -
    Remove
    -
    Edit
    -
    -
    - -
    - -
    diff --git a/arches/app/templates/views/components/workflows/new-multi-tile-step.htm b/arches/app/templates/views/components/workflows/new-multi-tile-step.htm new file mode 100644 index 00000000000..3a82e47164e --- /dev/null +++ b/arches/app/templates/views/components/workflows/new-multi-tile-step.htm @@ -0,0 +1,52 @@ + + +
    Click to console card
    +
    Click to console Card tiles
    +
    + +
    +

    Add Reference Number

    +
    +
    +
    + +
    +
    +
    +
    + + + +
    +
    +
    +
    Remove
    +
    Edit
    +
    +
    +
    + +
    + +
    + + From 52af7061024a2b3bb6b9d3da012dab15c65bc240 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 13 Jun 2019 15:51:35 -0700 Subject: [PATCH 11/18] cleans up new-multi, removes unnecessary alterations to new-tile-step, re consultations-prj #27 --- .../workflows/new-multi-tile-step.js | 25 ++++++------------- .../components/workflows/new-tile-step.js | 23 +++++++---------- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js index 512821d4170..85ec7c053c6 100644 --- a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js +++ b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js @@ -44,23 +44,6 @@ define([ ) ); }, function(tile) { - console.log(tile); - var newTile = new TileViewModel({ - tile: tile, - card: self.card, - graphModel: params.graphModel, - resourceId: self.resourceId, - displayname: self.displayname, - handlers: self.handlers, - userisreviewer: params.userisreviewer, - cards: self.tile.cards, - tiles: [], - provisionalTileViewModel: params.provisionalTileViewModel, - scrollTo: ko.observable(), - loading: ko.observable(), - filter: ko.observable(), - cardwidgets: params.cardwidgets, - }); params.resourceid(tile.resourceinstance_id); params.tileid(tile.tileid); self.resourceId(tile.resourceinstance_id); @@ -70,9 +53,17 @@ define([ } self.tile(self.card().getNewTile()); self.tile().reset(); + setTimeout(function() { + self.tile().reset(); + }, 1); self.loading(false); }); }; + + var updateTileOnInit = self.tile.subscribe(function() { + updateTileOnInit.dispose(); + self.tile(self.card().getNewTile()); + }); } ko.components.register('new-multi-tile-step', { viewModel: NewMultiTileStepViewModel, diff --git a/arches/app/media/js/views/components/workflows/new-tile-step.js b/arches/app/media/js/views/components/workflows/new-tile-step.js index 00cc1b0cf9e..2878b6f74da 100644 --- a/arches/app/media/js/views/components/workflows/new-tile-step.js +++ b/arches/app/media/js/views/components/workflows/new-tile-step.js @@ -21,18 +21,13 @@ define([ this.complete = params.complete || ko.observable(); this.loading(true); - this.handlers = { - 'after-update': [], - 'tile-reset': [] - }; - this.displayname = ko.observable(); $.getJSON(url, function(data) { - // var handlers = { - // 'after-update': [], - // 'tile-reset': [] - // }; - self.displayname(data.displayname); + var handlers = { + 'after-update': [], + 'tile-reset': [] + }; + var displayname = ko.observable(data.displayname); var createLookup = function(list, idKey) { return _.reduce(list, function(lookup, item) { lookup[item[idKey]] = item; @@ -78,8 +73,8 @@ define([ graphModel: graphModel, tile: null, resourceId: self.resourceId, - displayname: self.displayname, - handlers: self.handlers, + displayname: displayname, + handlers: handlers, cards: data.cards, tiles: data.tiles, provisionalTileViewModel: self.provisionalTileViewModel, @@ -106,8 +101,8 @@ define([ 'nodeid' ); self.on = function(eventName, handler) { - if (self.handlers[eventName]) { - self.handlers[eventName].push(handler); + if (handlers[eventName]) { + handlers[eventName].push(handler); } }; From 5ca56e99982b9a0408c6f46cf841e8b9db8187ea Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 13 Jun 2019 16:02:56 -0700 Subject: [PATCH 12/18] fixes linting errors found by stickler, re consultations-prj #27 --- arches/app/media/js/viewmodels/card.js | 1 - .../media/js/views/components/workflows/new-multi-tile-step.js | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arches/app/media/js/viewmodels/card.js b/arches/app/media/js/viewmodels/card.js index 17495e5ad2c..0ee0b4a9f8b 100644 --- a/arches/app/media/js/viewmodels/card.js +++ b/arches/app/media/js/viewmodels/card.js @@ -30,7 +30,6 @@ define([ ko.unwrap(parent.widgets) ); } - if(!children) {console.log(parent);} children.forEach(function(child) { if (child.selected && child.selected() || isChildSelected(child)) { childSelected = true; diff --git a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js index 85ec7c053c6..be3cd3103d1 100644 --- a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js +++ b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js @@ -25,9 +25,8 @@ define([ }; this.edit = function(tile) { - console.log(self.tile()._tileData()); self.tile(tile); - } + }; self.saveTile = function(tile, callback) { self.loading(true); From ef6ce72cb437f3eaaa40c1c6a609d16977eefe35 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 13 Jun 2019 16:04:24 -0700 Subject: [PATCH 13/18] fixes last linting error, re consultations-prj #27 --- .../media/js/views/components/workflows/new-multi-tile-step.js | 1 - 1 file changed, 1 deletion(-) diff --git a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js index be3cd3103d1..e9f68b0a182 100644 --- a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js +++ b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js @@ -31,7 +31,6 @@ define([ self.saveTile = function(tile, callback) { self.loading(true); tile.save(function(response) { - console.log("failed"); self.loading(false); self.alert( new AlertViewModel( From 1e3b303f0ff3e8b5a49b0fe99145f260240fa860 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 13 Jun 2019 16:19:09 -0700 Subject: [PATCH 14/18] updates styling for generic names, re consultations-prj #27 --- arches/app/media/css/arches.css | 66 +++++++++++++++++++ .../workflows/new-multi-tile-step.htm | 15 ++--- 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/arches/app/media/css/arches.css b/arches/app/media/css/arches.css index 4c1f9ea256e..8254c97988c 100644 --- a/arches/app/media/css/arches.css +++ b/arches/app/media/css/arches.css @@ -511,6 +511,72 @@ input[type="checkbox"] { overflow-y: auto; } +.wf-multi-tile-step-container { + display: flex; + flex-direction: row; +} + +.wf-multi-tile-step-form { + display: flex; + flex-direction: column; + flex-grow: 3; +} + +.wf-multi-tile-step-list { + display: flex; + flex-direction: column; + flex-grow: 1; + padding: 24px 24px 0 24px; +} + +.wf-multi-tile-step-card { + border: 1px solid #e8e8e8; + border-radius: 2px; + background-color: white; + padding: 15px 5px 15px 15px; + display: flex; + flex-direction: row; +} + +.wf-multi-tile-card-info { + display: flex; + flex-direction: row; +} + +div.wf-multi-tile-card-info div { + margin-left: 12px; +} + +.wf-multi-tile-card-info-details { + color: #5d768f; + padding-left: 12px; +} + +.wf-multi-tile-card-info-details > h4 { + margin-bottom: 2px; + /* margin-left: 12px; */ +} + + + +.workflows-ref-number-card div div { + margin: 0; +} + +.workflows-ref-number-card > div.card-info ~ div { + display: flex; + flex-direction: row; + color: #4f9ce9; + font-size: 14px; + cursor: pointer; + height: 32px; + /* align-self: flex-end; */ +} + +.workflows-ref-number-card > div.card-info ~ div span { + margin-right: 6px; +} + .workflow-nav-controls { width: 60px; display: flex; diff --git a/arches/app/templates/views/components/workflows/new-multi-tile-step.htm b/arches/app/templates/views/components/workflows/new-multi-tile-step.htm index 3a82e47164e..1aa5f55f081 100644 --- a/arches/app/templates/views/components/workflows/new-multi-tile-step.htm +++ b/arches/app/templates/views/components/workflows/new-multi-tile-step.htm @@ -1,10 +1,8 @@ -
    Click to console card
    -
    Click to console Card tiles
    -
    +
    -
    +

    Add Reference Number

    -
    +
    -
    -
    +
    +
    -
    +
    From 9fd43006b0edbf363d067c8db485cf2bc2d0b19a Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 13 Jun 2019 17:41:32 -0700 Subject: [PATCH 15/18] rm DS_Store files, rm commented code in card.js, rm unused imports from new-multi, re #27 --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 1 + arches/.DS_Store | Bin 6148 -> 0 bytes arches/app/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/css/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/css/plugins/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/img/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/img/icons/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/img/landing/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/img/sliders/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/js/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/js/viewmodels/card.js | 4 ---- arches/app/media/js/views/.DS_Store | Bin 6148 -> 0 bytes .../components/workflows/new-multi-tile-step.js | 9 +-------- arches/app/media/plugins/.DS_Store | Bin 6148 -> 0 bytes .../app/media/plugins/cube-portfolio/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/plugins/layer_slider/.DS_Store | Bin 6148 -> 0 bytes arches/app/media/plugins/line-icons/.DS_Store | Bin 6148 -> 0 bytes .../media/plugins/revolution-slider/.DS_Store | Bin 6148 -> 0 bytes arches/app/models/.DS_Store | Bin 6148 -> 0 bytes arches/app/templates/.DS_Store | Bin 6148 -> 0 bytes arches/app/templates/views/.DS_Store | Bin 6148 -> 0 bytes arches/app/templates/views/components/.DS_Store | Bin 6148 -> 0 bytes arches/app/templates/views/graph/.DS_Store | Bin 6148 -> 0 bytes arches/app/templates/views/rdm/.DS_Store | Bin 6148 -> 0 bytes arches/app/templates/views/resource/.DS_Store | Bin 6148 -> 0 bytes arches/app/utils/.DS_Store | Bin 6148 -> 0 bytes arches/app/utils/data_management/.DS_Store | Bin 6148 -> 0 bytes .../utils/data_management/resources/.DS_Store | Bin 6148 -> 0 bytes arches/db/.DS_Store | Bin 6148 -> 0 bytes arches/db/graphs/.DS_Store | Bin 6148 -> 0 bytes arches/db/ontologies/.DS_Store | Bin 6148 -> 0 bytes arches/install/.DS_Store | Bin 6148 -> 0 bytes arches/install/arches-templates/.DS_Store | Bin 6148 -> 0 bytes .../arches-templates/project_name/.DS_Store | Bin 6148 -> 0 bytes .../project_name/management/.DS_Store | Bin 6148 -> 0 bytes .../project_name/media/.DS_Store | Bin 6148 -> 0 bytes .../project_name/templates/.DS_Store | Bin 6148 -> 0 bytes arches/management/.DS_Store | Bin 6148 -> 0 bytes arches/management/commands/.DS_Store | Bin 6148 -> 0 bytes cypress/.DS_Store | Bin 6148 -> 0 bytes tests/.DS_Store | Bin 6148 -> 0 bytes tests/fixtures/.DS_Store | Bin 6148 -> 0 bytes tests/fixtures/data/.DS_Store | Bin 6148 -> 0 bytes tests/fixtures/data/csv/.DS_Store | Bin 6148 -> 0 bytes tests/fixtures/data/json/.DS_Store | Bin 6148 -> 0 bytes tests/fixtures/v3migration-pkg/.DS_Store | Bin 6148 -> 0 bytes .../v3migration-pkg/business_data/.DS_Store | Bin 6148 -> 0 bytes .../v3migration-pkg/extensions/.DS_Store | Bin 6148 -> 0 bytes tests/fixtures/v3migration-pkg/graphs/.DS_Store | Bin 6148 -> 0 bytes .../v3migration-pkg/map_layers/.DS_Store | Bin 6148 -> 0 bytes .../map_layers/mapbox_spec_json/.DS_Store | Bin 6148 -> 0 bytes .../map_layers/tile_server/.DS_Store | Bin 6148 -> 0 bytes .../v3migration-pkg/reference_data/.DS_Store | Bin 6148 -> 0 bytes tests/fixtures/v3migration-pkg/v3data/.DS_Store | Bin 6148 -> 0 bytes tests/ui/.DS_Store | Bin 6148 -> 0 bytes virtualenv/.DS_Store | Bin 6148 -> 0 bytes 58 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 .DS_Store delete mode 100644 arches/.DS_Store delete mode 100644 arches/app/.DS_Store delete mode 100644 arches/app/media/.DS_Store delete mode 100644 arches/app/media/css/.DS_Store delete mode 100644 arches/app/media/css/plugins/.DS_Store delete mode 100644 arches/app/media/img/.DS_Store delete mode 100644 arches/app/media/img/icons/.DS_Store delete mode 100644 arches/app/media/img/landing/.DS_Store delete mode 100644 arches/app/media/img/sliders/.DS_Store delete mode 100644 arches/app/media/js/.DS_Store delete mode 100644 arches/app/media/js/views/.DS_Store delete mode 100644 arches/app/media/plugins/.DS_Store delete mode 100644 arches/app/media/plugins/cube-portfolio/.DS_Store delete mode 100644 arches/app/media/plugins/layer_slider/.DS_Store delete mode 100644 arches/app/media/plugins/line-icons/.DS_Store delete mode 100644 arches/app/media/plugins/revolution-slider/.DS_Store delete mode 100644 arches/app/models/.DS_Store delete mode 100644 arches/app/templates/.DS_Store delete mode 100644 arches/app/templates/views/.DS_Store delete mode 100644 arches/app/templates/views/components/.DS_Store delete mode 100644 arches/app/templates/views/graph/.DS_Store delete mode 100644 arches/app/templates/views/rdm/.DS_Store delete mode 100644 arches/app/templates/views/resource/.DS_Store delete mode 100644 arches/app/utils/.DS_Store delete mode 100644 arches/app/utils/data_management/.DS_Store delete mode 100644 arches/app/utils/data_management/resources/.DS_Store delete mode 100644 arches/db/.DS_Store delete mode 100644 arches/db/graphs/.DS_Store delete mode 100644 arches/db/ontologies/.DS_Store delete mode 100644 arches/install/.DS_Store delete mode 100644 arches/install/arches-templates/.DS_Store delete mode 100644 arches/install/arches-templates/project_name/.DS_Store delete mode 100644 arches/install/arches-templates/project_name/management/.DS_Store delete mode 100644 arches/install/arches-templates/project_name/media/.DS_Store delete mode 100644 arches/install/arches-templates/project_name/templates/.DS_Store delete mode 100644 arches/management/.DS_Store delete mode 100644 arches/management/commands/.DS_Store delete mode 100644 cypress/.DS_Store delete mode 100644 tests/.DS_Store delete mode 100644 tests/fixtures/.DS_Store delete mode 100644 tests/fixtures/data/.DS_Store delete mode 100644 tests/fixtures/data/csv/.DS_Store delete mode 100644 tests/fixtures/data/json/.DS_Store delete mode 100644 tests/fixtures/v3migration-pkg/.DS_Store delete mode 100644 tests/fixtures/v3migration-pkg/business_data/.DS_Store delete mode 100644 tests/fixtures/v3migration-pkg/extensions/.DS_Store delete mode 100644 tests/fixtures/v3migration-pkg/graphs/.DS_Store delete mode 100644 tests/fixtures/v3migration-pkg/map_layers/.DS_Store delete mode 100644 tests/fixtures/v3migration-pkg/map_layers/mapbox_spec_json/.DS_Store delete mode 100644 tests/fixtures/v3migration-pkg/map_layers/tile_server/.DS_Store delete mode 100644 tests/fixtures/v3migration-pkg/reference_data/.DS_Store delete mode 100644 tests/fixtures/v3migration-pkg/v3data/.DS_Store delete mode 100644 tests/ui/.DS_Store delete mode 100644 virtualenv/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index c914e5e6541aabd4a1ea67827cfc1d47731953fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRW;41H7D5n(in5uJD329#OWBdV~dPItt`%^D)zY;+^T4y8CjBk)x#hm9DBCbI$A~ zoh#hqEzWAD-Mh6UrWEs>iT9i%e29s<^E#el%R8)St{Ek zT8yCKw5PT%Gi($!9Ko88U^@rvP(s|D`O~-@Ayahi3^)T_29ES{BK80F=l;JNNIik>>%7mC1Hj1=R{EtAS L!Id-crwn`nM=MK5 diff --git a/.gitignore b/.gitignore index 5295a201c53..72e51eb55d4 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ jsdoc.json migrate_graphs.py djcp.sh .vscode +.DS_Store \ No newline at end of file diff --git a/arches/.DS_Store b/arches/.DS_Store deleted file mode 100644 index 032dae8eda8a427380c051ab981ccb637616c9f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5Pd@!9Xw& z3!K=+5lp;$X+!?Ja7D))S1MRO7A+Dm9oa;zP*Aw3lF z7C}5!yu}bpr$2dI?U)TM9pW8^_><4giGP6zo zG$mHSKrryn7?5i7yjk<3{A~U4d3x3+ju#FUjmxS~s822dT);>J`-u)fMWo{|YUY1&&PkG>piYzhcyZ5wabn zakx&W8~BlKi8n4?;eEWy9J%&AIRnmsGvEx&g8{zTBI_$d@0|f>z!^9*AooLL6U-C# zhI)0d(-MHVpjw4vsU;*PCd?D|hO|(Eg%T|^q!J@oIQ234Qc`Qs3uIRnnXKVu*)c6Yli50&25U&oWTHnQEb siHKh>0}98Zp8!te9=TSd*`ti>#bL}Jq=%XbBC5LM*_T%gdRst_nr)O~hbyWlMP*C&B(^7? zS;R2_S)Fzdz!E@1SH!o5scBt(VzbEH5Jj)C?Ou+@PP6kUT?FOMu|@p()CLvaxh0TB=Z5%@0z*t6YM7frQ_fCz}d7Xg1i6uN6o z9h=6hgG-D6)Q;gWUdJp!EgqoO)UhceG;5{QR%$t7SSx3|WL`}jo3?UT4j+~$TTUnz zr}O?L(qXl!RuK?^DFL6oX>0HQ*Yt(?-*aRlAOe4sfOXrO?S>DRy><4O-fIi}mi}qX ojdU*2imB0x`NLcB<+r@z*W9nEW78;SJj$v15O6Ls5%>)PAC|2jdH?_b diff --git a/arches/app/media/css/plugins/.DS_Store b/arches/app/media/css/plugins/.DS_Store deleted file mode 100644 index 1da97fe816bf4d5c62e97b0d6f9683cb384f3664..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyH3ME5S)b+kpL-W%KL#7{J|+ozJMRd!$A}gmPkVFF2Bv}1LVkxl!^j&t=;jh zckbjVyj}n@KQ+(51i+ZCh_i;F>2vjg-9<)GY>x&rY;eMn*KMZUCvrZp#yk4_mg_@v z*zPxNyVuPg@rD+k*s*xV_{wXCEsp)7+fL1@R3H^d1yX@j;QuPXo~<^1aLkwrqynkH zj{^FAD0Iad*g4v#gTY1s;)rQ8-rFoeESezJz|N5wnmCo{REZHooX&iSx*FIyIvrvs zbDua_VnPu+o%v$rkm{H*6-Wgx6}b21MEn1eer5i@B;_gEarTr=&gg7 w(_UNXEBd#w*2)>I6%(x$bD^zx+N&#i&*wF;b2K{hMknTvfa;Q#3jBrwUuVM|-v9sr diff --git a/arches/app/media/img/.DS_Store b/arches/app/media/img/.DS_Store deleted file mode 100644 index 4ed92f36d2cba57aa534140b5a1e09fd38cd62eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5PhaW1XV&^vh)R5aD%8SC*T4kO;jqAljssvQu`7WN^J3lY5jfO zZ`-QtS}8l{hGc6ed{Q3KOpO^{(V)d?s=UUYDaAKQbVI)~@Uy4fO(PaK(3B*(QxzWY z!8HcXDn^w|-TqG7Q?+N64eLx+%ox{;db-vn{uEY|F<=ZB1IECa7~q{PEng~{GzN?T zW8jAYIUhW`U=eXt3`Yk=cmfbJszc*g-VzeyBNh=yMOxULh7vW@#V3Z-aO!>ZD{cM9j;I`X$%+xDFX|guH^oI;$LR=k)MXx%os2R{uu)<+dOa9 z+*G_<|7=h0TF?H%E=~MK8L)Ajd<1YJ=g569s@=<&enrGlQL>0WgcI#UAP{207&rq1 EU%T5yO#lD@ diff --git a/arches/app/media/img/icons/.DS_Store b/arches/app/media/img/icons/.DS_Store deleted file mode 100644 index 0d0411424a8044cd39848a416b35afcc55543396..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~K~BR!3`M`8RF&9t$#Sm14MtTt0T%$;f{-EwDe68uuFbc{RH>qDS)gyp^HYyK zqr6321F+rs_y}wPZ0N4|_GNCq?>@7ejNDQ!&KQovp?mB5ZkD?g@Y*}Pqr)pca8?icvMDhe;)14#&?i3lRlU&Xt48Z)+q5}hCw4H}=kv+MQj z>ZUlK&CHkYyIZq`nGJBFeQ=l>_vsUxRfOm~V|zI485``Swk`s>GuztJ?)b1jnb)rToAO)nrw*ve=G&r#rj*0Qo=Fv+48w0>zI3^+j^P~ck>eXU+(h+Z!*9*tQq?^ahIHzv*>QFpxN4!P4c~8_R z1*E{a0#~_Qu>Rk{f9U_uNm@w(De$ip@cHU~wZtn`ZJoRvYi)zC;mrAj(=ZPThA79t iD92c^9N$Dz<~7c--wVgYpd%i1pne9Zi%bgqwE|zUpctG0 diff --git a/arches/app/media/img/sliders/.DS_Store b/arches/app/media/img/sliders/.DS_Store deleted file mode 100644 index f064ceec0b4cc288758adb51a26e32082e6e6c98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ8r^I5ZnbKq0mrLzANMgPl%i#7YKLgzsE`5fp=eJDu7n%D>Wrvt@T0N@O54_x~$0W8)4*2F##9fXDy7*fp@Lqm>!NnTCt14AyF z%ZKKZH8&LXr{n&`>7q4|l@8E>O9yQCMl5aqKO%qG|Bb_-19ae@I-s-7(`JpA%h@`5 xO`Ej^`HcJyaGj3gqZsI;7(Z+juLitg*Ep|*2~uiDnm zFvAO4n%3C*!Ft0L_Ehd@+~aL%n&L>+=4-??-l<&U#%uXK*Q<(`s(WFQ$x z2L3Jse6v-m8^`REfn*>VI5D92Lt#^_13O2%I@nnWK%7u*!m-v88dC!6z|N5tig+l| zLnTTK@o?%(_|<`(qlZJH_>fq+FJ8n}XZ~XDklHc(WFQ$BGH~hBxxWAR{A5Op{9#DW zl7VF4pD`el<->BpL&e+r?Rfgu7Pdz=74_?MK;d}s6TpeyBe!OBd(kod>cGxXv#8#} PiTNX7gk+Zt`~m}?YPB;* diff --git a/arches/app/media/js/viewmodels/card.js b/arches/app/media/js/viewmodels/card.js index 0ee0b4a9f8b..212ff3faa0c 100644 --- a/arches/app/media/js/viewmodels/card.js +++ b/arches/app/media/js/viewmodels/card.js @@ -374,10 +374,6 @@ define([ this.isChildSelected = ko.computed(function() { return isChildSelected(this); }, this); - // this.isChildSelected = ko.computed({ - // read: function() {return isChildSelected(this);}, - // write: function(bool) { return isChildSelected(bool);} - // }, this); this.doesChildHaveProvisionalEdits = ko.computed(function() { return doesChildHaveProvisionalEdits(this); }, this); diff --git a/arches/app/media/js/views/.DS_Store b/arches/app/media/js/views/.DS_Store deleted file mode 100644 index c7a667281f635033116ba821000678f41bdd6932..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5PhblieS?X5=&ozMQ>nLX8(fH5$C2KZ)6D{d8SGzN?TW8lJo+z*~zFl6i% z)78Ntl>o#g)u~aIT0&xc#*ndBq=n6CC{aUQE-{>jQ}451$k;1tI9x71TweL7cyVcU z=J&}RE-2b)3>X7r1{OM9%lrSxPiC^nABWh?7%&F@83S&)d)jSzsQkA6I-b0>p8c6! rn)vl1uu&fU1aKnv$bB-Z-HS}Wkg->kETT{0MEem)gxFvV`~d^s*hn_$ diff --git a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js index e9f68b0a182..2b03db5ebdb 100644 --- a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js +++ b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js @@ -1,15 +1,8 @@ define([ - 'underscore', - 'jquery', - 'arches', 'knockout', - 'models/graph', - 'viewmodels/card', - 'viewmodels/tile', 'views/components/workflows/new-tile-step', - 'viewmodels/provisional-tile', 'viewmodels/alert' -], function(_, $, arches, ko, GraphModel, CardViewModel, TileViewModel, NewTileStepViewModel, ProvisionalTileViewModel, AlertViewModel) { +], function(ko, NewTileStepViewModel, AlertViewModel) { /** * A generic viewmodel for workflow steps that can add multiple tiles diff --git a/arches/app/media/plugins/.DS_Store b/arches/app/media/plugins/.DS_Store deleted file mode 100644 index 28699a500ad314b988b679110ee57a9d7c33efee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%Sr<=6g|-{ii*^o%ltqW{=rb{7x)2cI~58;Bb`=oH=pjg4`l|&tyH-el9Sw5 zG6yEf1&|iU`VN=@n6e2b8H|XiM@?t$JRv5{F~=(k_Bh~WB+)6VWbfBlg|q09WI ze5c4->?s%s27-ZL;4d@4J6mLWX&8Ml5DWwZUku3kkl6$)$IeiX4t81s5ak)I!m-p6 z5|bS($Ig%zO0rO*g(fdCl7&;B-LG=&3@seVi;v_he-+hLT0}8cvLdfD#g2Fz^cud;r%gFU|k} diff --git a/arches/app/media/plugins/cube-portfolio/.DS_Store b/arches/app/media/plugins/cube-portfolio/.DS_Store deleted file mode 100644 index 06096595da585d1d6b97c6322cb077b40204b610..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%WA_w3>-B%1WF*s9`_ge2TMr5pg)j@8z{JOX_~ul{q2k%Eee%;<{v(q(LVu0FE6h$xEP@s183_{5%gn`!PGJDjk^3x@eEUePtj zUAyhNRxg{Q;k8PABlW;C8#+li3~9I3O;#$93Zw$5Kq~NG6=2U+o83F+nhK->slbl{ z`h6&L#TwW<+NXnyjR3?c!)AQ8S%O$JK&*kiBO^5NRHCO!j2PnSjF;fmz~0f*Ay%39 zL}iHyMXWmG#psagm}@GK3S25M@$EwU{}cVn{C}C0yHp?*_)`kVboIPi@|B{uj$TfC vZK1E}-$t&{xmYVES}W#8Tk*qySM-_ZHL!QIbjB^6m_GulOIj-M8w#8Ot+pQ^ diff --git a/arches/app/media/plugins/layer_slider/.DS_Store b/arches/app/media/plugins/layer_slider/.DS_Store deleted file mode 100644 index 37024914c060533b47b24076230dddc2f1ac4ab2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyJ`bL3>^7|A&twF`wRYq#W)`j@&h4u3O}&Hhl_OA<+n3>B;0WXcPU~Cq`B2< zZn-H=D*&>(ZkNCUz?`m#PYpxUef5EjA~PY1zGHKIJD-o5oyFEoQ0^ETG-$R>m%qm| zu6V}ZflWoCT>sDv%1K0;#~AD!`ttHh*x;m;AvM`mc^RH9QQMhtN}^CjwPVC(2~NDLnmCreBy zVyE-{#mXVoF=Hx_3iK5i`*NZE|B3#~{NE?#Diuft{*?kUS--4T{G{lugOAf*Tj;O! qZ)2^MGgvDoS}W#4Tk&J3uIMxOYhdeWbmomt%!`2Pl9memg#urPQ6YQ) diff --git a/arches/app/media/plugins/line-icons/.DS_Store b/arches/app/media/plugins/line-icons/.DS_Store deleted file mode 100644 index 9cece3944ce42846b18a2667737eb7dabc6f9943..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~JqiLr422VaK(Mj2oW=uqgF*BJUO-f=#4Xf*j_%73f~&QNyg>41GKsQZv9l2o zUEPmMk(r20;HI*$&@;t;EGOyYA~(4nuZQ!#>&{*^$Xcs`<2PQ<^O!;cBtQZrKmsK2 zLj>&JhE1lSj3ht;B=96)?}q|6t*I^4UmXZO0zgMdyJ79K1hiNJT2osnGBAx+Xtb)2 zA(r=cXvw;o+CrmUG=~q(e^#4fU>fbB1sj-F7X}g_fgXWj>}PiWZ{VNi|6U8XBtQax zMnFgF?RtfW%DeUL@hrc~tgRay>g5P89|73dRXm5g;k?)aT2osnGBAD!I0gn1_$q-1 D9xM}~ diff --git a/arches/app/media/plugins/revolution-slider/.DS_Store b/arches/app/media/plugins/revolution-slider/.DS_Store deleted file mode 100644 index 24bf0428d9fe21d9920ad9d6cb7dfc7fc6f27b72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%Sr=55Ukc5B3^RLaelyqe=vmP3;Y4mfC!5bL+*R>yZp3NKM=zv7r~2ELwC*e zcI_~A*xm+UtHbslSOA#Q9r5X5YX01PVpo+hBAxFTaKH;*@wVMhs?R5!dxH<`afkPx z{O93mw;Rrrl$8QfKnh3!DIf)Yt$_Dl+WaC5X)v#9lZiGDEYZ5|e5*Vp!6dZ&lX|$Hb(=YWT1^*=j?0&UZZE11}ixhTWw4bi%n;cqQu@??3sQ z-P87Q7`CTr%1Qw#AO)m=6p#YHRKR;LZGN4oC*bB$R_;fJD2tb@M z9maLc62#^SVlNyMnW0%yiAl8@F)ZoKx2o%fV`9=_HGEi|Y&D@+oX+>RD2Me#MJXT! zjup7f?ZW&2E&a^=e@xO&3P^!}rGU-Wck30eRK0a_Iq$WNeoyzB1Ko}5pfE%`CPq8v g#@q2Sin6Zxn$LUTm>6{CgHF`Xfa@ZY0)MT*7aTqnwEzGB diff --git a/arches/app/templates/.DS_Store b/arches/app/templates/.DS_Store deleted file mode 100644 index 6dd7c4e178a147c0feaa51baeb97ad818570992f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5Pbt_R0$Scvh)?WK~%LT-~zO?f=HpM8YtTwoj0BVB_eB7(75uv@%(H* zsdfxNmhZcJU;$vxt|+QZG&N7Ut~|ITO0LoDx~FE_w#`JD%QWfQXV~Kv8`K!BzohxZ zU(4PNH&)<G_<=7kMqk|$p0f+_7xlz}*gytm2%CR@3 zhfOS%XsO~)46$_DlgCw#y`iN;{P7_^^Vj1=^6adiayXgdr17ilRZMe|;f6c$l zr57A;mIJ+Xy`~K^qsnyw;Rrp0p7c7%Bi86 z-p~&FS9E!`YnqCazMvOOwQ%XC<~@whhY%cN%kD~#B*{6 zoB?Oxw;4dqW=U=oy>$kh0cT)ffWHqB%9t7Uit_0|BUb?63T6@X`7XgR(J(XY6)^(| z8Vc0VU{{Qw;jl;Z%M5!(4X0q2k6CAc!l0(iYLc5YZ_O55+ zj1)TyKvw7G5m*A4vnh%WMoitKp_{z8B1+0}Y>wORHO6iv%`{!Q_d9H{!6zCN`(Mzp z!6~&X4rqtr9nSb5_k=e@jt1;K8Ij@0JT21~;fe`6^7rHpm=!K`HVm~)U9c7mMW%Yk zj_k-;5uT>RzAIP26>tSyfr%-=J6mmjZ|J=%;0m|`KMLsi5ZDy!jJ;txI@qNWfH|s% zfl`56n=bYKf8r-ITI81$pSc3Az&}$!X6xtmiZ7M#)?crucWq#MVN=s}y$)y`7e4`< h=sEI`f))=t=DIp#Z>U++pXfyY5lDh~=L-CR0$f2siAY%SAs!)QZ+P#_feP(bg8#Hv_2 zc82-tV3Sh-;)Ld0*w3p3{6x-u(7n9D|mxJ^aNhO&z37&i2YWc%cJ@7L6Fr(u#p!?-b^NMmVL!$ zBOG@qz9l!`dkb-j0FZj{24G^XjI_W3OoSgO%;~_ diff --git a/arches/app/templates/views/resource/.DS_Store b/arches/app/templates/views/resource/.DS_Store deleted file mode 100644 index 1bc6e7d85955a0ed87a618eee2a8df282b33b569..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKF-`+P3>-s*BGH77az8-94^~ll0UrQz6i6qXlq3Ch`8H#FL4*qh4F!xPdv<5- z+uRiA7=W$!-7T;Ju%tWU;9+il?mn}##yDC$W5BK(xBb&F^t0^Kgx6l+8695miZAt7 z*zu^xBab}gCiWxK_FQerjX%8Z^p6lL1*Cu!kOETRA1T0|?Y6v3RFnczKni>);NOQr zcdQMk#Q1bD#0WrKkPhQIW(i_(f>;|)iDYP&rNk_?Hey(olP@i=Hk=Z(92Ph8Iqha^ z6N<&{CV>exStv?4Nx8_KsWQ?q;Xi9KXQfpFA#l@D3VC;WYqeK}yMT!2w3Kn17(6`%rC;3fsE_rm6nfn2Eo6`%sY3fT9dzzu8S80eo4 zEItAN8-(4k_gMm1EC8&DV;~|h4Jt6Gnj?k=9r2QRHE|3Kx@Zm`nori8P}HA}`o+^l zYamxDKn2bfn8mTR{{IZWGXI~Gc%lMS;9n`AP508R@JiWRCogBcw!q)umh%HQ!`>-a myd49*9phl_ca;(5S$@6*vK%iWg`A diff --git a/arches/app/utils/data_management/.DS_Store b/arches/app/utils/data_management/.DS_Store deleted file mode 100644 index cfac782ba1731b1524c2736d0647b5b0ff51d06e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5PgO&f>@9xOJ9K-L{&Kf2jJ5nK&nWZP}V*=Z$3dp%^FqJjAXyD=M(!$ zu{{9N`q171HGqmuFp07tGQDWJaOV{(!B~GBKHJX6YF>V2>TM^wc_h;{z?T4)a{6$W^Q< z7zhS}fneY~7~q{PQe7KH9}ENo!N4yAaz11>!N#!|>e0bYO8}xgqgAL&Eg>=4v2iSh zv`~_T5-l`&iIFUv^V$6x$6{#VNM3v-|MFD4B>g(`XLUzv45JSQf`K^$mo}{B{=erh zvsmQMLt+#R1OsQrKw51cHfwIm@7AO3$z7Y-p4ddhuZTjSK6?akAm_-f8qJ-rwBBe>0a({t8SViFr@&iDkR6!>Z=&$0t_%y~3A)*TvN`uCdJ-a^7 zt#*p@8GxEeL3OWI~*|J6)!*e z!|^gfSt%d|q<|EV0#e{l3V83O%@>J^Qa}nwfo}!;`_Sl)y>Lv7PX|Mc0K^&7VO+;7 zL2RBN_QEld8JZ=Pm{h9~!;;Q?tGZq|CMF$L!-v($RuhWF>3n~Sa#&APlmb%VT!Gu% zF1`Oh(0`f#&q>-z0V(jW6tLN5yIJ!})mtZ*^IqHNk94p3q`Pq)6ozQW#AwIdcspK2 cQPwqI^LZ~E6NAot(24pPa9w0l;Mxj&0l|nBq5uE@ diff --git a/arches/db/.DS_Store b/arches/db/.DS_Store deleted file mode 100644 index 6fa43bf8019e018cf1815ac6950b86d3f82e77e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOK!q25PdGFpmtFfU3BRy^ac^4C+GoaOCpMt64ZnRyBxi5JVS+P)(BN&$@3=j z^W-7y7(kfs%V%H)V9F^NL>U-j9(3JU@Prto#;X2knp&*4=DK>2-bX0$g}Q7{`(NW5 z@7UoJ?Wtpe4Yp{}(OKs?k1Vo*=5^E>1}-Ugs8X$?Evt8z!aB;DbIr8se8Cngc2TkV znd^al98xdhTvDspmn^eorEHn2{~f$RXTTY72AqM*F~Boh#`Ip%r8D3RI0L^7$o>#H z1q;JoF>M_b=?Xv`)0_r%xl2e+G%O5zMS3`brV=$Z*cBsaI_=To3d3Ge(-G|Q5p3n- z-bU38(PKx4@}Ua!5@ zPH{d1D4XMO53B)nR6~5(vJ^WvUC32>42$2<;|;Gk42OQdh`#Kw+zvZ@;sqa=(*QcI2)CDQ4y8P^i0z(_~&%Dg8l zmz+?FSEs*vI7$oDDh9;BIRn?RU0eTup#C!dpC@T22E@R>VxX+HkJ}BOl)ZKFIP0~Q t`b<3uV?CUUw_>8VVs5Mz-_7Ex**tHFQ=q5Q@99MS2pBICG4K}*d;=}$9%cXl diff --git a/arches/db/ontologies/.DS_Store b/arches/db/ontologies/.DS_Store deleted file mode 100644 index 45479fb9ef73e53856e771c971ae390220a74e1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ8Hu~5S?*U*rZXJaHQ^ z_E`d0ECH;EQy?-h4Jt6Gnj?k=9r==VHE{|Ix@Zm`nkQ>cDC(!<{l&{gYak;PpaOFR z9%9>C|3AThnE&S_?x+A2_*V*Ob9_D?aHZ_6i_2NBE$~;k)!g7_SUUy5+cD7FF*eqY epS&pQimmayCQgA)N8af`{tTEdG%E1d3fut{9TjH) diff --git a/arches/install/.DS_Store b/arches/install/.DS_Store deleted file mode 100644 index 834bfb8125306904af03c27a7f1f1b4ffea46c5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyH3ME5S)V)5i~9-?*}OO11kz&zz6V1B7t-eghTI+-)8m!Bywme(5$pOzP+70 zc?z!=Kv}%6uYeA~oNkB@3sbXw^NF2g#<2Jq8w|L_4jVjAs*fj(+uSmBYpAO0&E z^LEy-9#-vPyKQ#F84I6qOMhYUjwKCkzu@>i%1Qw#AO)m=6p#X;0DHFC{5()m3P=Gd z@U4J-A1d9jPaFgN)4|{)0CC2&8=rlaAXZBd`@}Jj8CnS{F{mX+j1qL_Yu5FNV_?ux z{AQk$HzB^>UOxP*DmPNtIkx7BSP~a0&86Iu` diff --git a/arches/install/arches-templates/.DS_Store b/arches/install/arches-templates/.DS_Store deleted file mode 100644 index 199877981542009d0bf03a8469e536a5430370a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKIZgvX5Ud6VmLPCQIA7ogBg?#i2XNRzc3mycdp%L1#YbMEwl7E;1?b*9v?A<|P(Q diff --git a/arches/install/arches-templates/project_name/.DS_Store b/arches/install/arches-templates/project_name/.DS_Store deleted file mode 100644 index 5d60b391ac41d99bf056231c213abfa11fb01ba7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!A`?441IwjRyeRD$Na+npqj=P@BuK^F(GyBq;^8w`sqA7W?P}>X+n)QuWTF1S23KcFRrEi*~f z3$-tCKG@Q!)|HQw{=p%m^;v;9k8Te-mglzG= zm~&HhxBl6l+_jPNN|7dhy(nzd2Oj|($T{+;lW9JRPQSviPbjO1UBij~A)thK=M0>I Ffp6=1MD+jw diff --git a/arches/install/arches-templates/project_name/management/.DS_Store b/arches/install/arches-templates/project_name/management/.DS_Store deleted file mode 100644 index d6d56cf25c633dbbd4e32d8cc0f60e7970894fdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iw;5S%3`EYYN-d{^KGPf<8QE&#+O;3A@T#kn{dvmYTMI}!~InzeT4z4gws zJcZW_!1nLsJ+K2X&>ivNVQGHfePK71F(RF3JmC!^&g1#?vZ!89ICsDa6JB}!;6G2( zZ_ijiSy?F{1*Cu!kOER*O#$z{wBa^UQ3^-_De$d;e;*p%u@}yX@#$cQ5rDX5I*jX> zC5X)v#9lZjGDEYZ5|e5*Vp!6dZ&lX|=ftGLYWT2vvekrQ@pPWwq8!!}6{Ua_xKv=1 z+nx9S2l|!y|B|Gg6p#Y{N&(v*j)y&8se0?;<-FH6`Xk+IKIv{;2ZbTpF)`XPH{Oo# dqA2T{uX(>0&WS;1KIlaK47e^bDe%_{d;tyE6@~x+ diff --git a/arches/install/arches-templates/project_name/media/.DS_Store b/arches/install/arches-templates/project_name/media/.DS_Store deleted file mode 100644 index f4636617fb7770a57452b94eb231413725f2f010..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~JqiLr422WjLa^D=avBfd4F=H@cmYu>S+EfMIl3=Dh_2Qm@&d`rWF{>86+0Ud z(e>@L66r-`1~-+Zg^?-N6FJNEbUhA-%Vl`lpJZ-l;Ju9YpN=vm0TLhq5+DH*_z?nj zZ^LHuP(~6U0TOr+uYok-9|52p%5KPgmVg#3Kx=9XMFpnO3XN9vF~sWL z4lQ}Ernb;%7tP^A^T}#c3{0b4v|s_#>cT(*BrqZ{jdgGL{}%pf{vWk)NdhGBX9Tp{ z>^5t>RNk#`uV?jrRxNLEs2@jo`3bq+X#TU>6a&*}7cJPpw7M{m010#m^kYA<`+o)hH2-&6xFrD+ z_%i}JSgw}~JXGGTZ;xmBO=fM~;7~6|c=-sx#;)Qi+zsc&7SNj7LXm;-L%=aGkib_7 FJOF)`6QuwE diff --git a/arches/management/.DS_Store b/arches/management/.DS_Store deleted file mode 100644 index d6d56cf25c633dbbd4e32d8cc0f60e7970894fdf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iw;5S%3`EYYN-d{^KGPf<8QE&#+O;3A@T#kn{dvmYTMI}!~InzeT4z4gws zJcZW_!1nLsJ+K2X&>ivNVQGHfePK71F(RF3JmC!^&g1#?vZ!89ICsDa6JB}!;6G2( zZ_ijiSy?F{1*Cu!kOER*O#$z{wBa^UQ3^-_De$d;e;*p%u@}yX@#$cQ5rDX5I*jX> zC5X)v#9lZjGDEYZ5|e5*Vp!6dZ&lX|=ftGLYWT2vvekrQ@pPWwq8!!}6{Ua_xKv=1 z+nx9S2l|!y|B|Gg6p#Y{N&(v*j)y&8se0?;<-FH6`Xk+IKIv{;2ZbTpF)`XPH{Oo# dqA2T{uX(>0&WS;1KIlaK47e^bDe%_{d;tyE6@~x+ diff --git a/arches/management/commands/.DS_Store b/arches/management/commands/.DS_Store deleted file mode 100644 index b7a408845461bc8c0753ca41210b2e0d2c2955ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%Sr=55Ukc50wUz-ael!+7()C4Kfp&KA}&OTx$nvE^3$w-AS@dX9=u33bk|I8 z*A7#M?QHIO2U)eLCUXOT3Y}#p{Is zf&qu!VLLqT_rqzjvQj__NC7Dz1*E{Q74Y6mTV5n8N&zV#1-=#V??as*@T%h@sPzW~kv-c|J%F+7tAz++r3fYt=klu`} z=V9K$vP4ANpTk;YB_a#Bp`0zu&7Paj>?tz}gyS7Y`IN1E%ZCiJ>e~t9E>Yiu^*-VE zhp+urSL}sY~6`%rCfC^B7KPh0n7q(aiGExC5Kn1P}*!Q8p4Qt{U=${S*9|3?3 z(r#G$ECDQ*0M^7Y5E+;T6&O^_5krHHe95|+I0gn?G=~q(lQkz4_0#eG;^m?>kdX>d zfvEz|v0YjJe}&(f|EDDGr~noCR|;s;ZMqg$%HBG=ob}oQe}h}i1#X75QxLoz1HBz% gW9|6Gi=wXB8qaIu80d85oet#BfayY`0*_YU7uVPp6#xJL diff --git a/tests/.DS_Store b/tests/.DS_Store deleted file mode 100644 index ac3c099b0e9e236b59246b2def3b4f65805f17d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5PdGC3hJgymc9bw0#;Q{zy&BxfJlX)CM_&;bl!Lj#1OVsg=QrC+4Hmg zs@fRV z#fyupGry1Sa6!>}W55{5893AFLf-!y{$)ms{5-^F#(**K&lqsi)$MA@L#4O%*YV`7 w^=x-+BI4J}fWmS15x|MuBbU*rb}wW4g@nDLWD$J~C)$TVB*Z#n;0O$S0F$~z@c;k- diff --git a/tests/fixtures/.DS_Store b/tests/fixtures/.DS_Store deleted file mode 100644 index f6f89f789de317a5996c0477f02ea36e06567b00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5PgOSRj{B-mbm~6#08?NoPYyB+n_XR+Mp&yVwa=y#xtO#%^E5+Q`v7a zKRZvVodFPLhx`GU0+?_J22n;t%%iRg3%()-sgXCUYFXFSNRe|j$=(y>SfItCzyE90 z*wI*{;wVt!4NX7b7JD(#d7!qU{=%?5E4^cV9NN&lrK5^r%NVv}()zS&gHKj%>DaPj zLu~mgxtZd)>IWVfRNAr|Ov3_Hbmba09-05PFC3U%ovBque@3_C@7C_z(+ni{Od2%1iNYH^uir>N-& z)_eq8`MY@uadp;DV>m*l=(9863=A2#)W@mZ|4;nOj5hhh6n}CCoPmGFKuG4#^BG^t z?$(pnle;$Mc;yh0xK0!b^}$B~ALJali%#{YqBAZt>=dPn*kd};KLjEnJ~;!wz`z%Y C)j*2? diff --git a/tests/fixtures/data/.DS_Store b/tests/fixtures/data/.DS_Store deleted file mode 100644 index cc4d7fffba7035d7679ec0687674c59c4e9a1c3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKF=_)r43uIQhBPiy?ic)n#W*j>2SV)17++zM`l`GuPs@xXjLi|QN@GT#on5VF zmz(0WGBe+P9yVrcGh4xl_RV2x+^0|MsUk$@8T-@6Fq{}&*48YLyRf}o?CWs3X}7}B^gq}(gy28(e{-~-r-l_DTw@TW+p%IEUY{N_VI$RU**^9E+# z?(Do3dWA+KBDy%WZz3}hnZga_Y+-D6Za%W7%qS3!JHF&w8tH(?QT6SFap$rHYcK79 z|08SM@+k+zHO?Af(;l|n$8Oi%zKmHaKn17(6`%rC;9mu-_rj(xfs9mu3Q&Px1?>A! z;D$A^5A;t5f{y^e3DRy@`z!%0mH^hoJ`fq01{D}o%@IR`j(o|wn%D;hT{MRe%_nP4 zDC$qg{l&{gYak;PpaMe$o?|<+{{IgDWBwnKxT6A8;Gq=I$#S(^;FYqsj$Y1sZGms# uR&#-yVeJ$IZ^uAy$Jkgqe)XcLE4IdYP3!}mj=a->{24G^XjI_d3S0pfuo@x& diff --git a/tests/fixtures/data/json/.DS_Store b/tests/fixtures/data/json/.DS_Store deleted file mode 100644 index 13d12d3c7cf9dda29579b2b38d5f6fa87f24c5bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ8Hu~5S>X}7}B^gq}(gy28(e{-~-r-l_DTw@TW+p%IEUY{N_VI$RU**^9E+# z?(Do3dWA+KBDy%WZz3}hnZga_Y+-D6Za%W7%qS3!JHF&w8tH(?QT6SFap$rHYcK79 z|08SM@+k+zHO?Af(;l|n$8Oi%zKmHaKn17(6`%rC;9mu-_rj(xfs9mu3Q&Px1?>A! z;D$A^5A;t5f{y^e3DRy@`z!%0mH^hoJ`fq01{D}o%@IR`j(o|wn%D;hT{MRe%_nP4 zDC$qg{l&{gYak;PpaMe$o?|<+{{IgDWBwnKxT6A8;Gq=I$#S(^;FYqsj$Y1sZGms# uR&#-yVeJ$IZ^uAy$Jkgqe)XcLE4IdYP3!}mj=a->{24G^XjI_d3S0pfuo@x& diff --git a/tests/fixtures/v3migration-pkg/.DS_Store b/tests/fixtures/v3migration-pkg/.DS_Store deleted file mode 100644 index 74b1ff20cc63c1b993c4784dfc0b589085d1672f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKQBK1!41F2XG=^aN{_fRWAVC@{ryE3jkB9;OLUg36XixfsBGhCY|PZLx!5aHPV5%8P1UbIlF6YaNw!E zqI-S`_DIrtn{Uc8m#xouxL-78bQ9-Nu^_Ro`LGn2P3{ zX$##)!g0g*sKy8K?jkqp_^df(CtLR9bsKDV&e(=38!j|c#{OQj@A}J6@QM3VInMFK zY){63F<=b*o&nZuk?EC3YmEV8z!*3(Am4|GDi{ZBJ?f`}ja~tWW13aim%D_-L;>S~ ztw+vKoDU`XP#3Nk&WF<;1;038>(Ph9h0BKvE4y$*ak@J5N9qn2d$iUVFb4VzT=?Na z>i@&f_y2y7jf??f;9oJ|#;eEGl8+Q>>)_#})<)DPs)+ct9*-gHXep+zl;T^e3hj|} Vh;hKyBP|sBBcL=`V+{N$1K;Y5OzHpt diff --git a/tests/fixtures/v3migration-pkg/business_data/.DS_Store b/tests/fixtures/v3migration-pkg/business_data/.DS_Store deleted file mode 100644 index a2f7d7b8864b4294ae58ad70e74de0161ec260d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%Sr=L3_YLa^|%#0}ZjBelUny0pHM%<}{_Fm!{FKBSUp#KU- zrW!orjpY`v!}7J2I~Gnn?MS`HJBbH;42e@$XFe531yX@jAQkwR3UFqtEtZZMQ-M?< z75G*_zYm43SOa@U`*bka3P7AQZN{_h62zhjVh!vanW2fd61`Po#Sm|2z67rZ_Kw~T ziRDA$W{C|&>~=oC7#&g_Go}Kmz)%6*y=g0*|9A9>{a-n0sX!|5M-`CyX1iJQj|M$n@kV_dqHDkAs#kbNi{I<-uttXu zY};+KdF=a*Zs?LhD;l+Za+~Wz_Y-!^YUq9;2i?$pfj!MFo|$(r@o}&fs|*H$fnXpQ zI0XiHXRA!F3_}M4!9XzZ!+@R-iA^y(7Q=dUP}LHEsL$vs>}xHdImt0Q7DIX{VyQ$+ z6)!Qw(rHf~mmQ0tr9-^<5dZRb@gnu>oIllYNHz=|3S-CQF~1% P#zUYI5-J$@2L`?X!1XI5 diff --git a/tests/fixtures/v3migration-pkg/graphs/.DS_Store b/tests/fixtures/v3migration-pkg/graphs/.DS_Store deleted file mode 100644 index 74a546dde4b552e76191119a5c3d645c10213689..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyG{c^44j1&CsB}+a({t8SViFr_y8bxNECsSh|*ujZ!>-bU38(PKx4@}Ua!5@ zPH{d1D4XMO53B)nR6~5(vJ^WvUC32>42$2<;|;Gk42OQdh`#Kw+zvZ@;sqa=(*QcI2)CDQ4y8P^i0z(_~&%Dg8l zmz+?FSEs*vI7$oDDh9;BIRn?RU0eTup#C!dpC@T22E@R>VxX+HkJ}BOl)ZKFIP0~Q t`b<3uV?CUUw_>8VVs5Mz-_7Ex**tHFQ=q5Q@99MS2pBICG4K}*d;=}$9%cXl diff --git a/tests/fixtures/v3migration-pkg/map_layers/.DS_Store b/tests/fixtures/v3migration-pkg/map_layers/.DS_Store deleted file mode 100644 index a29dbf732f7aea084afdda3bc2d6f5e15705cc7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRX33>-rjmAc82<+}nmh^le|4p8W40SW|BKwW0XwHezFlqzM*0*xhm^8EZ! zW)a5#Z27*s1{wf!sv|z#OvUeACvs6ejutg~9I?g$FW66_&pSM~!4vM8v%xrj%Sw-| z)#G`0*mj$~@4UnUZ+Jk*2Ht3oSA4h~hn(*uuNV*mVn7Ut0WshVaAv#A7m2cBKn#e1 z9|rvUP^gY=#UU|19W=255NC9U@Hut~VsQtttvDpoL$ORHW~$W{!!n)zQsdf+Lt>`G zqBHB%&Q>=Ri|+K72#2+avSL6CoHB5k$HwRX4fU7(|1?P_F(3y16$3U~-L95=r8-+D yFXywiQ17VU!q^C>iBU|9QOtvn;;T_y@n_z*6^Fz~r$5q(`VnwmBx2w%82AEx*B@*E diff --git a/tests/fixtures/v3migration-pkg/map_layers/mapbox_spec_json/.DS_Store b/tests/fixtures/v3migration-pkg/map_layers/mapbox_spec_json/.DS_Store deleted file mode 100644 index a994bffb6978700d89e0614e4382c9a739e0b9b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyH3ME5S)b+mS|F@ykFoCtSEc|KR`n0f{d_0qI1V@Gy4cipjcf$}h zIt=*a(K`-I`pV+R!^<@ll>$;g3P=GdAO)@~z@F{a-6d+30#ZN<{3_tzhemho3#Y{R zba06gfVf~djL$Jk5Ss^xec_bI2+fj8Osdt0VM%AaRbF2>B_pjcf$}h zIt=*a(K`-I`pV+R!^<@ll>$;g3P=GdAO)@~z@F{a-6d+30#ZN<{3_tzhemho3#Y{R zba06gfVf~djL$Jk5Ss^xec_bI2+fj8Osdt0VM%AaRbF2>B_7#%BBGBb#N$Q2mUP9OPHNrIYihdOBg;C0L!b_`UKk$IGGJ zcU^15#!JqKC;7n@gU#uanWX|$fC^9nDnJFM6hO~5YnFkGRDcRlfu{oYeJF6ln%D>W zrvt%90N?^?H$3|+0W6jP*2F##8JGqY7*x#>LxYZd$-0`@2L@f#Z^k)!v*v`NemnBT z%SCG-BNd#>1^z;TJMu~#2mk;8 diff --git a/tests/fixtures/v3migration-pkg/v3data/.DS_Store b/tests/fixtures/v3migration-pkg/v3data/.DS_Store deleted file mode 100644 index 878c075942a405e82941196c30086b606df7a3f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%TB{U3>-rb6$sQL$NdHVU{$qW&<}vLDG#Y?5vBLs_-)1yP|=nv2e2c160awl z%pr~e$n?tr!!xo zt_BW{PKU(sA+fW>gd(;(?_aDOQXMm<0;#}v1$6eNO|<{d=|9Z>T9cLvqym3b0U6B} zvngLLdTaBV+G`8_p8jd9wQ>e)#YAhxywFyBb5vLKoa;4ka5OseMknTvfa;Q#3jBrw E9|i*^f&c&j diff --git a/tests/ui/.DS_Store b/tests/ui/.DS_Store deleted file mode 100644 index fccb272874d28f1447f1d35c91eee2a77386b863..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%Sr=55Ukb+fgt4Qael!+SVH^)KfqVS%W8zg``+@~RzD0`79l4OQVrd;)6+G> z)?s@afUUkZx4;s>obHH&hpG9#`@}9P<7jcl176Y7-|6R>bFcAnH2a71-=2&6B}0m diff --git a/virtualenv/.DS_Store b/virtualenv/.DS_Store deleted file mode 100644 index d1f5665778c3e302692ef2bed1b92ee5b4128c3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJ5Iw;5S)b+k!T_+%6A2BU`62sIRL*7+MW0I z?L5mnoqhL q*Fj;3c1(t0>C4=4+mJg=1pSnGZTqe+FC^nH2bI1-<}upBYI2 From 696ff1ba292439ab11b93228faeb25c1c4ff6cd6 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 13 Jun 2019 17:53:41 -0700 Subject: [PATCH 16/18] adds deleteTile method to remove method in new multi tile, updates css class dependencies, re consultations-prj #27 --- arches/app/media/css/arches.css | 6 +++--- .../js/views/components/workflows/new-multi-tile-step.js | 1 + arches/app/templates/views/components/cards/default.htm | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arches/app/media/css/arches.css b/arches/app/media/css/arches.css index 8254c97988c..f46c1391565 100644 --- a/arches/app/media/css/arches.css +++ b/arches/app/media/css/arches.css @@ -559,11 +559,11 @@ div.wf-multi-tile-card-info div { -.workflows-ref-number-card div div { +.wf-multi-tile-step-card div div { margin: 0; } -.workflows-ref-number-card > div.card-info ~ div { +.wf-multi-tile-step-card > div.wf-multi-tile-card-info ~ div { display: flex; flex-direction: row; color: #4f9ce9; @@ -573,7 +573,7 @@ div.wf-multi-tile-card-info div { /* align-self: flex-end; */ } -.workflows-ref-number-card > div.card-info ~ div span { +.wf-multi-tile-step-card > div.wf-multi-tile-card-info ~ div span { margin-right: 6px; } diff --git a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js index 2b03db5ebdb..059a9425077 100644 --- a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js +++ b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js @@ -15,6 +15,7 @@ define([ this.remove = function(tile) { self.card().tiles.remove(tile); + tile.deleteTile(); }; this.edit = function(tile) { diff --git a/arches/app/templates/views/components/cards/default.htm b/arches/app/templates/views/components/cards/default.htm index 095dd552e8f..c5ba6bb244d 100644 --- a/arches/app/templates/views/components/cards/default.htm +++ b/arches/app/templates/views/components/cards/default.htm @@ -33,7 +33,7 @@ }">
  • - + {% block editor_tree_node_content %} @@ -360,7 +360,7 @@

    - + From 087080e0768a4c5b4bdaa921b52cef3ec9d8c0d4 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 13 Jun 2019 18:07:41 -0700 Subject: [PATCH 17/18] adds alert message onFail for tile.deleteTile, re consultations-prj #27 --- .../views/components/workflows/new-multi-tile-step.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js index 059a9425077..c3c16c8e3a9 100644 --- a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js +++ b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js @@ -14,8 +14,15 @@ define([ var self = this; this.remove = function(tile) { - self.card().tiles.remove(tile); - tile.deleteTile(); + tile.deleteTile( function(response) { + self.alert(new AlertViewModel( + 'ep-alert-red', + response.responseJSON.message[0], + response.responseJSON.message[1], + null, + function(){ return; } + )); + }); }; this.edit = function(tile) { From 4505603121d896afb34a917818d50ac8426e3bc8 Mon Sep 17 00:00:00 2001 From: Galen Mancino Date: Thu, 13 Jun 2019 18:10:55 -0700 Subject: [PATCH 18/18] fixes linting error on indent spacing, re consultations-prj #27 --- .../media/js/views/components/workflows/new-multi-tile-step.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js index c3c16c8e3a9..5cc752e8d30 100644 --- a/arches/app/media/js/views/components/workflows/new-multi-tile-step.js +++ b/arches/app/media/js/views/components/workflows/new-multi-tile-step.js @@ -21,7 +21,7 @@ define([ response.responseJSON.message[1], null, function(){ return; } - )); + )); }); };