Commit d2eb6c93 authored by arturo's avatar arturo

>>> continue

parent b93fcabe
Pipeline #3014 failed with stage
...@@ -8998,6 +8998,9 @@ select.form-control { ...@@ -8998,6 +8998,9 @@ select.form-control {
.ngrams-tree-edit-real__actions .b-button { .ngrams-tree-edit-real__actions .b-button {
margin-right: 8px; margin-right: 8px;
} }
.ngrams-tree-edit-real .ngrams-tree-loaded-node a:hover {
text-decoration: line-through;
}
.loaded-ngrams-table-header { .loaded-ngrams-table-header {
text-align: center; text-align: center;
......
...@@ -8951,6 +8951,9 @@ select.form-control { ...@@ -8951,6 +8951,9 @@ select.form-control {
.ngrams-tree-edit-real__actions .b-button { .ngrams-tree-edit-real__actions .b-button {
margin-right: 8px; margin-right: 8px;
} }
.ngrams-tree-edit-real .ngrams-tree-loaded-node a:hover {
text-decoration: line-through;
}
.loaded-ngrams-table-header { .loaded-ngrams-table-header {
text-align: center; text-align: center;
......
...@@ -8707,6 +8707,9 @@ select.form-control { ...@@ -8707,6 +8707,9 @@ select.form-control {
.ngrams-tree-edit-real__actions .b-button { .ngrams-tree-edit-real__actions .b-button {
margin-right: 8px; margin-right: 8px;
} }
.ngrams-tree-edit-real .ngrams-tree-loaded-node a:hover {
text-decoration: line-through;
}
.loaded-ngrams-table-header { .loaded-ngrams-table-header {
text-align: center; text-align: center;
......
...@@ -8955,6 +8955,9 @@ select.form-control { ...@@ -8955,6 +8955,9 @@ select.form-control {
.ngrams-tree-edit-real__actions .b-button { .ngrams-tree-edit-real__actions .b-button {
margin-right: 8px; margin-right: 8px;
} }
.ngrams-tree-edit-real .ngrams-tree-loaded-node a:hover {
text-decoration: line-through;
}
.loaded-ngrams-table-header { .loaded-ngrams-table-header {
text-align: center; text-align: center;
......
...@@ -8956,6 +8956,9 @@ select.form-control { ...@@ -8956,6 +8956,9 @@ select.form-control {
.ngrams-tree-edit-real__actions .b-button { .ngrams-tree-edit-real__actions .b-button {
margin-right: 8px; margin-right: 8px;
} }
.ngrams-tree-edit-real .ngrams-tree-loaded-node a:hover {
text-decoration: line-through;
}
.loaded-ngrams-table-header { .loaded-ngrams-table-header {
text-align: center; text-align: center;
......
...@@ -398,8 +398,8 @@ type Props = ...@@ -398,8 +398,8 @@ type Props =
type LoadedNgramsTableHeaderProps = type LoadedNgramsTableHeaderProps =
( searchQuery :: T.Box SearchQuery ) ( searchQuery :: T.Box SearchQuery )
loadedNgramsTableHeader :: R2.Component LoadedNgramsTableHeaderProps loadedNgramsTableHeader :: R2.Leaf LoadedNgramsTableHeaderProps
loadedNgramsTableHeader = R.createElement loadedNgramsTableHeaderCpt loadedNgramsTableHeader = R2.leaf loadedNgramsTableHeaderCpt
loadedNgramsTableHeaderCpt :: R.Component LoadedNgramsTableHeaderProps loadedNgramsTableHeaderCpt :: R.Component LoadedNgramsTableHeaderProps
loadedNgramsTableHeaderCpt = here.component "loadedNgramsTableHeader" cpt where loadedNgramsTableHeaderCpt = here.component "loadedNgramsTableHeader" cpt where
cpt { searchQuery } _ = pure $ cpt { searchQuery } _ = pure $
...@@ -740,17 +740,17 @@ mainNgramsTable = R.createElement mainNgramsTableCpt ...@@ -740,17 +740,17 @@ mainNgramsTable = R.createElement mainNgramsTableCpt
mainNgramsTableCpt :: R.Component MainNgramsTableProps mainNgramsTableCpt :: R.Component MainNgramsTableProps
mainNgramsTableCpt = here.component "mainNgramsTable" cpt mainNgramsTableCpt = here.component "mainNgramsTable" cpt
where where
cpt props@{ cacheState, path, session, tabType, treeEdit } _ = do cpt props@{ cacheState, path, treeEdit } _ = do
searchQuery <- T.useFocused (_.searchQuery) (\a b -> b { searchQuery = a }) path searchQuery <- T.useFocused (_.searchQuery) (\a b -> b { searchQuery = a }) path
cacheState' <- T.useLive T.unequal cacheState cacheState' <- T.useLive T.unequal cacheState
onCancelRef <- R.useRef Nothing -- onCancelRef <- R.useRef Nothing
onNgramsClickRef <- R.useRef Nothing -- onNgramsClickRef <- R.useRef Nothing
onSaveRef <- R.useRef Nothing -- onSaveRef <- R.useRef Nothing
state <- T.useBox initialState state <- T.useBox initialState
ngramsLocalPatch <- T.useFocused (_.ngramsLocalPatch) (\a b -> b { ngramsLocalPatch = a }) state -- ngramsLocalPatch <- T.useFocused (_.ngramsLocalPatch) (\a b -> b { ngramsLocalPatch = a }) state
nodeId <- T.useFocused (_.nodeId) (\a b -> b { nodeId = a }) path -- nodeId <- T.useFocused (_.nodeId) (\a b -> b { nodeId = a }) path
nodeId' <- T.useLive T.unequal nodeId -- nodeId' <- T.useLive T.unequal nodeId
-- let treeEdit = { box: treeEditBox -- let treeEdit = { box: treeEditBox
-- , getNgramsChildren: getNgramsChildrenAff session nodeId' tabType -- , getNgramsChildren: getNgramsChildrenAff session nodeId' tabType
...@@ -763,17 +763,17 @@ mainNgramsTableCpt = here.component "mainNgramsTable" cpt ...@@ -763,17 +763,17 @@ mainNgramsTableCpt = here.component "mainNgramsTable" cpt
case cacheState' of case cacheState' of
NT.CacheOn -> pure $ R.fragment NT.CacheOn -> pure $ R.fragment
[ [ loadedNgramsTableHeader { searchQuery }
loadedNgramsTableHeader { searchQuery } [] , ngramsTreeEdit (treeEdit)
, mainNgramsTableCacheOn (Record.merge props { state }) [] , mainNgramsTableCacheOn (Record.merge props { state })
] ]
NT.CacheOff -> pure $ R.fragment NT.CacheOff -> pure $ R.fragment
[ [loadedNgramsTableHeader { searchQuery }
loadedNgramsTableHeader { searchQuery } [] , ngramsTreeEdit (treeEdit)
, ngramsTreeEdit (treeEdit) [] , mainNgramsTableCacheOff (Record.merge props { state })
, mainNgramsTableCacheOff (Record.merge props { state }) []
] ]
type NgramsTreeEditProps = type NgramsTreeEditProps =
( box :: T.Box TreeEdit ( box :: T.Box TreeEdit
, getNgramsChildren :: NgramsTerm -> Aff (Array NgramsTerm) , getNgramsChildren :: NgramsTerm -> Aff (Array NgramsTerm)
...@@ -783,8 +783,8 @@ type NgramsTreeEditProps = ...@@ -783,8 +783,8 @@ type NgramsTreeEditProps =
, onSaveRef :: NgramsActionRef , onSaveRef :: NgramsActionRef
) )
ngramsTreeEdit :: R2.Component NgramsTreeEditProps ngramsTreeEdit :: R2.Leaf NgramsTreeEditProps
ngramsTreeEdit = R.createElement ngramsTreeEditCpt ngramsTreeEdit = R2.leaf ngramsTreeEditCpt
ngramsTreeEditCpt :: R.Component NgramsTreeEditProps ngramsTreeEditCpt :: R.Component NgramsTreeEditProps
ngramsTreeEditCpt = here.component "ngramsTreeEdit" cpt where ngramsTreeEditCpt = here.component "ngramsTreeEdit" cpt where
cpt props@{ box } _ = do cpt props@{ box } _ = do
...@@ -799,15 +799,15 @@ ngramsTreeEditCpt = here.component "ngramsTreeEdit" cpt where ...@@ -799,15 +799,15 @@ ngramsTreeEditCpt = here.component "ngramsTreeEdit" cpt where
pure $ if isEditingFocused' pure $ if isEditingFocused'
then case ngramsParentFocused' of then case ngramsParentFocused' of
Nothing -> gutter Nothing -> gutter
Just ngramsParent' -> ngramsTreeEditReal (Record.merge props { ngramsParent' }) [] Just ngramsParent' -> ngramsTreeEditReal (Record.merge props { ngramsParent' })
else gutter else gutter
type NgramsTreeEditRealProps = type NgramsTreeEditRealProps =
( ngramsParent' :: NgramsTerm ( ngramsParent' :: NgramsTerm
| NgramsTreeEditProps ) | NgramsTreeEditProps )
ngramsTreeEditReal :: R2.Component NgramsTreeEditRealProps ngramsTreeEditReal :: R2.Leaf NgramsTreeEditRealProps
ngramsTreeEditReal = R.createElement ngramsTreeEditRealCpt ngramsTreeEditReal = R2.leaf ngramsTreeEditRealCpt
ngramsTreeEditRealCpt :: R.Component NgramsTreeEditRealProps ngramsTreeEditRealCpt :: R.Component NgramsTreeEditRealProps
ngramsTreeEditRealCpt = here.component "ngramsTreeEditReal" cpt where ngramsTreeEditRealCpt = here.component "ngramsTreeEditReal" cpt where
cpt { box cpt { box
...@@ -922,8 +922,8 @@ type MainNgramsTableCacheProps = ...@@ -922,8 +922,8 @@ type MainNgramsTableCacheProps =
( state :: T.Box State ( state :: T.Box State
| MainNgramsTableProps ) | MainNgramsTableProps )
mainNgramsTableCacheOn :: R2.Component MainNgramsTableCacheProps mainNgramsTableCacheOn :: R2.Leaf MainNgramsTableCacheProps
mainNgramsTableCacheOn = R.createElement mainNgramsTableCacheOnCpt mainNgramsTableCacheOn = R2.leaf mainNgramsTableCacheOnCpt
mainNgramsTableCacheOnCpt :: R.Component MainNgramsTableCacheProps mainNgramsTableCacheOnCpt :: R.Component MainNgramsTableCacheProps
mainNgramsTableCacheOnCpt = here.component "mainNgramsTableCacheOn" cpt where mainNgramsTableCacheOnCpt = here.component "mainNgramsTableCacheOn" cpt where
cpt { afterSync cpt { afterSync
...@@ -969,8 +969,8 @@ mainNgramsTableCacheOnCpt = here.component "mainNgramsTableCacheOn" cpt where ...@@ -969,8 +969,8 @@ mainNgramsTableCacheOnCpt = here.component "mainNgramsTableCacheOn" cpt where
handleResponse :: VersionedNgramsTable -> VersionedNgramsTable handleResponse :: VersionedNgramsTable -> VersionedNgramsTable
handleResponse v = v handleResponse v = v
mainNgramsTableCacheOff :: R2.Component MainNgramsTableCacheProps mainNgramsTableCacheOff :: R2.Leaf MainNgramsTableCacheProps
mainNgramsTableCacheOff = R.createElement mainNgramsTableCacheOffCpt mainNgramsTableCacheOff = R2.leaf mainNgramsTableCacheOffCpt
mainNgramsTableCacheOffCpt :: R.Component MainNgramsTableCacheProps mainNgramsTableCacheOffCpt :: R.Component MainNgramsTableCacheProps
mainNgramsTableCacheOffCpt = here.component "mainNgramsTableCacheOff" cpt where mainNgramsTableCacheOffCpt = here.component "mainNgramsTableCacheOff" cpt where
cpt { afterSync cpt { afterSync
......
...@@ -104,7 +104,6 @@ ...@@ -104,7 +104,6 @@
margin-top: space-x(2) margin-top: space-x(2)
margin-bottom: space-x(2) margin-bottom: space-x(2)
&__actions &__actions
display: flex display: flex
margin-top: space-x(2) margin-top: space-x(2)
...@@ -112,6 +111,9 @@ ...@@ -112,6 +111,9 @@
.b-button .b-button
margin-right: space-x(1) margin-right: space-x(1)
.ngrams-tree-loaded-node a:hover
text-decoration: line-through
////////////////////////////////////////////////// //////////////////////////////////////////////////
.loaded-ngrams-table-header .loaded-ngrams-table-header
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment