Skip to content

Commit

Permalink
Frm4sm release 2 (#640)
Browse files Browse the repository at this point in the history
* Updated submodule testdata for SMOSL2

* Fixed tests and integrated for SMOSL2

* Update for SMOSL2

* Added test for SMOS L2 column combine

* set up updated to include a new parameterized filter

* Updated preprocess. version in environment

* parameter updated

* Fixed tests

* Updated pytesmo version

* Upload data to frm4sm release (#523)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* User upload data (#489)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* User upload data (#490)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* User upload data (#491)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* User upload data (#492)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* dataset storage path updated to not include the file name; get_raw_file_path property updated to strip also '/'

* User upload data (#493)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* dataset storage path updated to not include the file name; get_raw_file_path property updated to strip also '/'

* env updated to include a test version of qa4sm-preprocessing package

* User upload data (#494)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* dataset storage path updated to not include the file name; get_raw_file_path property updated to strip also '/'

* env updated to include a test version of qa4sm-preprocessing package

* setdatasetpaths updated to not to change user dataset storage directories

* User upload data (#495)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* dataset storage path updated to not include the file name; get_raw_file_path property updated to strip also '/'

* env updated to include a test version of qa4sm-preprocessing package

* setdatasetpaths updated to not to change user dataset storage directories

* file path updated

* User upload data (#496)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* dataset storage path updated to not include the file name; get_raw_file_path property updated to strip also '/'

* env updated to include a test version of qa4sm-preprocessing package

* setdatasetpaths updated to not to change user dataset storage directories

* file path updated

* celery bound with data folder

* User upload data (#497)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* dataset storage path updated to not include the file name; get_raw_file_path property updated to strip also '/'

* env updated to include a test version of qa4sm-preprocessing package

* setdatasetpaths updated to not to change user dataset storage directories

* file path updated

* celery bound with data folder

* some additional form fields added and handled

* some code refinement done

* variable and dimension part commented, as we are going to retrieve information from the file

* UserDataFileDto updated according to the model changes

* user dataset list updated with the possibility of editing variable and dimension names (only front-end)

* model updated and appropriate migration added

* retrieving dimensions and variable names from the file added

* cancel button added and styled

* upload date field added along with appropriate migration

* user-data-row component added to develop each row separately

* my-datsets component updated to use user-data-row instead of user-dataset-list

* uploading form modified to consist of fewer fields

* updateMetadata method added

* updateMetadata url added

* function for updating metadata updated to include also dimensions

* toast added, some code refinement done

* variable long name included on the list

* Some code refinement done; styling and date format improved

* preprocessing package updated

* tooltips added

* some changes in retrieving coordinate names from the file applied to use the function from the preprocessing package

* migrations updated

* model updated, appropriate migration added

* list of front-end urls updated

* api views for uploading file updated to be optimal and consistent

* user data file updated according to changes in the model

* user dataset row updated according to changes in the back-end

* serializer updated; printing removed;

* Information about user dataset managing options added; edit and tooltip icons added; tooltip text edited

* editing dataset and version names added

* scroll to top added, typo fixed

* a property added to the user-data model to check if it has been used in a validation; removed button disabled for such a case;

* some styling updated

* retrieving variable name updated

* User upload data (#499)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* dataset storage path updated to not include the file name; get_raw_file_path property updated to strip also '/'

* env updated to include a test version of qa4sm-preprocessing package

* setdatasetpaths updated to not to change user dataset storage directories

* file path updated

* celery bound with data folder

* some additional form fields added and handled

* some code refinement done

* variable and dimension part commented, as we are going to retrieve information from the file

* UserDataFileDto updated according to the model changes

* user dataset list updated with the possibility of editing variable and dimension names (only front-end)

* model updated and appropriate migration added

* retrieving dimensions and variable names from the file added

* cancel button added and styled

* upload date field added along with appropriate migration

* user-data-row component added to develop each row separately

* my-datsets component updated to use user-data-row instead of user-dataset-list

* uploading form modified to consist of fewer fields

* updateMetadata method added

* updateMetadata url added

* function for updating metadata updated to include also dimensions

* toast added, some code refinement done

* variable long name included on the list

* Some code refinement done; styling and date format improved

* preprocessing package updated

* tooltips added

* some changes in retrieving coordinate names from the file applied to use the function from the preprocessing package

* migrations updated

* model updated, appropriate migration added

* list of front-end urls updated

* api views for uploading file updated to be optimal and consistent

* user data file updated according to changes in the model

* user dataset row updated according to changes in the back-end

* serializer updated; printing removed;

* Information about user dataset managing options added; edit and tooltip icons added; tooltip text edited

* editing dataset and version names added

* scroll to top added, typo fixed

* a property added to the user-data model to check if it has been used in a validation; removed button disabled for such a case;

* some styling updated

* retrieving variable name updated

* user dataset file model added to the admin panel

* User upload data (#500)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* dataset storage path updated to not include the file name; get_raw_file_path property updated to strip also '/'

* env updated to include a test version of qa4sm-preprocessing package

* setdatasetpaths updated to not to change user dataset storage directories

* file path updated

* celery bound with data folder

* some additional form fields added and handled

* some code refinement done

* variable and dimension part commented, as we are going to retrieve information from the file

* UserDataFileDto updated according to the model changes

* user dataset list updated with the possibility of editing variable and dimension names (only front-end)

* model updated and appropriate migration added

* retrieving dimensions and variable names from the file added

* cancel button added and styled

* upload date field added along with appropriate migration

* user-data-row component added to develop each row separately

* my-datsets component updated to use user-data-row instead of user-dataset-list

* uploading form modified to consist of fewer fields

* updateMetadata method added

* updateMetadata url added

* function for updating metadata updated to include also dimensions

* toast added, some code refinement done

* variable long name included on the list

* Some code refinement done; styling and date format improved

* preprocessing package updated

* tooltips added

* some changes in retrieving coordinate names from the file applied to use the function from the preprocessing package

* migrations updated

* model updated, appropriate migration added

* list of front-end urls updated

* api views for uploading file updated to be optimal and consistent

* user data file updated according to changes in the model

* user dataset row updated according to changes in the back-end

* serializer updated; printing removed;

* Information about user dataset managing options added; edit and tooltip icons added; tooltip text edited

* editing dataset and version names added

* scroll to top added, typo fixed

* a property added to the user-data model to check if it has been used in a validation; removed button disabled for such a case;

* some styling updated

* retrieving variable name updated

* user dataset file model added to the admin panel

* fields names updated

* User upload data (#501)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my dataset page updated

* user-file-upload component updated

* class 'center' moved to the global css file

* directory update done

* prime icons updated

* upload file changed to select file button and new button for uploading added

* file-upload-form component added

* help page updated - added a section for used data standard

* work around added to add scroll-to-section option

* user data uploading form added

* user data uploading form updated

* draft of user data file added

* uploading file form updated, so now first the file has to be chosen and then metadata form shows up

* file-upload-form component not needed

* draft back-end function for uploading file added

* a blank line added

* some updates in the uploading file serializer done

* uploading data view created, uploading view and serializers moved to the new file, urls imports updated

* getting list of user data files added to the back end

* user-data-file.dto.ts added to map the file model from the back end

* user-dataset-list component added to present list of files uploaded by the user

* user-dataset service added and respective code moved there from the validationrun service file

* user-file-upload updated to use appropriate service

* my-datasets site update to include list of user datasets

* deleting user data added on both front and back end sides

* my datasets table updated, some columns for metadata added

* condition updated so it doesn't send two requests to the back-end

* condition updated, so it doesn't show the table when there are no entries

* dataset model updated to include the user that the data belongs to; the appropriate api view updated

* user_dataset_file model added and upload_user_data_view updated

* getting datasets into front end updated with the possibility of showing user data

* urls updated, because id is now a string not int

* id instead of pk taken

* tests updated

* refreshing page added when a file is uploaded

* bug fixed, now it returns united data

* uploading data updated, now first the metadata is sent, appropriate dataset, its version and variable are created and then file is uploaded

* uploading file and metadata functions updated

* removing file when the instance is removed added

* my-datasets list updated to present information from db

* caching updated to remember if also user datasets should be taken or not

* user data are not taken for the reference datasets

* position removed as not needed

* ? added to the async pipe

* a spinner added to inform user that the data is being uploaded

* user data file id changed to string

* a button added to run some tests on the uploaded file; instead of passing formData, only the file is passed, what fixes the problem with opening uploaded netCDF

* some code commented as it's only for testing purposes

* migration added

* dataset_view.py updated with the default userData parameter; dataset fixture updated with the user entry

* user data path added and set as the default for data storage

* docker compose for test instance updated

* upload file paths updated to the prod one and appropriate migration added

* appropriate migration added

* direction changed, first the file and then the metadata is saved

* getting raw file path added as property

* a very first draft of the user data reader added

* model updated to store dimension names; appropriate migration added

* some code refinement done

* environment updated

* function name updated

* dataset storage path updated to not include the file name; get_raw_file_path property updated to strip also '/'

* env updated to include a test version of qa4sm-preprocessing package

* setdatasetpaths updated to not to change user dataset storage directories

* file path updated

* celery bound with data folder

* some additional form fields added and handled

* some code refinement done

* variable and dimension part commented, as we are going to retrieve information from the file

* UserDataFileDto updated according to the model changes

* user dataset list updated with the possibility of editing variable and dimension names (only front-end)

* model updated and appropriate migration added

* retrieving dimensions and variable names from the file added

* cancel button added and styled

* upload date field added along with appropriate migration

* user-data-row component added to develop each row separately

* my-datsets component updated to use user-data-row instead of user-dataset-list

* uploading form modified to consist of fewer fields

* updateMetadata method added

* updateMetadata url added

* function for updating metadata updated to include also dimensions

* toast added, some code refinement done

* variable long name included on the list

* Some code refinement done; styling and date format improved

* preprocessing package updated

* tooltips added

* some changes in retrieving coordinate names from the file applied to use the function from the preprocessing package

* migrations updated

* model updated, appropriate migration added

* list of front-end urls updated

* api views for uploading file updated to be optimal and consistent

* user data file updated according to changes in the model

* user dataset row updated according to changes in the back-end

* serializer updated; printing removed;

* Information about user dataset managing options added; edit and tooltip icons added; tooltip text edited

* editing dataset and version names added

* scroll to top added, typo fixed

* a property added to the user-data model to check if it has been used in a validation; removed button disabled for such a case;

* some styling updated

* retrieving variable name updated

* user dataset file model added to the admin panel

* fields names updated

* problem with pretty_name vs short_name of variable fixed

* User upload data (#502)

* user-file-upload component added

* user-file-upload component place on the user-profile page

* userFileUpload added to the validationrun service

* userFileUpload added to the app.modules

* api url for uploading added, a draft view for serving for it added

* tsconfig updated

* user file component updated

* userFileUpload updated and some styling improved

* my-datasets page added

* my-dataset page added to the navigation menu

* user-file-upload component moved to my datasets page

* some styling applied

* my…
  • Loading branch information
7 people authored Mar 23, 2023
1 parent 9aa2367 commit 64ddb49
Show file tree
Hide file tree
Showing 199 changed files with 6,445 additions and 1,478 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ name: tests
on:
push:
pull_request:
workflow_dispatch:
schedule: # only upstream, won't trigger on forks!
- cron: '0 0 * * *' # daily

Expand Down
22 changes: 11 additions & 11 deletions UI/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion UI/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"ngx-pagination": "^5.0.0",
"ol": "^6.5.0",
"primeflex": "^2.0.0",
"primeicons": "^4.1.0",
"primeicons": "^5.0.0",
"primeng": "^11.2.3",
"proj4": "^2.7.2",
"rxjs": "~6.6.0",
Expand Down
10 changes: 7 additions & 3 deletions UI/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {ValidateComponent} from './pages/validate/validate.component';
import {ErrorComponent} from './pages/error/error.component';
import {AuthGuard} from './auth.guard';
import {ValidationResultComponent} from './pages/validation-result/validation-result.component';
import {LoginComponent} from './pages/login/login.component';
import {UserProfileComponent} from './pages/user-profile/user-profile.component';
import {PublishedValidationsComponent} from './pages/published-validations/published-validations.component';
import {ValidationsComponent} from './pages/validations/validations.component';
Expand All @@ -24,13 +23,16 @@ import {SetPasswordComponent} from './pages/set-password/set-password.component'
import {
PasswordResetValidateTokenComponent
} from './pages/password-reset-validate-token/password-reset-validate-token.component';
import {MyDatasetsComponent} from './pages/my-datasets/my-datasets.component';
import {UserDataGuidelinesComponent} from './pages/user-data-guidelines/user-data-guidelines.component';
import {LoginPageComponent} from './pages/login-page/login-page.component';


const routes: Routes = [
{path: '', redirectTo: '/home', pathMatch: 'full'},
{path: 'home', component: HomeComponent},
{path: 'login', component: LoginComponent},
{path: 'validate', component: ValidateComponent, canActivate: [AuthGuard], resolve: {datasets: DatasetResolver}},
{path: 'login', component: LoginPageComponent},
{path: 'validate', component: ValidateComponent, resolve: {datasets: DatasetResolver}},
{path: 'validation-result/:validationId', component: ValidationResultComponent},
{path: 'my-validations', component: ValidationsComponent, canActivate: [AuthGuard]},
{path: 'user-profile', component: UserProfileComponent, canActivate: [AuthGuard]},
Expand All @@ -47,6 +49,8 @@ const routes: Routes = [
{path: 'password-reset-done', component: PasswordResetDoneComponent},
{path: 'password-reset/:token', component: PasswordResetValidateTokenComponent},
{path: 'set-password', component: SetPasswordComponent},
{path: 'my-datasets', component: MyDatasetsComponent, canActivate: [AuthGuard]},
{path: 'user-data-guidelines', component: UserDataGuidelinesComponent},
{path: '**', component: ErrorComponent}
];

Expand Down
21 changes: 17 additions & 4 deletions UI/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {ErrorComponent} from './pages/error/error.component';

import {ValidationsComponent} from './pages/validations/validations.component';
import {ValidationResultComponent} from './pages/validation-result/validation-result.component';
import {LoginComponent} from './pages/login/login.component';
import {LoginComponent} from './modules/user/login/login.component';
import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
import {HttpTokenInterceptor} from './modules/core/interceptors/http-token.interceptor';
import {LoggerModule, NgxLoggerLevel} from 'ngx-logger';
Expand Down Expand Up @@ -52,7 +52,7 @@ import {ComparisonModule} from './modules/comparison/comparison.module';
import {
TemporalMatchingComponent
} from './modules/temporal-matching/components/temporal-matching/temporal-matching.component';
import {TemporalMatchingModule} from "./modules/temporal-matching/temporal-matching.module";
import {TemporalMatchingModule} from './modules/temporal-matching/temporal-matching.module';
import {HelpComponent} from './pages/help/help.component';
import {IvyGalleryModule} from 'angular-gallery';
import {NgxPageScrollModule} from 'ngx-page-scroll';
Expand All @@ -68,7 +68,13 @@ import {
PasswordResetValidateTokenComponent
} from './pages/password-reset-validate-token/password-reset-validate-token.component';
import {InputNumberModule} from 'primeng/inputnumber';

import {MyDatasetsComponent} from './pages/my-datasets/my-datasets.component';
import {UserDatasetsModule} from './modules/user-datasets/user-datasets.module';
import {ValidationReferenceModule} from './modules/validation-reference/validation-reference.module';
import {UserDataGuidelinesComponent} from './pages/user-data-guidelines/user-data-guidelines.component';
import {DialogModule} from 'primeng/dialog';
import {LoginPageComponent} from './pages/login-page/login-page.component';
import {ProgressBarModule} from 'primeng/progressbar';

@NgModule({
declarations: [
Expand All @@ -94,6 +100,9 @@ import {InputNumberModule} from 'primeng/inputnumber';
SetPasswordComponent,
PasswordResetValidateTokenComponent,
TemporalMatchingComponent,
MyDatasetsComponent,
UserDataGuidelinesComponent,
LoginPageComponent,
],
imports: [
LoggerModule.forRoot({level: NgxLoggerLevel.DEBUG, serverLogLevel: NgxLoggerLevel.ERROR}),
Expand Down Expand Up @@ -132,7 +141,11 @@ import {InputNumberModule} from 'primeng/inputnumber';
NgxPageScrollModule,
CoreModule,
UserModule,
InputNumberModule
InputNumberModule,
UserDatasetsModule,
ValidationReferenceModule,
DialogModule,
ProgressBarModule,
],
providers: [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {Component, Input, OnInit} from '@angular/core';
import {AnomaliesModel} from '../anomalies/anomalies-model';
import {BehaviorSubject} from 'rxjs';

@Component({
selector: 'qa-anom-climatology',
Expand All @@ -9,6 +10,7 @@ import {AnomaliesModel} from '../anomalies/anomalies-model';
export class AnomClimatologyComponent implements OnInit {
public minYear = 1971;
public maxYear = 2100;
public yearFrom$ = new BehaviorSubject(this.minYear);

@Input() anomaliesModel: AnomaliesModel;

Expand All @@ -24,18 +26,26 @@ export class AnomClimatologyComponent implements OnInit {

getYearFrom(): number {
let year: number;
this.anomaliesModel.anomaliesFrom$.subscribe(date => {
date ? year = date.getFullYear() : year = this.minYear;
});
if (this.anomaliesModel.anomaliesFrom$.getValue()){
year = this.anomaliesModel.anomaliesFrom$.getValue().getFullYear();
} else {
year = this.minYear;
this.anomaliesModel.anomaliesFrom$.next(this.setDate(year));
}

return year;
}

getYearTo(): number {
let year: number;
this.anomaliesModel.anomaliesTo$.subscribe(date => {
date ? year = date.getFullYear() : year = (new Date()).getFullYear();
});
return year;
let year: Date;

if (this.anomaliesModel.anomaliesTo$.getValue()){
year = this.anomaliesModel.anomaliesTo$.getValue();
} else {
year = (new Date());
this.anomaliesModel.anomaliesTo$.next(year);
}
return year.getFullYear();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@
<p-panel header="Datasets configuration" [toggleable]="false">
<ng-template pTemplate="icons">
<label class="mb-0"
pTooltip="Select the reference dataset from the menu below to access a list of validations available for comparison."
pTooltip="Select the spatial reference dataset from the menu below to access a list of validations available for comparison."
tooltipPosition="bottom">
<span class="p-panel-header-icon pi pi-question-circle help-icon"></span>
</label>
</ng-template>
<p-accordion multiple="true" activeIndex="0">
<!-- here dataset/version selection -->
<p-accordionTab [header]=" 'Reference selection: ' + (selectedDatasetModel[0].datasetModel.selectedDataset?.pretty_name)+' / '+(selectedDatasetModel[0].datasetModel.selectedVersion?.pretty_name)">
<p-accordionTab [header]=" 'Spatial reference selection: ' + (selectedDatasetModel[0].datasetModel.selectedDataset?.pretty_name)+' / '+(selectedDatasetModel[0].datasetModel.selectedVersion?.pretty_name)">

<qa-dataset *ngIf="selectedDatasetModel[0].datasetModel.selectedDataset"
[removable]="false"
[reference]="true"
(changeDataset)="onDatasetChange()"
[selectionModel]="selectedDatasetModel[0].datasetModel">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import {ValidationrunDto} from '../../../core/services/validation-run/validation
import {ExtentModel} from '../spatial-extent/extent-model';
import {ComparisonService} from '../../services/comparison.service';
import {ToastService} from '../../../core/services/toast/toast.service';
import {BehaviorSubject} from 'rxjs';
import {DatasetVariableService} from '../../../core/services/dataset/dataset-variable.service';

const N_MAX_VALIDATIONS = 2; // A maximum of two validation results can be compared, at the moment - this shouldn't be hardcoded

Expand Down Expand Up @@ -39,7 +41,8 @@ export class ValidationSelectorComponent implements OnInit {
private versionService: DatasetVersionService,
private validationrunService: ValidationrunService,
private comparisonService: ComparisonService,
private toastService: ToastService) {
private toastService: ToastService,
private datasetVariableService: DatasetVariableService) {
}

ngOnInit(): void {
Expand All @@ -51,30 +54,45 @@ export class ValidationSelectorComponent implements OnInit {
}


onDatasetChange(): void{
onDatasetChange(): void {
this.getValidations4comparison();
}

private selectDataset(selected: DatasetConfigModel[]): void {
const model = new DatasetConfigModel(
new DatasetComponentSelectionModel(null, null, null),
null, null, null, null);
new DatasetComponentSelectionModel(
null,
null,
null),
null,
null,
null,
null,
null,
new BehaviorSubject(false),
new BehaviorSubject(false),
new BehaviorSubject(false));

selected.push(model);
// get all datasets
this.datasetService.getAllDatasets().subscribe(datasets => {
this.datasetService.getAllDatasets(true).subscribe(datasets => {
model.datasetModel.selectedDataset = datasets.find(dataset => dataset.short_name === 'ISMN');
this.selectValidationLabel = 'Wait for validations to be loaded';
// then get all versions for the first dataset in the result list
this.versionService.getVersionsByDataset(model.datasetModel.selectedDataset.id).subscribe(versions => {
model.datasetModel.selectedVersion = versions.find(version => version.pretty_name === '20210131 global');
this.getValidations4comparison(String( model.datasetModel.selectedDataset.short_name),
this.getValidations4comparison(String(model.datasetModel.selectedDataset.short_name),
String(model.datasetModel.selectedVersion.short_name));
// get all variables
this.datasetVariableService.getVariablesByDataset(model.datasetModel.selectedDataset.id).subscribe(variables => {
model.datasetModel.selectedVariable = variables[0];
});
});
});
}

getValidations4comparison(refDataset?, refVersion?): void{
if (!refDataset && !refVersion){
getValidations4comparison(refDataset?, refVersion?): void {
if (!refDataset && !refVersion) {
refDataset = String(this.selectedDatasetModel[0].datasetModel.selectedDataset.short_name);
refVersion = String(this.selectedDatasetModel[0].datasetModel.selectedVersion.short_name);
}
Expand All @@ -85,11 +103,11 @@ export class ValidationSelectorComponent implements OnInit {
.set('max_datasets', String(this.checkbox2NonReferenceNumber()));
this.selectValidationLabel = 'Wait for validations to be loaded';
this.validationrunService.getValidationsForComparison(parameters).subscribe(response => {
if (response){
if (response) {
this.validations4Comparison = response;
this.selectedValidation = response[0];
this.selectValidationLabel = 'Select a validation';
} else{
} else {
this.validations4Comparison = [];
this.selectValidationLabel = 'There are no validations available';
}
Expand All @@ -102,18 +120,18 @@ export class ValidationSelectorComponent implements OnInit {
this.getValidations4comparison();
}

checkbox2NonReferenceNumber(): number{
checkbox2NonReferenceNumber(): number {
// convert the checkbox boolean selection to number of non-references
this.comparisonModel.selectedValidations = []; // empty the selection in case the button is clicked
if (this.multipleNonReference){
if (this.multipleNonReference) {
return 2;
}
return 1;
}

addValidationButtonDisabled(): boolean {
// if the checkbox has been toggled - this shouldn't be hardcoded
if (this.multipleNonReference){
if (this.multipleNonReference) {
return this.comparisonModel.selectedValidations.length >= 1;
}

Expand Down Expand Up @@ -154,7 +172,7 @@ export class ValidationSelectorComponent implements OnInit {
if (this.multipleNonReference) {
return true;
} else {
return !this.checkOverlapping();
return !this.checkOverlapping();
}
}

Expand All @@ -163,7 +181,7 @@ export class ValidationSelectorComponent implements OnInit {
this.comparisonModel.getIntersection = isNotChecked;
}

startComparison(): void{
startComparison(): void {
// should start the comparison
if (this.comparisonModel.selectedValidations.length === 0 ||
(this.comparisonModel.selectedValidations.length === 1 && !this.comparisonModel.multipleNonReference)) {
Expand Down
5 changes: 4 additions & 1 deletion UI/src/app/modules/core/services/auth/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ export class AuthService {
last_name: '',
organisation: '',
country: '',
orcid: ''
orcid: '',
space_limit: '',
space_limit_value: null,
space_left: null
};
public authenticated: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
public currentUser: UserDto = this.emptyUser;
Expand Down
3 changes: 3 additions & 0 deletions UI/src/app/modules/core/services/auth/user.dto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ export interface UserDto{
organisation: string;
country: string;
orcid: string;
space_limit: string;
space_limit_value: number;
space_left: number;
}
Loading

0 comments on commit 64ddb49

Please sign in to comment.