Skip to content

Getting latest from Test (Phrase stuff) #2122

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.

Sign up for GitHub

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

Merged
artisticlight merged 9 commits into from
Feb 20, 2025
Merged

Getting latest from Test (Phrase stuff) #2122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
696420d
Updated translations from Phrase
ASF-Discovery Feb 8, 2025
92e4b8c
feat(on demand): check if already firing off request for products
tylercchase Feb 10, 2025
b792ffd
fix: use unique id for on demand loading (fixes bursts)
tylercchase Feb 12, 2025
9cdbab0
fix: update scene list count with extras
tylercchase Feb 17, 2025
b4fd0f9
Updated translations from Phrase
ASF-Discovery Feb 20, 2025
e91610c
Updated translations from Phrase
ASF-Discovery Feb 20, 2025
11c62a0
Updated translations from Phrase
ASF-Discovery Feb 20, 2025
08ab15f
Merge branch 'test' into phrase-translations
yoreley777 Feb 20, 2025
ca3baa9
Updated translations from Phrase #2117
yoreley777 Feb 20, 2025
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 ...onents/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</span>
</div>
<div *ngIf="job.job_type.name !== 'RTC GAMMA'" style="font-size: 14px;" matListItemLine>
{{job.granules[1].name}}
{{job.granules[1]?.name}}
</div>

<div class="button-remove-job" matListItemMeta>
Expand Down
19 changes: 13 additions & 6 deletions src/app/components/results-menu/scenes-list/scenes-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export class ScenesListComponent implements OnInit, OnDestroy, AfterContentInit
const flattened: string[] = [];
for (const job of jobs) {
for (const product of job.granules) {
flattened.push(product.name);
flattened.push(product?.name);
}
}

Expand Down Expand Up @@ -497,15 +497,22 @@ export class ScenesListComponent implements OnInit, OnDestroy, AfterContentInit
let scenesOutsideInitialLoad = this.scenes
.slice(this.numberProductsInList)
.filter(s => s.isDummyProduct)
.filter(s => this.loadedInProjects.has(s.metadata.job.name) && !this.loadingDummyJobs.has(s.name));
.filter(s => this.loadedInProjects.has(s.metadata.job.name) && !new Set(Object.keys(this.loadingJobs)).has(s.id));

if (scenesToLoad.length === 0 && scenesOutsideInitialLoad.length === 0) {
scenesToLoad = [...scenesToLoad, ...scenesOutsideInitialLoad]

if (scenesToLoad.length === 0 || scenesToLoad.every(s => this.loadingJobs.hasOwnProperty(s.id))) {
return;
}
scenesToLoad = [...scenesToLoad, ...scenesOutsideInitialLoad]

scenesToLoad.forEach(
s => this.loadingJobs[s.name] = s
s => this.loadingJobs[s.id] = s
)
const newNumProducts = this.numberProductsInList + scenesOutsideInitialLoad.length;

this.numberProductsInList$.next(
newNumProducts
);

this.store$.dispatch(new searchStore.LoadOnDemandScenesList(Object.values(this.loadingJobs)));

Expand Down Expand Up @@ -537,7 +544,7 @@ export class ScenesListComponent implements OnInit, OnDestroy, AfterContentInit
private removeLoadedScenes(scenes: CMRProduct[]) {
scenes
.filter(s => !s.isDummyProduct)
.forEach(s => {this.loadingDummyJobs.delete(s.name); delete this.loadingJobs[s.name]})
.forEach(s => {this.loadingDummyJobs.delete(s.name); delete this.loadingJobs[s.id]})
}

ngOnDestroy() {
Expand Down
9 changes: 4 additions & 5 deletions src/app/store/queue/queue.reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ export function queueReducer(state = initState, action: QueueActions): QueueStat
)
)
);

return {
...state,
customJobs: queue
Expand Down Expand Up @@ -249,15 +248,15 @@ export function queueReducer(state = initState, action: QueueActions): QueueStat
}

const sameGranules = (granules1: CMRProduct[], granules2: CMRProduct[]) => {
const ids1 = new Set(granules1.map(granule => granule.id));
const ids2 = new Set(granules2.map(granule => granule.id));
const ids1 = new Set(granules1.map(granule => granule?.id));
const ids2 = new Set(granules2.map(granule => granule?.id));

return eqSet(ids1, ids2);
};

const sameGranuleNames = (granules1: CMRProduct[], granules2: CMRProduct[]) => {
const ids1 = new Set(granules1.map(granule => granule.name));
const ids2 = new Set(granules2.map(granule => granule.name));
const ids1 = new Set(granules1.map(granule => granule?.name));
const ids2 = new Set(granules2.map(granule => granule?.name));

return eqSet(ids1, ids2);
};
Expand Down
5 changes: 0 additions & 5 deletions src/assets/i18n/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"ADD_PAIR_TO_ON_DEMAND_QUEUE": "Paar zur On-Demand-Warteschlange hinzufügen",
"ADD_POLARIZATION_TO_SEARCH": "Polarisation zur Suche hinzufügen",
"ADD_SCENE_FILES_TO_DOWNLOADS": "Hinzufügen von Szenendateien zu Downloads",
"ADD_SHOPPING_CART": "add_shopping_cart",
"ADD_TO_ON_DEMAND_QUEUE": "Zur On-Demand-Warteschlange hinzufügen",
"ADDITIONAL_DRAWING_TOOL_OPTIONS_ARE_AVAILABLE_IN_THE_TOOLBAR_INCLUDING_POINT_LINESTRING_AND_POLYGON_OPTIONS": "In der Symbolleiste sind zusätzliche Optionen für das Zeichenwerkzeug verfügbar, z. B. Punkt-, Linienzug- und Polygonoptionen.",
"ADDITIONAL_FILTERS": "Zusätzliche Filter",
Expand Down Expand Up @@ -261,7 +260,6 @@
"FIELDS_ARE_AVAILABLE_FOR_SELECT_DATASETS_YOU_MAY_ENTER": "Felder sind für ausgewählte Datensätze verfügbar. Sie können Folgendes eingeben:",
"FIELDS_THE_DATE_PICKER_WILL_AUTOMATICALLY_CONSTRAIN": "Felder. Die Datumsauswahl schränkt automatisch ein",
"FILE": "Datei",
"FILE_COPY": "file_copy",
"FILE_I_DS_NAMES_CAN_BE_COPIED": "Datei-IDs (Namen) können kopiert werden",
"FILE_IDS": "Datei-IDs.",
"FILE_IMPORT_SUPPORTED ": "Unterstützter Dateiimport",
Expand All @@ -271,7 +269,6 @@
"FILE_TYPE": "Dateityp",
"FILE_TYPES": "Dateitypen",
"FILE_TYPES_SELECTED": "Ausgewählte Dateitypen",
"FILE_UPLOAD": "file_upload",
"FILES": "Dateien",
"FILES_CAN_BE_INDIVIDUALLY_DOWNLOADED": "Dateien können einzeln heruntergeladen werden",
"FILES_HERE": "Dateien hier",
Expand Down Expand Up @@ -299,7 +296,6 @@
"FRAME_START": "Frame-Start",
"FREQUENCY": "Frequenz",
"FULL_BURST_ID": "Vollständige Burst-ID",
"FUNCTION_W_D_S_L_I_W_L_W_L_W_L_PUSH_GTM_START": "(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':",
"GAMMA0": "gamma0",
"GAPS_DETECTED": "Erkannte Lücken",
"GEO_SEARCH": "Geo-Suche",
Expand Down Expand Up @@ -338,7 +334,6 @@
"HOW_TO_BASIC_LIST_SEARCH": "How-To Basisliste Suche",
"HOW_TO_CITE_USING_THIS_DATA": "Zitieren mit diesen Daten",
"HTTPS_URS_EARTHDATA_NASA_GOV_USERS_NEW": "https://urs.earthdata.nasa.gov/users/new",
"HTTPS_WWW_GOOGLETAGMANAGER_COM_GTM_JS_ID_I_DL_F_PARENT_NODE_INSERT_BEFORE_J_F": "'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);",
"HY_P3_API_URL": "HyP3 API URL",
"HY_P3_USER_GUIDE": "HyP3 Benutzerhandbuch",
"I_DS": "Ids",
Expand Down
14 changes: 5 additions & 9 deletions src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"ADD_POINTS": "Add",
"ADD_POLARIZATION_TO_SEARCH": "Add polarization to search",
"ADD_SCENE_FILES_TO_DOWNLOADS": "Add scene files to downloads",
"ADD_SHOPPING_CART": "add_shopping_cart",
"ADD_TO_ON_DEMAND_QUEUE": "Add to On Demand queue",
"ADDITIONAL_DRAWING_TOOL_OPTIONS_ARE_AVAILABLE_IN_THE_TOOLBAR_INCLUDING_POINT_LINESTRING_AND_POLYGON_OPTIONS": "Additional drawing tool options are available in the toolbar, including point, linestring, and polygon options.",
"ADDITIONAL_FILTERS": "Additional Filters",
Expand Down Expand Up @@ -94,6 +93,7 @@
"BEAM_MODES": "Beam Modes",
"BEAM_MODES_SELECTED": "beam modes selected",
"BETA": "(beta)",
"BOX": "Box",
"BOX_DRAW": "Box Draw",
"BROWSE_IMAGE_NOT_ALL_SCENES_WILL_HAVE_ALL_EXTRA_INFORMATION": "browse image. Not all scenes will have all extra information.",
"BUILD_COMMIT": "Build Commit",
Expand Down Expand Up @@ -143,6 +143,7 @@
"COPIED_EVENT_ID": "Copied Event ID",
"COPY": "Copy",
"COPY_FILE_I_DS": "Copy File IDs",
"COPY_FILE_I_DS_WILL_COPY_THE_FILE_NAMES_OF_ALL_FILES_IN_THE_QUEUE_FOR_USE_ELSEWHERE": "Copy file IDs will copy the file names of all files in the queue for use elsewhere.",
"COPY_FILE_ID": "Copy File ID",
"COPY_FILE_ID_TO_CLIPBOARD": "Copy File IDs to clipboard",
"COPY_FILE_IDS": "Copy File IDs",
Expand Down Expand Up @@ -246,8 +247,8 @@
"DRAG_AND_DROP": "Drag and Drop",
"DRAG_THE_MAP_WHILE_HOLDING_DOWN_THE_LEFT_MOUSE_BUTTON_TO_MOVE_TO_YOUR_AREA_OF_INTEREST": "Drag the map while holding down the left mouse button to move to your area of interest.",
"DRAW": "draw",
"DRAW_A_BOX": "Draw a box",
"DRAW_A_CIRCLE": "Draw a circle",
"DRAW_A_BOX": "Draw a Box",
"DRAW_A_CIRCLE": "Draw a Circle",
"DRAW_A_LINE": "Draw a Line",
"DRAW_A_POLYGON": "Draw a Polygon",
"DRAW_NEW_AREA_OF_INTEREST": "Draw new area of interest",
Expand Down Expand Up @@ -277,7 +278,6 @@
"EVENT_TYPES": "Event Types",
"EXAMPLE": "Example",
"EXAMPLE_S1_B_IW_SLC_1_SDV_20210704_T135937_20210704_T140004_027645_034_CB_0_4_B2_C": "Example: S1B_IW_SLC__1SDV_20210704T135937_20210704T140004_027645_034CB0_4B2C",
"EXAMPLE:": "Example",
"EXPAND_YOUR_SKILLS_WITH_OUR_FULL_LIST_OF_VERTEX_DATA_SEARCH_TUTORIALS": "Expand your skills with our full list of Vertex Data Search tutorials.",
"EXPERIMENTAL": "Experimental",
"EXPIRED": "Expired",
Expand All @@ -292,7 +292,6 @@
"FIELDS_ARE_AVAILABLE_FOR_SELECT_DATASETS_YOU_MAY_ENTER": "fields are available for select datasets. You may enter",
"FIELDS_THE_DATE_PICKER_WILL_AUTOMATICALLY_CONSTRAIN": " fields. The date picker will automatically constrain",
"FILE": "File",
"FILE_COPY": "file_copy",
"FILE_I_DS_NAMES_CAN_BE_COPIED": "File IDs (names) can be copied",
"FILE_IDS": "File IDs.",
"FILE_IMPORT_SUPPORTED": "File Import Supported",
Expand All @@ -303,7 +302,6 @@
"FILE_TYPE": "File Type",
"FILE_TYPES": "File Types",
"FILE_TYPES_SELECTED": "file types selected",
"FILE_UPLOAD": "file_upload",
"FILES": "Files",
"FILES_CAN_BE_INDIVIDUALLY_DOWNLOADED": "Files can be individually downloaded",
"FILES_HERE": "Files Here",
Expand Down Expand Up @@ -331,7 +329,6 @@
"FRAME_START": "Frame Start",
"FREQUENCY": "Frequency",
"FULL_BURST_ID": "Full Burst ID",
"FUNCTION_W_D_S_L_I_W_L_W_L_W_L_PUSH_GTM_START": "(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':",
"GAMMA0": "gamma0",
"GAPS_DETECTED": "Gaps Detected",
"GEO_SEARCH": "Geo Search",
Expand Down Expand Up @@ -371,7 +368,6 @@
"HOW_TO_BASIC_LIST_SEARCH": "How-To basic list Search",
"HOW_TO_CITE_USING_THIS_DATA": "How to cite using this data",
"HTTPS_URS_EARTHDATA_NASA_GOV_USERS_NEW": "https://urs.earthdata.nasa.gov/users/new",
"HTTPS_WWW_GOOGLETAGMANAGER_COM_GTM_JS_ID_I_DL_F_PARENT_NODE_INSERT_BEFORE_J_F": "'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);",
"HY_P3_API_URL": "HyP3 API URL",
"HY_P3_USER_GUIDE": "HyP3 User Guide",
"I_DS": "IDs",
Expand Down Expand Up @@ -492,7 +488,7 @@
"NAVIGATE_TO_YOUR_AREA_OF_INTEREST_BY_DRAGGING_THE_MAP_WHILE_HOLDING_DOWN_THE_LEFT_MOUSE_BUTTON": "Navigate to your area of interest by dragging the map while holding down the left mouse button.",
"NEW": "New!",
"NEW_DATE_GET_TIME_EVENT_GTM_JS_VAR_F_D_GET_ELEMENTS_BY_TAG_NAME_S": "new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],",
"NEW_END_DATE": "New End Date",
"NEW_END_DATE": "New End Date'\n",
"NEXT": "Next",
"NISAR_DESC ": "NISAR provides L- and S-band SAR data to measure Earth's changing ecosystems, dynamic surfaces, and ice masses with 12-day regularity on ascending and descending passes.",
"NO OVERLAP THRESHOLD": "No Overlap Threshold",
Expand Down
Loading
Loading