Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add basic flow and flowObject information to graphql #118

Open
wants to merge 41 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
8126361
Add initial Jest config
manelcecs Oct 26, 2023
3dc10a8
Add containers configuration and bash
manelcecs Oct 26, 2023
8df7cd0
🙈 Ignore data directory
Pl217 Nov 17, 2023
0176887
Add DB migration backup
manelcecs Oct 26, 2023
b23d838
Add utils for tests
manelcecs Oct 26, 2023
348a653
Add tests setup and example tests
manelcecs Oct 26, 2023
cbe05c0
Add run files for VSCode
manelcecs Oct 26, 2023
e999d16
Add hpc-hid info
manelcecs Oct 17, 2023
1e54f71
Create basic structure for GraphQL Flows resolver
manelcecs Oct 23, 2023
ef9b56c
Minor refactor
manelcecs Oct 26, 2023
39a1fc8
Add fetch for flow categories
manelcecs Oct 27, 2023
98fc683
Add query fetching nested properties
manelcecs Oct 27, 2023
9495ef1
Refactor move methods to individual services
manelcecs Oct 27, 2023
9d8ac34
Split individual services
manelcecs Oct 30, 2023
b870b56
Add tests for flow resolver
manelcecs Oct 30, 2023
596245f
Add Pagination utils with tests
manelcecs Oct 30, 2023
e718ceb
Refactor service to increase Query Pool using IN strategy
manelcecs Nov 2, 2023
ea9f12f
Add multiple fields to response
manelcecs Nov 6, 2023
57ff534
Add GraphQL types.
manelcecs Nov 6, 2023
00230c0
Apply Strategy Pattern to FlowSearch service.
manelcecs Nov 10, 2023
c97a65b
Minor types refactor.
manelcecs Nov 11, 2023
29ca26f
Add FlowObject Strategy.
manelcecs Nov 12, 2023
51e70cc
Fix bug when apply FlowObject filter.
manelcecs Nov 13, 2023
6ed5cd7
Ref: add types instead of any
manelcecs Nov 13, 2023
b01eee2
Temp: add api-core dep
manelcecs Nov 14, 2023
f5b55d4
Allow filter flow by multiples id
manelcecs Nov 14, 2023
216113c
Fix incorrect query when multiple flowObject filter
manelcecs Nov 16, 2023
b960eb7
Fix lint problems
manelcecs Nov 16, 2023
254c688
GraphQL definitions for base flow type
czmj Sep 5, 2022
93060ce
Add createdBy/lastUpdatedBy to flow response
czmj Sep 5, 2022
be0f283
Get flow objects
czmj Sep 6, 2022
ad94cce
Group by refDirection and objectType
czmj Sep 6, 2022
d39e832
Get locations data from flow object
czmj Sep 6, 2022
f96fd72
Add organizations to flowObjects response
czmj Sep 6, 2022
e7fcb53
Add usage years to flowObjects response
czmj Sep 6, 2022
8943ba9
Add plans to flowObjects response
czmj Sep 6, 2022
3fbc5bf
Add projects to flowObjects response
czmj Sep 6, 2022
921dec8
Add globalClusters to flowObjects response
czmj Sep 19, 2022
36b8061
Add governingEntities to flowObjects response
czmj Sep 19, 2022
2a83c2a
Add emergencies to flowObjects response
czmj Sep 19, 2022
06f78a3
Add search flows query
czmj Sep 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package-lock.json
._entypo-social
.smbdelete*
test-data/*
data/*
.env
.vscode
*.sublime-project
*.sublime-workspace
18 changes: 18 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Debug Jest Tests",
"type": "node",
"preLaunchTask": "start-containers",
"request": "launch",
"runtimeArgs": [
"--inspect-brk",
"${workspaceRoot}/node_modules/.bin/jest",
"--runInBand"
],
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen"
}
]
}
13 changes: 13 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "start-containers",
"type": "shell",
"command": "${workspaceRoot}/bin/test.sh",
"args": ["-oc"]
}
]
}
87 changes: 87 additions & 0 deletions bin/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
root=$(pwd)

#Global variables
USAGE='Usage: test.sh [options] [-- [options]].\n Options:\n -oc, --only-containers: only start docker containers\n -sc, --stop-containers: stop docker containers\n -k, --keep: keep jest runing after the completion of the tests suites\n -c: run tests with coverage\n -h, --help: show this help message\n --: pass extra options'
KEEP=0
FORCE_STOP_JEST='--forceExit'
ONLY_CONTAINERS=0
STOP_CONTAINERSq=0
COMMAND_ARGS=''

function moveToTestDir {
echo 'Moving to tests dir'
cd ${root}/tests
}

function moveToRootDir {
echo 'Moving to root dir'
cd ${root}
}

## obtain options
while [ "$1" != "" ]; do
case $1 in
-oc | --only-containers ) ONLY_CONTAINERS=1
;;
-sc | --stop-containers ) STOP_CONTAINERS=1
;;
-k | --keep ) KEEP=1
;;
-c) shift
COMMAND_ARGS="${COMMAND_ARGS} --coverage"
;;
-h | --help ) echo "$USAGE"
exit
;;
--) shift
while [ "$1" != "" ]; do
COMMAND_ARGS="${COMMAND_ARGS} -- $1"
shift
done
;;
* ) echo "$USAGE"
exit 1
esac
shift
done

## STOP_CONTAINERS is a final option
if [ $STOP_CONTAINERS -eq 1 ]; then
echo 'Stopping docker containers'
moveToTestDir
docker-compose down
exit 0
fi

## ONLY_CONTAINERS must be 1 and STOP must be 0
if [ $ONLY_CONTAINERS -eq 1 ] && [ $STOP -eq 1 ]; then
echo 'Invalid options - when using option -oc, option -ns must be used as well'
echo "$usage"
exit 1
fi

## should we check if docker is running?
echo 'Starting docker containers'
moveToTestDir
docker-compose up -d

if [ $ONLY_CONTAINERS -eq 1 ]; then
exit 0
fi

## run tests
echo 'Running tests'
moveToRootDir

if [ $KEEP -eq 0 ]; then
FORCE_STOP_JEST=''
fi

yarn jest $COMMAND_ARGS $FORCE_STOP_JEST

if [ $KEEP -eq 0 ]; then
## stop docker containers
echo 'Stopping docker containers'
moveToTestDir
docker-compose down
fi
Empty file.
164 changes: 164 additions & 0 deletions config/services/solr/confs/conf/accents_en.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
# À => A
"\u00C0" => "A"
# Á => A
"\u00C1" => "A"
# Â => A
"\u00C2" => "A"
# Ã => A
"\u00C3" => "A"
# Ä => A
"\u00C4" => "A"
# Å => A
"\u00C5" => "A"
# Ą => A
"\u0104" => "A"
# Æ => AE
"\u00C6" => "AE"
# Ç => C
"\u00C7" => "C"
# Ć => C
"\U0106" => "C"
# È => E
"\u00C8" => "E"
# É => E
"\u00C9" => "E"
# Ê => E
"\u00CA" => "E"
# Ë => E
"\u00CB" => "E"
# Ę => E
"\u0118" => "E"
# Ì => I
"\u00CC" => "I"
# Í => I
"\u00CD" => "I"
# Î => I
"\u00CE" => "I"
# Ï => I
"\u00CF" => "I"
# IJ => IJ
"\u0132" => "IJ"
# Ð => D
"\u00D0" => "D"
# Ł => L
"\u0141" => "L"
# Ñ => N
"\u00D1" => "N"
# Ń => N
"\u0143" => "N"
# Ò => O
"\u00D2" => "O"
# Ó => O
"\u00D3" => "O"
# Ô => O
"\u00D4" => "O"
# Õ => O
"\u00D5" => "O"
# Ö => O
"\u00D6" => "O"
# Ø => O
"\u00D8" => "O"
# Œ => OE
"\u0152" => "OE"
# Þ
"\u00DE" => "TH"
# Ù => U
"\u00D9" => "U"
# Ú => U
"\u00DA" => "U"
# Û => U
"\u00DB" => "U"
# Ü => U
"\u00DC" => "U"
# Ý => Y
"\u00DD" => "Y"
# Ÿ => Y
"\u0178" => "Y"
# à => a
"\u00E0" => "a"
# á => a
"\u00E1" => "a"
# â => a
"\u00E2" => "a"
# ã => a
"\u00E3" => "a"
# ä => a
"\u00E4" => "a"
# å => a
"\u00E5" => "a"
# æ => ae
"\u00E6" => "ae"
# ç => c
"\u00E7" => "c"
# è => e
"\u00E8" => "e"
# é => e
"\u00E9" => "e"
# ê => e
"\u00EA" => "e"
# ë => e
"\u00EB" => "e"
# ì => i
"\u00EC" => "i"
# í => i
"\u00ED" => "i"
# î => i
"\u00EE" => "i"
# ï => i
"\u00EF" => "i"
# ij => ij
"\u0133" => "ij"
# ð => d
"\u00F0" => "d"
# ñ => n
"\u00F1" => "n"
# ò => o
"\u00F2" => "o"
# ó => o
"\u00F3" => "o"
# ô => o
"\u00F4" => "o"
# õ => o
"\u00F5" => "o"
# ö => o
"\u00F6" => "o"
# ø => o
"\u00F8" => "o"
# œ => oe
"\u0153" => "oe"
# ß => ss
"\u00DF" => "ss"
# Ś => S
"\u015a" => "S"
# þ => th
"\u00FE" => "th"
# ù => u
"\u00F9" => "u"
# ú => u
"\u00FA" => "u"
# û => u
"\u00FB" => "u"
# ü => u
"\u00FC" => "u"
# ý => y
"\u00FD" => "y"
# ÿ => y
"\u00FF" => "y"
# Ź => Z
"\u0179" => "Z"
# Ż => Z
"\u017b" => "Z"
# ff => ff
"\uFB00" => "ff"
# fi => fi
"\uFB01" => "fi"
# fl => fl
"\uFB02" => "fl"
# ffi => ffi
"\uFB03" => "ffi"
# ffl => ffl
"\uFB04" => "ffl"
# ſt => st
"\uFB05" => "st"
# st => st
"\uFB06" => "st"
Loading
Loading